Merge pull request #1395 from doorkeeper-gem/fix-rake-tasks

Fix Rake tasks
doorkeeper-gem · Apr 8, 2020 · ae7ce21 · ae7ce21
2 parents ca0496f + de7cdc6
commit ae7ce21
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@ User-visible changes worth mentioning.
 
 ## master
 
-- [#PR number] Your changes description.
+- [#1395] Fix `NameError: uninitialized constant Doorkeeper::AccessToken` for Rake tasks.
 
 ## 5.4.0.rc1
 - [#1366] Sets expiry of token generated using `refresh_token` to that of original token. (Fixes #1364) 

diff --git a/lib/doorkeeper.rb b/lib/doorkeeper.rb
@@ -6,8 +6,8 @@
 # Main Doorkeeper namespace.
 #
 module Doorkeeper
-  autoload :OAuth, "doorkeeper/oauth"
   autoload :Errors, "doorkeeper/errors"
+  autoload :OAuth, "doorkeeper/oauth"
   autoload :Rake, "doorkeeper/rake"
   autoload :Request, "doorkeeper/request"
   autoload :Server, "doorkeeper/server"

diff --git a/lib/doorkeeper/orm/active_record.rb b/lib/doorkeeper/orm/active_record.rb
@@ -33,12 +33,20 @@ def self.initialize_application_owner!
         lazy_load do
           require "doorkeeper/models/concerns/ownership"
 
-          Doorkeeper.config.application_model.send :include, Doorkeeper::Models::Ownership
+          Doorkeeper.config.application_model.include(Doorkeeper::Models::Ownership)
         end
       end
 
       def self.lazy_load(&block)
-        ActiveSupport.on_load(:active_record, {}, &block)
+        # ActiveSupport has no public interface to check if something
+        # already lazy-loaded :(
+        loaded = ActiveSupport.instance_variable_get(:"@loaded") || {}
+
+        if loaded.key?(:active_record)
+          block.call
+        else
+          ActiveSupport.on_load(:active_record, {}, &block)
+        end
       end
 
       def self.models