doorkeeper-sequel 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d016a084c8970dfd895fb289df936babf93c5fa9
-  data.tar.gz: 79e8e295db71fee33e9112463f41b7bd63cf4711
+SHA256:
+  metadata.gz: 3c7a81816c6e8bf24a4e578dccaedf96d8efb30d00e7c6993c31f009dca56c69
+  data.tar.gz: e55d1338ed9360dfa8431cee7acfa6d29f0a3cada3fa6840182a4d1918aaafea
 SHA512:
-  metadata.gz: e654a464b6f0d2e7ef2d4ab81bbb2b2709a32fa847971dd4deca85052dc4055bcda4a270065a006f438fa9713abc8490d02d4da3086f79d9afca31e4e703a8c7
-  data.tar.gz: cfc5de44d6bc888d76f5041f7e9f4c4cc11dac6aefbeb4e4f3eb087eea73b7f926c5a561286931451912816b5fa0fa8cb8350b029959e5c3919d4b5419a536f7
+  metadata.gz: 9e574bc75c50bd88633d84f14b6f0db2b3449e88b45bae879ef91032b98d8e9ea355cfb6ae3ec9ef85477d4c4a4a77a893965a7f96425f7990e4a1faeb0ae483
+  data.tar.gz: bf2e5d88624242f6394b16ec9b9555d09991f34bd7ee80a1573f516116b136df84f7de606d02eacdfb675c16979c050d82f52c2c38dde924085e99e798cee36e

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/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.3"
+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/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,25 +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/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)
+      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
 
@@ -51,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:
@@ -15,5 +22,6 @@ en:
               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,35 +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', '>= 5.0.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.3"
+  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 'coveralls'
-  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

data/gemfiles/rails-6.0.gemfile

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "bcrypt", "~> 3.1"
+gem "rails", "~> 6.0.0", "<= 6.1"
+gem "sequel", ">= 4.0"
+gem "sqlite3", "~> 1.3.5"
+
+group :test do
+  gem "rspec-core", git: "https://github.com/rspec/rspec-core.git"
+  gem "rspec-expectations", git: "https://github.com/rspec/rspec-expectations.git"
+  gem "rspec-mocks", git: "https://github.com/rspec/rspec-mocks.git"
+  gem "rspec-rails", branch: "4-0-dev", git: "https://github.com/rspec/rspec-rails.git"
+  gem "rspec-support", git: "https://github.com/rspec/rspec-support.git"
+end

data/lib/doorkeeper-sequel.rb

@@ -1,28 +1,31 @@
-require 'doorkeeper-sequel/version'
+# frozen_string_literal: true
 
-if defined?(::Rails)
-  require 'doorkeeper-sequel/railtie'
-end
+require "doorkeeper-sequel/version"
+
+require "doorkeeper-sequel/railtie" if defined?(::Rails)
 
-require 'doorkeeper'
-require 'thor/group'
+require "doorkeeper"
+require "doorkeeper/redirect_uri_validator"
+require "doorkeeper/oauth/nonstandard"
+require "thor/group"
 
-require 'doorkeeper-sequel/generators/concerns/migration_actions'
-require 'doorkeeper-sequel/generators/application_owner_generator'
-require 'doorkeeper-sequel/generators/migration_generator'
-require 'doorkeeper-sequel/generators/previous_refresh_token_generator'
+require "doorkeeper-sequel/generators/concerns/migration_actions"
+require "doorkeeper-sequel/generators/application_owner_generator"
+require "doorkeeper-sequel/generators/migration_generator"
+require "doorkeeper-sequel/generators/previous_refresh_token_generator"
+require "doorkeeper-sequel/generators/confidential_applications_generator"
 
-require 'doorkeeper-sequel/mixins/concerns/sequel_compat'
-require 'doorkeeper-sequel/mixins/access_token_mixin'
-require 'doorkeeper-sequel/mixins/access_grant_mixin'
-require 'doorkeeper-sequel/mixins/application_mixin'
+require "doorkeeper-sequel/mixins/concerns/sequel_compat"
+require "doorkeeper-sequel/mixins/access_token_mixin"
+require "doorkeeper-sequel/mixins/access_grant_mixin"
+require "doorkeeper-sequel/mixins/application_mixin"
 
-require 'doorkeeper/orm/sequel'
+require "doorkeeper/orm/sequel"
 
 module DoorkeeperSequel
   def load_locales
-    locales_dir = File.expand_path('../../config/locales', __FILE__)
-    locales = Dir[File.join(locales_dir, '*.yml')]
+    locales_dir = File.expand_path("../config/locales", __dir__)
+    locales = Dir[File.join(locales_dir, "*.yml")]
 
     I18n.load_path |= locales
   end

data/lib/doorkeeper-sequel/gem_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DoorkeeperSequel
   def self.gem_version
     Gem::Version.new VERSION::STRING
@@ -5,9 +7,9 @@ module DoorkeeperSequel
 
   module VERSION
     MAJOR = 2
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
 
-    STRING = [MAJOR, MINOR, TINY].compact.join('.')
+    STRING = [MAJOR, MINOR, TINY].compact.join(".")
   end
 end

data/lib/doorkeeper-sequel/generators/application_owner_generator.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 module DoorkeeperSequel
   class ApplicationOwnerGenerator < ::Thor::Group
     include ::Thor::Actions
     include MigrationActions
 
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path("templates", __dir__)
 
-    desc 'Provide support for client application ownership.'
+    desc "Provide support for client application ownership."
 
     def install
-      create_migration 'add_owner_to_application.rb'
+      create_migration "add_owner_to_application.rb"
     end
   end
 end