Update to upstream, specs, fixes

* Update to Doorkeeper upstream
* Fix various issues
* Test against Rails 5.2
* Bump version

.travis.yml

@@ -10,6 +10,7 @@ gemfile:
   - gemfiles/rails-4.2.gemfile
   - gemfiles/rails-5.0.gemfile
   - gemfiles/rails-5.1.gemfile
+  - gemfiles/rails-5.2.gemfile
 
 rvm:
   - 2.1
@@ -26,3 +27,5 @@ matrix:
       gemfile: gemfiles/rails-5.0.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails-5.1.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails-5.2.gemfile

CHANGELOG.md

@@ -4,9 +4,14 @@ Reverse Chronological Order:
 
 ## master
 
-https://github.com/nbulaj/doorkeeper-sequel/compare/1.3.0...master
+https://github.com/nbulaj/doorkeeper-sequel/compare/1.3.2...master
 
-...
+## `1.4.0` (2018-02-08)
+
+https://github.com/nbulaj/doorkeeper-sequel/compare/1.3.1...1.4.0
+
+* Various fixes
+* Update Doorkeeper to upstream
 
 ## `1.3.1` (2017-12-14)
 

Rakefile

@@ -30,7 +30,8 @@ class ExtensionIntegrator
       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')
+      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)
       # Remove generators specs because we are using our own
       FileUtils.rm(Dir.glob('spec/generators/*.rb'))
     end

doorkeeper-sequel.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.name        = 'doorkeeper-sequel'
   gem.version     = DoorkeeperSequel.gem_version
   gem.authors     = ['Nikita Bulai']
-  gem.date        = '2017-12-14'
+  gem.date        = '2018-02-08'
   gem.email       = ['[email protected]']
   gem.homepage    = 'http://github.com/nbulaj/doorkeeper-sequel'
   gem.summary     = 'Doorkeeper Sequel ORM'
@@ -26,6 +26,7 @@ Gem::Specification.new do |gem|
   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'

gemfiles/rails-4.2.gemfile

@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 gemspec path: '../'
 
 gem 'rails', '~> 4.2', '<= 5.0'
+# Older Grape requires Ruby >= 2.2.2
+gem 'grape', '~> 0.16', '< 0.19.2'
 gem 'sqlite3', '~> 1.3.5'
 gem 'sequel', '>= 4.0'
 

gemfiles/rails-5.2.gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'rails', '5.2.0.rc1'
+gem 'sqlite3', '~> 1.3.5'
+gem 'sequel', '>= 4.0'
+
+group :test do
+  gem 'rspec-rails', '~> 3.6'
+end

lib/doorkeeper-sequel/gem_version.rb

@@ -5,8 +5,8 @@ def self.gem_version
 
   module VERSION
     MAJOR = 1
-    MINOR = 3
-    TINY  = 1
+    MINOR = 4
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

lib/doorkeeper/orm/sequel/models/access_token_mixin.rb

@@ -53,11 +53,11 @@ def by_refresh_token(refresh_token)
             first(refresh_token: refresh_token.to_s)
           end
 
-          def revoke_all_for(application_id, resource_owner)
+          def revoke_all_for(application_id, resource_owner, clock = Time)
             where(application_id: application_id,
                   resource_owner_id: resource_owner.id,
                   revoked_at: nil)
-              .each(&:revoke)
+              .update(revoked_at: clock.now.utc)
           end
 
           def matching_token_for(application, resource_owner_or_id, scopes)

spec/stubs/models/user.rb

@@ -1,4 +1,6 @@
 class User < Sequel::Model
+  include Doorkeeper::Orm::Sequel::SequelCompat
+
   class << self
     def authenticate!(name, password)
       User.where(name: name, password: password).first