Merge pull request #89 from doorkeeper-gem/update-doorkeeper

Upgrade Doorkeeper version

.github/workflows/test.yml

@@ -14,10 +14,6 @@ jobs:
       matrix:
         include:
           # mongoid7 requires activemodel >= 5.1, < 8.0
-          - orm: 'mongoid7'
-            ruby: '2.6'
-            rails: '6.0'
-            experimental: false
           - orm: 'mongoid7'
             ruby: '2.7'
             rails: '6.0'
@@ -36,10 +32,6 @@ jobs:
             experimental: false
 
           # mongoid8 requires activemodel >= 5.1, < 8.0
-          - orm: 'mongoid8'
-            ruby: '2.6'
-            rails: '6.0'
-            experimental: false
           - orm: 'mongoid8'
             ruby: '2.7'
             rails: '6.0'
@@ -57,29 +49,6 @@ jobs:
             rails: '7.0'
             experimental: false
 
-          # jruby
-          - orm: 'mongoid7'
-            ruby: 'jruby'
-            rails: '6.1'
-            experimental: false
-
-          - orm: 'mongoid8'
-            ruby: 'jruby'
-            rails: '6.1'
-            experimental: false
-
-          # truffleruby
-          - orm: 'mongoid7'
-            ruby: 'truffleruby'
-            rails: '6.1'
-            experimental: false
-
-          # truffleruby
-          - orm: 'mongoid8'
-            ruby: 'truffleruby'
-            rails: '6.1'
-            experimental: false
-
           # experimental
           - orm: 'mongoid7'
             ruby: 'head'

.rubocop.yml

@@ -77,4 +77,4 @@ Layout/DotPosition:
 Layout/LineLength:
   Exclude:
     - spec/**/*
-  Max: 100
+  Max: 120

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-06-25 04:37:21 UTC using RuboCop version 1.29.1.
+# on 2024-03-26 14:42:18 UTC using RuboCop version 1.29.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -22,25 +22,43 @@ Gemspec/RequiredRubyVersion:
     - 'doorkeeper-mongodb.gemspec'
 
 # Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 121
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+Lint/AmbiguousOperatorPrecedence:
+  Exclude:
+    - 'spec/support/doorkeeper_rspec.rb'
+
+# Offense count: 3
 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 20
+  Max: 34
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 # IgnoredMethods: refine
 Metrics/BlockLength:
   Max: 64
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 27
+  Max: 29
 
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 140
+  Max: 143
+
+# Offense count: 1
+Rails/I18nLocaleTexts:
+  Exclude:
+    - 'spec/dummy/config/initializers/doorkeeper.rb'
 
 # Offense count: 4
 # Configuration parameters: ForbiddenMethods, AllowedMethods.
@@ -51,20 +69,69 @@ Rails/SkipsModelValidations:
     - 'lib/doorkeeper-mongodb/mixins/mongoid/access_grant_mixin.rb'
     - 'lib/doorkeeper-mongodb/mixins/mongoid/access_token_mixin.rb'
 
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+Rails/StripHeredoc:
+  Exclude:
+    - 'spec/support/doorkeeper_rspec.rb'
+
 # Offense count: 1
 # This cop supports safe auto-correction (--auto-correct).
 Rake/Desc:
   Exclude:
     - 'Rakefile'
 
-# Offense count: 30
+# Offense count: 34
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
 
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: AllowedVars.
+Style/FetchEnvVar:
+  Exclude:
+    - 'spec/support/doorkeeper_rspec.rb'
+
+# Offense count: 8
+# This cop supports safe auto-correction (--auto-correct).
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/doorkeeper-mongodb/mixins/mongoid/access_grant_mixin.rb'
+    - 'lib/doorkeeper-mongodb/mixins/mongoid/access_token_mixin.rb'
+    - 'lib/doorkeeper-mongodb/mixins/mongoid/application_mixin.rb'
+    - 'lib/doorkeeper/orm/mongoid4/application.rb'
+    - 'lib/doorkeeper/orm/mongoid5/application.rb'
+    - 'lib/doorkeeper/orm/mongoid6/application.rb'
+    - 'lib/doorkeeper/orm/mongoid7/application.rb'
+    - 'lib/doorkeeper/orm/mongoid8/application.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: line_count_dependent, lambda, literal
+Style/Lambda:
+  Exclude:
+    - 'lib/doorkeeper-mongodb/mixins/mongoid/access_token_mixin.rb'
+
 # Offense count: 1
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
   Exclude:
     - 'lib/doorkeeper-mongodb/compatible.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Exclude:
+    - 'spec/dummy/config.ru'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 121

Gemfile

@@ -7,15 +7,19 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "bcrypt", "~> 3.1", require: false
+gem "database_cleaner-mongoid"
 gem "mongoid"
 gem "rake"
 gem "rspec-core"
 gem "rspec-expectations"
 gem "rspec-mocks"
-gem "rspec-rails", "~> 4.0.0"
+gem "rspec-rails", "~> 6.0.0"
 gem "rspec-support"
 gem "rubocop", "~> 1.29.1"
 gem "rubocop-performance", require: false
 gem "rubocop-rails", require: false
 gem "rubocop-rake", require: false
 gem "rubocop-rspec", require: false
+gem "sprockets-rails"
+gem "timecop"

README.md

@@ -57,8 +57,8 @@ variables defined in `.travis.yml` file.
 To run locally, you need to choose a gemfile, with a command similar to:
 
 ```bash
-$ export RAILS=5.1
-$ export BUNDLE_GEMFILE=$PWD/gemfiles/Gemfile.mongoid6.rb
+$ export RAILS=6.0
+$ export BUNDLE_GEMFILE=$PWD/gemfiles/Gemfile.mongoid7.rb
 ```
 
 ---

Rakefile

@@ -3,24 +3,38 @@
 require "bundler/setup"
 require "rspec/core/rake_task"
 
+class ExtensionIntegrator
+  def self.gsub(filepath, pattern, value)
+    file = File.read(filepath)
+    updated_file = file.gsub(pattern, value)
+    File.open(filepath, "w") { |line| line.puts(updated_file) }
+  end
+end
+
 task :load_doorkeeper do
   `rm -rf spec/`
   `git checkout spec`
-  unless Dir.exist?("doorkeeper")
-    `git submodule init`
-    `git submodule update`
+  if Dir["doorkeeper/*"].empty?
+    puts `git submodule init`
+    puts `git submodule update`
   end
   `cp -r -n doorkeeper/spec .`
   `rm -rf spec/generators/` # we are not ActiveRecord
   `rm -rf spec/validators/`
+  ExtensionIntegrator.gsub(
+    "spec/spec_helper.rb",
+    'require "database_cleaner"',
+    "",
+  )
+  `rm ./spec/models/doorkeeper/application_spec.rb`
   `bundle exec rspec`
 end
 
 desc "Update Git submodules."
 task :update_submodules do
   Rake::Task["load_doorkeeper"].invoke if Dir["doorkeeper/*"].empty?
 
-  `git submodule foreach git pull origin master`
+  `git submodule foreach git pull origin main`
 end
 
 desc "Default: run specs."

doorkeeper-mongodb.gemspec

@@ -21,10 +21,13 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "doorkeeper", ">= 5.2", "< 6.0"
 
-  gem.add_development_dependency "coveralls"
-  gem.add_development_dependency "database_cleaner", "~> 1.6.0"
-  gem.add_development_dependency "factory_bot", "~> 4.8"
-  gem.add_development_dependency "generator_spec", "~> 0.9.4"
+  gem.add_development_dependency "capybara"
+  gem.add_development_dependency "coveralls_reborn"
+  gem.add_development_dependency "database_cleaner-mongoid"
+  gem.add_development_dependency "factory_bot", "~> 6.0"
+  gem.add_development_dependency "generator_spec", "~> 0.10.0"
   gem.add_development_dependency "grape"
+  gem.add_development_dependency "rake", ">= 11.3.0"
   gem.add_development_dependency "rspec-rails"
+  gem.add_development_dependency "timecop"
 end

gemfiles/Gemfile.common.rb

@@ -8,8 +8,11 @@
 gem "doorkeeper", "~> #{ENV.fetch("DOORKEEPER", "5.0")}"
 gem "bcrypt"
 
+gem "database_cleaner-mongoid"
 gem "rspec-core"
 gem "rspec-expectations"
 gem "rspec-mocks"
-gem "rspec-rails", "~> 4.0.0"
+gem "rspec-rails", "~> 6.0.0"
 gem "rspec-support"
+gem "sprockets-rails"
+gem "timecop"