doorkeeper 5.9.1 → 5.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd9d528da47dec74a5bb12a6e9ce672279cebd0a52cc6a714347df6c17828dfd
-  data.tar.gz: 61e4dcc2434b3e1c0400e35bf80eef980b3adb81c2a33cbe74e9797fef3963b0
+  metadata.gz: 5511de8196966ae7db845cac15ebcef1be9f3b2ad6861b677cdc9ca80783c775
+  data.tar.gz: a939acb1f8734a1d6f2dedd58c5f006fb8db1726c6f87f0c4a14eec8f37ae7e8
 SHA512:
-  metadata.gz: 8a3e115278bfb5540ccde8b7ecc4084138935a4a7c928011f38684908c4e5cd0dadbfb14a93bcb4ce39da91a8bcaf599970d39de6d7953752e7c77aa6c03c31e
-  data.tar.gz: b62a19e584648c28bd9d4a24e21d3501ac35c85c77de950050c8942bb82be4f821d241b41ebc8544b03c354f93f96e4588c051d1b4eafe77ce6b13c06941ab7c
+  metadata.gz: aaee9b32df715f74aa621e256c284a7a968f78ee11183d9b5e43695c0c59bbb1de0559ce8b4e232d5d4b9e4c404b8a926fa4a9f4c7e3c52da3c0f9f19cd6b169
+  data.tar.gz: 92a836decf7418aa5bedb7793d9c924486b35485e9c0706e96064a7c984fcd90c204eef8c8260de30b89e501f1a71bb4372b01c8050cb96b638c5d68bd4c512a

data/CHANGELOG.md

@@ -7,7 +7,13 @@ User-visible changes worth mentioning.
 
 ## main
 
-- Add here
+- Please add here
+
+## 5.9.2
+
+- [#1822][#1823][#1825] Update Rubocop config, auto-corrections and codebase cleanup.
+- [#1830] Fix `NameError: uninitialized constant ApplicationRecord` on `rails db:seed` (and other non-eager-loading flows) caused by `on_load(:active_record)` firing re-entrantly during `ApplicationRecord` autoload. The orm hooks no longer depend on `ActiveSupport.on_load(:active_record)`; model concerns (`Ownership`, `PolymorphicResourceOwner::ForAccessGrant`, `PolymorphicResourceOwner::ForAccessToken`) are now wired up from each `Mixins::*` `included` block, which fires at parent-class autoload time — after `Doorkeeper.configure` has applied user settings and without re-entering the AR load chain.
+  - **Upgrade note**: fully custom model classes that don't include `Doorkeeper::Orm::ActiveRecord::Mixins::{Application,AccessToken,AccessGrant}` will no longer auto-receive `Ownership` / `PolymorphicResourceOwner` concerns (previously injected by `run_orm_hooks` via the configured class name). Either inherit from the Doorkeeper default model, include the corresponding `Mixins::*` module, or `include` the concerns directly.
 
 ## 5.9.1
 

data/lib/doorkeeper/orm/active_record/mixins/access_grant.rb

@@ -9,6 +9,7 @@ module Doorkeeper::Orm::ActiveRecord::Mixins
       self.strict_loading_by_default = false if respond_to?(:strict_loading_by_default)
 
       include ::Doorkeeper::AccessGrantMixin
+      include ::Doorkeeper::Models::PolymorphicResourceOwner::ForAccessGrant
 
       belongs_to :application, class_name: Doorkeeper.config.application_class.to_s,
                                optional: true,

data/lib/doorkeeper/orm/active_record/mixins/access_token.rb

@@ -9,6 +9,7 @@ module Doorkeeper::Orm::ActiveRecord::Mixins
       self.strict_loading_by_default = false if respond_to?(:strict_loading_by_default)
 
       include ::Doorkeeper::AccessTokenMixin
+      include ::Doorkeeper::Models::PolymorphicResourceOwner::ForAccessToken
 
       belongs_to :application, class_name: Doorkeeper.config.application_class.to_s,
                                inverse_of: :access_tokens,

data/lib/doorkeeper/orm/active_record/mixins/application.rb

@@ -9,6 +9,13 @@ module Doorkeeper::Orm::ActiveRecord::Mixins
       self.strict_loading_by_default = false if respond_to?(:strict_loading_by_default)
 
       include ::Doorkeeper::ApplicationMixin
+      # Included unconditionally: this block runs once at parent-class
+      # autoload time, so gating on `enable_application_owner?` would
+      # freeze behavior at first-load time. The actual owner validation
+      # is still gated dynamically via `validate_owner?` →
+      # `confirm_application_owner?`, and `belongs_to :owner` is lazy on
+      # schemas that lack the columns.
+      include ::Doorkeeper::Models::Ownership
 
       has_many :access_grants,
                foreign_key: :application_id,

data/lib/doorkeeper/orm/active_record.rb

@@ -28,22 +28,14 @@ module Doorkeeper
         autoload :Application, "doorkeeper/orm/active_record/mixins/application"
       end
 
-      def self.run_hooks
-        initialize_configured_associations
-      end
-
-      def self.initialize_configured_associations
-        # NOTE: on_load block is instance_exec'd on ActiveRecord::Base,
-        #       so use fully qualified references (e.g. Doorkeeper.config).
-        ActiveSupport.on_load(:active_record) do
-          if Doorkeeper.config.enable_application_owner?
-            Doorkeeper.config.application_model.include ::Doorkeeper::Models::Ownership
-          end
-
-          Doorkeeper.config.access_grant_model.include ::Doorkeeper::Models::PolymorphicResourceOwner::ForAccessGrant
-          Doorkeeper.config.access_token_model.include ::Doorkeeper::Models::PolymorphicResourceOwner::ForAccessToken
-        end
-      end
+      # Kept as a no-op so `Doorkeeper.run_orm_hooks` (and any plugin that
+      # checks `respond_to?(:run_hooks)`) stays quiet. The model concerns
+      # that used to be wired up here are now included from each Mixin's
+      # `included` block, which runs at parent-class autoload time — well
+      # after `Doorkeeper.configure` has applied user settings, and without
+      # touching `ActiveSupport.on_load(:active_record)` (whose re-entrant
+      # firing during `ApplicationRecord` autoload caused #1828).
+      def self.run_hooks; end
     end
   end
 end

data/lib/doorkeeper/version.rb

@@ -5,7 +5,7 @@ module Doorkeeper
     # Semantic versioning
     MAJOR = 5
     MINOR = 9
-    TINY = 1
+    TINY = 2
     PRE = nil
 
     # Full version number

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 5.9.1
+  version: 5.9.2
 platform: ruby
 authors:
 - Felipe Elias Philipp