doorkeeper-sequel 1.5.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 553728671816109cbf8e780da862de70222768b0
-  data.tar.gz: c241ff98bec1bef3de150659beebcc4b73853ad4
+SHA256:
+  metadata.gz: 1d6c99e5e0bb961999356b6b73e3411d52dbee96709a315da3b683b55742387e
+  data.tar.gz: 739f73a125ad1b350f789b506c6a3f81921c2cc7ac7fe0113329fde485b03287
 SHA512:
-  metadata.gz: d98ed140d5c131fbfc3d1967199c1a664baf9e6f2d2e398415fe52ad3e316c599f524bf6f058d9bbdd85c3f11cc17544a3eef7f78f41c39a63b86c8bb47c1225
-  data.tar.gz: 9fb3f5c993b40d5ef0a85dfe6ffbbd5b806ed74c5f3adaeb51429c8fbbe0f78a6f01c6de0de7f2633fe88ab00f260d595a1567d41a777547a4f3952924fdacdb
+  metadata.gz: a88d703fed108474ab3f2c7e795e9c764f6cceb284de7b734ef3641a8c06069b92b75983099e0740767d1b9621d2ed2e270c83eb2b99bf317b2ac93aecfdac86
+  data.tar.gz: f52182d4a06dde4072f1b18dd18c8ff0bacba344c90c4e0c382ac440f0aec044a5a438b1511e8bc4d06869444d38e260ef3bc674dc60c957484d4db9bbe00d52

data/.editorconfig

@@ -0,0 +1,6 @@
+root = true
+
+[*.{rb,json}]
+indent_style = space
+indent_size = 2
+insert_final_newline = true

data/.gitignore

@@ -10,3 +10,4 @@ log/*.log
 gemfiles/*.lock
 Gemfile.lock
 doorkeeper-sequel-*.gem
+coverage

data/.gitmodules

@@ -1,4 +1,3 @@
 [submodule "doorkeeper"]
 	path = doorkeeper
 	url = https://github.com/doorkeeper-gem/doorkeeper.git
-    branch = 4.4.0

data/.rubocop.yml

@@ -5,8 +5,6 @@ AllCops:
     - 'doorkeeper/**/*'
     - 'spec/**/*'
   DisplayCopNames: true
-Rails:
-  Enabled: true
 Documentation:
   Enabled: false
 Layout/EndOfLine:
@@ -15,3 +13,32 @@ Metrics/BlockLength:
   Exclude:
     - lib/doorkeeper/orm/sequel/validators/*
     - lib/doorkeeper-sequel/generators/templates*
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+Style/SymbolArray:
+  MinSize: 3
+Style/WordArray:
+  MinSize: 3
+Style/NumericPredicate:
+  Enabled: false
+Style/DoubleNegation:
+  Enabled: false
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+Layout/TrailingBlankLines:
+  Enabled: true
+Layout/DotPosition:
+  EnforcedStyle: leading

data/.travis.yml

@@ -7,25 +7,16 @@ before_install:
   - gem install bundler -v '~> 1.10'
 
 gemfile:
-  - gemfiles/rails-4.2.gemfile
   - gemfiles/rails-5.0.gemfile
   - gemfiles/rails-5.1.gemfile
   - gemfiles/rails-5.2.gemfile
+  - gemfiles/rails-6.0.gemfile
 
 rvm:
-  - 2.1
-  - 2.2.4
-  - 2.3.3
-  - 2.4.1
+  - 2.5
+  - 2.6
   - ruby-head
 
 matrix:
   allow_failures:
     - rvm: ruby-head
-  exclude:
-    - rvm: 2.1
-      gemfile: gemfiles/rails-5.0.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails-5.1.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails-5.2.gemfile

data/CHANGELOG.md

@@ -1,14 +1,24 @@
-# Doorkeeper-Sequel ORM 1.x Changelog
+# Doorkeeper-Sequel ORM Changelog
 
 Reverse Chronological Order:
 
 ## master
 
-https://github.com/nbulaj/doorkeeper-sequel/compare/1.3.2...master
+https://github.com/nbulaj/doorkeeper-sequel/compare/2.0.0...master
+
+## `2.4.0` (2021-03-11)
+
+* Support for Doorkeeper 5.5
+
+## `2.0.0` (2018-10-04)
+
+https://github.com/nbulaj/doorkeeper-sequel/compare/1.5.0...2.0.0
+
+* Support Doorkeeper >= 5.0.0
 
 ## `1.5.0` (2018-10-03)
 
-https://github.com/nbulaj/doorkeeper-sequel/compare/1.5.0...1.4.0
+https://github.com/nbulaj/doorkeeper-sequel/compare/1.4.0...1.5.0
 
 * Support Doorkeeper >= 4.2.7 && < 5.0.0
 

data/Gemfile

@@ -1,23 +1,27 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
+
+source "https://rubygems.org"
 
 gemspec
 
 platforms :jruby do
-  gem 'jdbc-sqlite3'
+  gem "jdbc-sqlite3"
 end
 
 platforms :ruby, :mswin, :mswin64, :mingw, :x64_mingw do
-  gem 'sqlite3'
+  gem "sqlite3"
 end
 
-gem 'sequel', '>= 4.0'
-gem 'sequel_polymorphic'
+gem "sequel", ">= 4.0"
+gem "sequel_polymorphic"
 
-gem 'doorkeeper', '>= 4.0.0'
-gem 'rails', '~> 5.0'
+gem "bcrypt", "~> 3.1"
+gem "doorkeeper", ">= 4.0.0", "< 5.6"
+gem "rails", "~> 5.0"
 
 group :test do
-  gem 'rspec-rails', '~> 3.4'
+  gem "rspec-rails", "~> 3.8"
 end
 
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem "rubocop", "~> 0.74.0", require: false
+gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]

data/README.md

@@ -17,8 +17,21 @@
 To start using the Doorkeeper Sequel ORM, add to your Gemfile:
 
 ``` ruby
-gem 'doorkeeper', '~> 4.0'
-gem 'doorkeeper-sequel', '~> 1.4'
+# For Doorkeeper 4.x
+gem 'doorkeeper', '~> 4.3'
+gem 'doorkeeper-sequel', '~> 1.5'
+
+# For Doorkeeper 5.1
+gem 'doorkeeper', '~> 5.0' # or 5.1
+gem 'doorkeeper-sequel', '~> 2.0'
+
+# For Doorkeeper >= 5.2
+gem 'doorkeeper', '~> 5.2'
+gem 'doorkeeper-sequel', '~> 2.1'
+
+# For Doorkeeper >= 5.3
+gem 'doorkeeper', '~> 5.3'
+gem 'doorkeeper-sequel', '~> 2.2'
 ```
 
 Or you can use git `master` branch for the latest gem version:
@@ -42,6 +55,8 @@ rake doorkeeper_sequel:generate:migration
 rake doorkeeper_sequel:generate:application_owner
 rake doorkeeper_sequel:generate:previous_refresh_token
 rake doorkeeper_sequel:generate:confidential_applications # for Doorkeeper >= 4.4
+rake doorkeeper_sequel:generate:pkce # for Doorkeeper >= 5.x
+rake doorkeeper_sequel:generate:polymorphic_resource_owner # for Doorkeeper >= 5.3
 ```
 
 ## Tests
@@ -74,7 +89,7 @@ Thanks.
 
 Doorkeeper-sequel gem is released under the [MIT License](http://www.opensource.org/licenses/MIT).
 
-Copyright (c) 2016-2018 Nikita Bulai (bulajnikita@gmail.com).
+Copyright (c) 2016-2020 Nikita Bulai (bulajnikita@gmail.com).
 
 ---
 

data/Rakefile

@@ -1,5 +1,7 @@
-require 'bundler/setup'
-require 'rspec/core/rake_task'
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "rspec/core/rake_task"
 
 class ExtensionIntegrator
   class << self
@@ -9,7 +11,7 @@ class ExtensionIntegrator
     end
 
     def clear_specs!
-      base_dir = File.join(Dir.pwd, 'spec')
+      base_dir = File.join(Dir.pwd, "spec")
 
       Dir.foreach(base_dir) do |file|
         next if %w[. .. stubs].include?(file)
@@ -25,23 +27,25 @@ class ExtensionIntegrator
     end
 
     def copy_spec_stubs!
-      FileUtils.cp_r('spec/stubs/spec_helper_integration.rb', 'spec/spec_helper_integration.rb')
-      FileUtils.cp_r('spec/stubs/models/user.rb', 'spec/dummy/app/models/user.rb')
-      FileUtils.cp_r('spec/stubs/config/initializers/db.rb', 'spec/dummy/config/initializers/db.rb')
-      FileUtils.cp_r('spec/stubs/config/application.rb', 'spec/dummy/config/application.rb')
-      FileUtils.cp_r('spec/stubs/support/sequel.rb', 'spec/support/orm/sequel.rb')
-      FileUtils.rm('spec/dummy/config/initializers/active_record_belongs_to_required_by_default.rb', force: true)
-      FileUtils.rm('spec/dummy/config/initializers/new_framework_defaults.rb', force: true)
-      FileUtils.rm('spec/models/doorkeeper/base_record_spec.rb', force: true)
+      FileUtils.cp_r("spec/stubs/spec_helper_integration.rb", "spec/spec_helper_integration.rb")
+      FileUtils.cp_r("spec/stubs/spec_helper_integration.rb", "spec/spec_helper.rb")
+      FileUtils.cp_r("spec/stubs/models/user.rb", "spec/dummy/app/models/user.rb")
+      FileUtils.cp_r("spec/stubs/config/initializers/db.rb", "spec/dummy/config/initializers/db.rb")
+      FileUtils.cp_r("spec/stubs/config/application.rb", "spec/dummy/config/application.rb")
+      FileUtils.cp_r("spec/stubs/support/sequel.rb", "spec/support/orm/sequel.rb")
+      FileUtils.rm("spec/dummy/config/initializers/active_record_belongs_to_required_by_default.rb", force: true)
+      FileUtils.rm("spec/dummy/config/initializers/new_framework_defaults.rb", force: true)
+      FileUtils.rm("spec/models/doorkeeper/base_record_spec.rb", force: true)
+      FileUtils.rm("spec/lib/orm/active_record/stale_records_cleaner_spec.rb", force: true)
       # Remove generators specs because we are using our own
-      FileUtils.rm(Dir.glob('spec/generators/*.rb'))
+      FileUtils.rm(Dir.glob("spec/generators/*.rb"))
     end
   end
 end
 
-desc 'Update Git submodules.'
+desc "Update Git submodules."
 task :update_submodules do
-  ExtensionIntegrator.init_submodule! if Dir['doorkeeper/*'].empty?
+  ExtensionIntegrator.init_submodule! if Dir["doorkeeper/*"].empty?
   `git submodule foreach git pull origin master`
 end
 
@@ -49,19 +53,19 @@ task :copy_and_run_doorkeeper_specs do
   # Clear specs directory
   ExtensionIntegrator.clear_specs!
   # Init Doorkeeper submodule if it doesn't exists
-  ExtensionIntegrator.init_submodule! if Dir['doorkeeper/*'].empty?
+  ExtensionIntegrator.init_submodule! if Dir["doorkeeper/*"].empty?
   # Copy native Doorkeeper specs
-  `cp -r #{Gem.win_platform? ? '' : '-n'} doorkeeper/spec .`
+  `cp -r #{Gem.win_platform? ? "" : "-n"} doorkeeper/spec .`
   # Replace ORM-dependent files (configs, models, etc)
   ExtensionIntegrator.copy_spec_stubs!
   # Run specs
   `bundle exec rspec`
 end
 
-desc 'Default: run specs.'
+desc "Default: run specs."
 task default: :spec
 
-desc 'Clone doorkeeper specs, prepare it for Sequel and run'
+desc "Clone doorkeeper specs, prepare it for Sequel and run"
 task spec: :copy_and_run_doorkeeper_specs
 
 RSpec::Core::RakeTask.new(:spec) do |config|

data/config/locales/en.yml

@@ -1,4 +1,11 @@
 en:
+  activerecord:
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              unspecified_scheme: 'must specify a scheme.'
   sequel:
     attributes:
       doorkeeper/application:
@@ -12,6 +19,10 @@ en:
               blank: "can't be blank"
               fragment_present: 'cannot contain a fragment.'
               invalid_uri: 'must be a valid URI.'
+              unspecified_host: 'must be a valid URI.'
               relative_uri: 'must be an absolute URI.'
               secured_uri: 'must be an HTTPS/SSL URI.'
               forbidden_uri: 'is forbidden by the server.'
+              unspecified_scheme: 'must specify a scheme.'
+            scopes:
+              not_match_configured: "doesn't match configured on the server."

data/doorkeeper-sequel.gemspec

@@ -1,34 +1,38 @@
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
 
-require 'doorkeeper-sequel/version'
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+
+require "doorkeeper-sequel/version"
 
 Gem::Specification.new do |gem|
-  gem.name        = 'doorkeeper-sequel'
-  gem.version     = DoorkeeperSequel.gem_version
-  gem.authors     = ['Nikita Bulai']
-  gem.email       = ['bulajnikita@gmail.com']
-  gem.homepage    = 'http://github.com/nbulaj/doorkeeper-sequel'
-  gem.summary     = 'Doorkeeper Sequel ORM'
-  gem.description = 'Provides Doorkeeper support to Sequel database toolkit.'
-  gem.license     = 'MIT'
+  gem.name = "doorkeeper-sequel"
+  gem.version = DoorkeeperSequel.gem_version
+  gem.authors = ["Nikita Bulai"]
+  gem.email = ["bulajnikita@gmail.com"]
+  gem.homepage = "http://github.com/nbulaj/doorkeeper-sequel"
+  gem.summary = "Doorkeeper Sequel ORM"
+  gem.description = "Provides Doorkeeper support to Sequel database toolkit."
+  gem.license = "MIT"
 
-  gem.bindir = 'bin'
+  gem.bindir = "bin"
   gem.require_paths = %w[lib config]
   gem.files = `git ls-files`.split($RS)
   gem.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  gem.test_files = Dir['spec/**/*']
+  gem.test_files = Dir["spec/**/*"]
 
-  gem.required_ruby_version = '>= 2.0.0'
+  gem.required_ruby_version = ">= 2.0.0"
 
-  gem.add_runtime_dependency 'doorkeeper', '>= 4.2.6', '< 5.0'
-  gem.add_runtime_dependency 'sequel', '>= 4.0.0', '< 6'
-  gem.add_runtime_dependency 'sequel_polymorphic', '~> 0.2', '< 1.0'
-  gem.add_runtime_dependency 'thor', '>= 0.18', '< 6'
+  gem.add_runtime_dependency "bcrypt", "~> 3.1"
+  gem.add_runtime_dependency "doorkeeper", ">= 5.0.0", "< 5.6"
+  gem.add_runtime_dependency "sequel", ">= 4.0.0", "< 6"
+  gem.add_runtime_dependency "sequel_polymorphic", "~> 0.2", "< 1.0"
+  gem.add_runtime_dependency "thor", ">= 0.18", "< 6"
 
-  gem.add_development_dependency 'grape'
-  gem.add_development_dependency 'capybara', '~> 2.14', '>= 2.14.0'
-  gem.add_development_dependency 'database_cleaner', '~> 1.5', '>= 1.5.0'
-  gem.add_development_dependency 'factory_bot', '~> 4.8'
-  gem.add_development_dependency 'generator_spec', '~> 0.9.4'
-  gem.add_development_dependency 'rspec-rails', '~> 3.5'
+  gem.add_development_dependency "capybara", "~> 2.14", ">= 2.14.0"
+  gem.add_development_dependency "coveralls"
+  gem.add_development_dependency "database_cleaner", "~> 1.5", ">= 1.5.0"
+  gem.add_development_dependency "factory_bot", "~> 4.8"
+  gem.add_development_dependency "generator_spec", "~> 0.9.4"
+  gem.add_development_dependency "grape"
+  gem.add_development_dependency "rspec-rails", "~> 3.5"
 end

data/gemfiles/rails-5.0.gemfile

@@ -1,11 +1,14 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
 
-gemspec path: '..'
+source "https://rubygems.org"
 
-gem 'rails', '~> 5.0', '<= 5.1'
-gem 'sqlite3', '~> 1.3.5'
-gem 'sequel', '>= 4.0'
+gemspec path: ".."
+
+gem "bcrypt", "~> 3.1"
+gem "rails", "~> 5.0", "<= 5.1"
+gem "sequel", ">= 4.0"
+gem "sqlite3", "~> 1.3.5"
 
 group :test do
-  gem 'rspec-rails', '~> 3.6'
+  gem "rspec-rails", "~> 3.8"
 end

data/gemfiles/rails-5.1.gemfile

@@ -1,11 +1,14 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
 
-gemspec path: '..'
+source "https://rubygems.org"
 
-gem 'rails', '~> 5.1', '<= 5.2'
-gem 'sqlite3', '~> 1.3.5'
-gem 'sequel', '>= 4.0'
+gemspec path: ".."
+
+gem "bcrypt", "~> 3.1"
+gem "rails", "~> 5.1", "<= 5.2"
+gem "sequel", ">= 4.0"
+gem "sqlite3", "~> 1.3.5"
 
 group :test do
-  gem 'rspec-rails', '~> 3.6'
+  gem "rspec-rails", "~> 3.8"
 end

data/gemfiles/rails-5.2.gemfile

@@ -1,11 +1,14 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
 
-gemspec path: '..'
+source "https://rubygems.org"
 
-gem 'rails', '5.2.0.rc1'
-gem 'sqlite3', '~> 1.3.5'
-gem 'sequel', '>= 4.0'
+gemspec path: ".."
+
+gem "bcrypt", "~> 3.1"
+gem "rails", "~> 5.2.0", "<= 6.0"
+gem "sequel", ">= 4.0"
+gem "sqlite3", "~> 1.3.5"
 
 group :test do
-  gem 'rspec-rails', '~> 3.6'
+  gem "rspec-rails", "~> 3.8"
 end