active_record_inherit_assoc 2.5.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ea75f7b36b592c164adc0681e3ce45891db2db2c
-  data.tar.gz: 39fc2cbc13071657fbe1b1352ced4d598da58572
+SHA256:
+  metadata.gz: b55c3f0e3b88e52836c8412b5f90299f6bfb5cd3850338328b58e3409afdeefd
+  data.tar.gz: 743abb357de27dd7954bbbabc1a72ef95ac9928b4762f8031ba55082bb7fed2d
 SHA512:
-  metadata.gz: 03ff93fd9cc642d5a15eaec01718cb9671267826a95822ee6ca8aaf58eb46d2afd2ef7b384c16e1b0a5395bfc16926ad145d1202a9b68cca25fc73fdefd85cc4
-  data.tar.gz: 30d3fd6d78a8c18acd10f9e2c56452847d694def8650a789f18fe4fe8c41a4c27d7c36993d7dd4e9f739044c40f1ac28fb5dc9b6b92afe34acd8f7ad3ff366e2
+  metadata.gz: e911e8243061ca030b4293150cd433c1963f72154b849754d2460f02fa85e5b885a691ad3fe7df442de3cb5539fb70b016f100a7bbf0f578a51d9d3d38d42d26
+  data.tar.gz: 0ad8b533b645a0f71bc7e9978afb571ccdaad7fe889f6d1015b411f457268b62b86cab07d17acaa02cce904d332603606bb4cdb27bd2c521123773e7c4c9df6a

data/lib/active_record_inherit_assoc.rb

@@ -1,12 +1,9 @@
 require 'active_record'
 
 case ActiveRecord::VERSION::MAJOR
-when 3
-  ActiveRecord::Associations::Builder::HasMany.valid_options   << :inherit
-  ActiveRecord::Associations::Builder::HasOne.valid_options    << :inherit
-  ActiveRecord::Associations::Builder::BelongsTo.valid_options << :inherit
 when 4
   ActiveRecord::Associations::Builder::Association.valid_options << :inherit
+  ActiveRecord::Associations::Builder::Association.valid_options << :inherit_if
 when 5
   # We can't add options into `valid_options` anymore.
   # Here are the possible solutions:
@@ -16,6 +13,7 @@ when 5
   #
   # I went with the first one out of simplicity.
   ActiveRecord::Associations::Builder::Association::VALID_OPTIONS << :inherit
+  ActiveRecord::Associations::Builder::Association::VALID_OPTIONS << :inherit_if
 end
 
 module ActiveRecordInheritAssocPrepend
@@ -31,11 +29,17 @@ module ActiveRecordInheritAssocPrepend
 
   def attribute_inheritance_hash
     return nil unless reflection.options[:inherit]
-    Array(reflection.options[:inherit]).inject({}) { |hash, association| hash[association] = owner.send(association) ; hash }
+
+    Array(reflection.options[:inherit]).each_with_object({}) do |association, hash|
+      assoc_value = owner.send(association)
+      next if reflection.options[:inherit_if] && !reflection.options[:inherit_if].call(owner)
+      hash[association] = assoc_value
+      hash["#{through_reflection.table_name}.#{association}"] = assoc_value if reflection.options.key?(:through)
+    end
   end
 
   if ActiveRecord::VERSION::MAJOR >= 4
-    def skip_statement_cache?
+    def skip_statement_cache?(*)
       super || !!reflection.options[:inherit]
     end
   end
@@ -44,15 +48,38 @@ end
 ActiveRecord::Associations::Association.send(:prepend, ActiveRecordInheritAssocPrepend)
 
 module ActiveRecordInheritPreloadAssocPrepend
-  def associated_records_by_owner(*args)
-    super.tap do |result|
-      next unless inherit = reflection.options[:inherit]
-      result.each do |owner, associated_records|
-        filter_associated_records_with_inherit!(owner, associated_records, inherit)
+  if ActiveRecord::VERSION::STRING < '5.2.0'
+    def associated_records_by_owner(*)
+      super.tap do |result|
+        next unless inherit = reflection.options[:inherit]
+        result.each do |owner, associated_records|
+          filter_associated_records_with_inherit!(owner, associated_records, inherit)
+        end
+      end
+    end
+  else
+    def associate_records_to_owner(owner, records)
+      if inherit = reflection.options[:inherit]
+        records = Array(records)
+        filter_associated_records_with_inherit!(owner, records, inherit)
       end
+      super
     end
   end
 
+  def scope
+    prescope = super
+
+    if inherit = reflection.options[:inherit]
+      Array(inherit).each do |inherit_assoc|
+        owner_values = owners.map(&inherit_assoc).compact.uniq
+        prescope = prescope.where(inherit_assoc => owner_values)
+      end
+    end
+
+    prescope
+  end
+
   def filter_associated_records_with_inherit!(owner, associated_records, inherit)
     associated_records.select! do |record|
       Array(inherit).all? do |association|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_inherit_assoc
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -162,15 +162,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Attribute inheritance for AR associations