Add generators, fixes

README.md

@@ -47,6 +47,7 @@ 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
 ```
 
 ## Tests

Rakefile

@@ -34,7 +34,6 @@ class ExtensionIntegrator
       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)
-      # TODO: write own specs
       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'))

lib/doorkeeper-sequel/generators/pkce_generator.rb

@@ -0,0 +1,14 @@
+module DoorkeeperSequel
+  class PkceGenerator < ::Thor::Group
+    include ::Thor::Actions
+    include MigrationActions
+
+    source_root File.expand_path('../templates', __FILE__)
+
+    desc 'Provide support for PKCE.'
+
+    def install
+      create_migration 'enable_pkce_migration.rb.erb'
+    end
+  end
+end

lib/doorkeeper-sequel/tasks/doorkeeper-sequel.rake

@@ -14,5 +14,15 @@ namespace :doorkeeper_sequel do
     task :previous_refresh_token do
       DoorkeeperSequel::PreviousRefreshTokenGenerator.start
     end
+
+    desc 'Generate migration file for PKCE'
+    task :pkce do
+      DoorkeeperSequel::PkceGenerator.start
+    end
+
+    desc 'Add confidential column to Doorkeeper applications'
+    task :confidential_applications do
+      DoorkeeperSequel::ConfidentialApplicationsGenerator.start
+    end
   end
 end

lib/doorkeeper/orm/sequel.rb

@@ -1,3 +1,5 @@
+require 'doorkeeper/orm/sequel/stale_records_cleaner'
+
 module Doorkeeper
   module Orm
     module Sequel

lib/doorkeeper/orm/sequel/stale_records_cleaner.rb

@@ -10,7 +10,7 @@ def initialize(base_scope)
 
         def clean_revoked
           @base_scope
-            .where(Sequel.~(revoked_at: nil))
+            .where(::Sequel.~(revoked_at: nil))
             .where { revoked_at < Time.current }
             .delete
         end