active_record_include 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 30de7b63680167a66f60ec0f0e62341dd070dd72
-  data.tar.gz: 6d1a4b3d921cb01d3a05dbf08944cf6906b6a6fc
+SHA256:
+  metadata.gz: 389e7cfde0e5c5eadbc2f4b978f2847784b543289e9ef211c95aa75d974054ae
+  data.tar.gz: 723b50c391a00dd17eea1a4ba5b9e943438c717c9aa6a3d61636be5a6f1dac5f
 SHA512:
-  metadata.gz: 46f8afba0e9307c161b502f944cfbcd6388d93c6baf3e902ff5ca9fea7ab01a63e275f4ee7acb7fc15b9f98cbcaa22716934ac0cad409dfbf2d2ac56e1dc6209
-  data.tar.gz: 771dd3d979e25060b286694b0b3e770edeee511c3d4e8ffe07a930d56c13a3b6925f634c250c3cc6fa31b3d4b74b7db93f220ac0a26d96093cefa91aeffab160
+  metadata.gz: 5fa4130d0968ee0a9f0d1e2de0c9853b0c7b9356c91a9ec26311bdbc0428207282cba7281fe998db071e845ff01de34e1df079704ea292a35c998ab6f32b0045
+  data.tar.gz: d153ff7f19389878f3977077415125c481a47cbcc4e6f05bb909db963b9d019b49853f8d5b2252c90d2ecb1c39e12547527e7836b32fdae57209e266546ac680

data/Changelog.md

@@ -0,0 +1,16 @@
+# Changelog
+
+## 0.2.0
+
+- Rails 7 / 8 compatibility. Modern ActiveRecord calls `connection` from within the `inherited`
+  hook chain (before it has set `@base_class`), and some extensions (e.g. torque-postgresql's
+  `physically_inherited?`) do the same, so `include_when_connected` could fire while a subclass was
+  still mid-definition and blow up any concern that inspects the schema. Pending includes are now
+  skipped while a class's `@base_class` is unset, applied at the end of the `inherited` hook once
+  the class is fully defined, and guarded against re-entrancy (an included concern calling
+  `connection` again).
+- Loosened the `activerecord` / `activesupport` dependency cap (was `< 5.3`).
+
+## 0.1.0
+
+- Initial release.

data/License

@@ -1,4 +1,4 @@
-Copyright (c) 2018 Tyler Rick
+Copyright (c) 2018-2026 Tyler Rick
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
 associated documentation files (the "Software"), to deal in the Software without restriction,

data/active_record_include.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"]    = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = "TODO: Put your gem's Changelog.md URL here."
+  spec.metadata["changelog_uri"] = "#{spec.metadata["source_code_uri"]}/blob/master/Changelog.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -27,14 +27,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.3.0"
-  spec.add_dependency "activesupport", [">= 4.2", "< 5.3"]
-  spec.add_dependency "activerecord", [">= 4.2", "< 5.3"]
+  spec.add_dependency "activerecord"
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "normalizy"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "byebug"
 end

data/lib/active_record_include/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecordInclude
   def self.version
-    "0.1.0"
+    "0.2.0"
   end
 end

data/lib/active_record_include/when_connected.rb

@@ -5,6 +5,9 @@ module ActiveRecordInclude::WhenConnected
   @@verbose = false
 
   module ClassMethods
+    # recursive: default is true.
+    # only: (into_classes:)
+    # except:
     def include_when_connected(mod, **options)
       self.class_eval do
         unless    defined?(modules_to_include_when_connected)
@@ -27,36 +30,71 @@ module ActiveRecordInclude::WhenConnected
     extend ActiveSupport::Concern
 
     module ClassMethods
-    def connection(*)
-      super.tap do
-        self.modules_to_include_when_connected.each do |config|
-        config.each do |(mod, options)|
-          self.singleton_class.class_eval do
-            attr_accessor :modules_already_included_when_connected
+      def connection(*)
+        super.tap do
+          include_pending_modules_when_connected
+        end
+      end
+
+      private
+
+      # The pending includes are also applied at the end of `inherited` (after ActiveRecord's own
+      # inherited chain has completed and set @base_class), because a class might have its
+      # scopes/concern methods accessed before any `connection` call happens on that specific class.
+      # (On Rails <= 5.2 the first connection call always happened during class definition, which had
+      # the same effective timing.)
+      def inherited(subclass)
+        super.tap do
+          if subclass < ActiveRecord::Base
+            subclass.send(:include_pending_modules_when_connected)
           end
-          self.modules_already_included_when_connected ||= []
-          next if self.modules_already_included_when_connected.include?(mod)
+        end
+      end
 
-          match = (
-            if options[:into_classes]
-              self.in? options[:into_classes]
-            else
-              self < ActiveRecord::Base && !self.abstract_class?
+      def include_pending_modules_when_connected
+        # Rails 7+/8: ActiveRecord (and some extensions, e.g. torque-postgresql's
+        # physically_inherited?) call `connection` from within the `inherited` hook chain, i.e.
+        # while the new subclass is still mid-definition (AR sets @base_class only *after* its
+        # inherited super chain returns). Including concerns that inspect the schema (table_exists?,
+        # table_name -> base_class) at that point breaks. Skip; the inherited-after-super hook above
+        # (or a later connection call) will perform the includes once the class is fully defined.
+        return if name.nil?
+        return if self < ActiveRecord::Base && !instance_variable_defined?(:@base_class)
+        # Guard against re-entrancy: the included concerns themselves call connection.
+        return if @_including_modules_when_connected
+
+        @_including_modules_when_connected = true
+        begin
+          self.modules_to_include_when_connected.each do |config|
+          config.each do |(mod, options)|
+            self.singleton_class.class_eval do
+              attr_accessor :modules_already_included_when_connected
             end
-          )
-          #puts %(Include #{mod} into #{self} (#{options.inspect})? #{match})
-          if match
-            puts "Including #{mod} into #{self}" if ActiveRecordInclude::WhenConnected.verbose
-            modules_already_included_when_connected << mod
-            class_eval do
-              include mod
+            self.modules_already_included_when_connected ||= []
+            next if self.modules_already_included_when_connected.include?(mod)
+
+            match = (
+              if options[:into_classes]
+                self.in? options[:into_classes]
+              else
+                self < ActiveRecord::Base && !self.abstract_class?
+              end
+            )
+            #puts %(Include #{mod} into #{self} (#{options.inspect})? #{match})
+            if match
+              puts "Including #{mod} into #{self}" if ActiveRecordInclude::WhenConnected.verbose
+              modules_already_included_when_connected << mod
+              class_eval do
+                include mod
+              end
             end
           end
-        end
+          end
+        ensure
+          @_including_modules_when_connected = false
         end
       end
     end
-    end
   end
 end
 
@@ -65,4 +103,3 @@ ActiveSupport.on_load(:active_record) do
     include ActiveRecordInclude::WhenConnected
   end
 end
-

metadata

@@ -1,99 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: active_record_include
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tyler Rick
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2026-07-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -107,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: normalizy
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -159,6 +119,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Changelog.md
 - Gemfile
 - Gemfile.lock
 - License
@@ -179,8 +140,8 @@ licenses:
 metadata:
   homepage_uri: http://github.com/TylerRick/active_record_include
   source_code_uri: http://github.com/TylerRick/active_record_include
-  changelog_uri: 'TODO: Put your gem''s Changelog.md URL here.'
-post_install_message: 
+  changelog_uri: http://github.com/TylerRick/active_record_include/blob/master/Changelog.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -195,9 +156,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.5.1
+signing_key:
 specification_version: 4
 summary: Makes it easy to have specific concern modules included into all of your
   models after the model has connected to the database