active_record_inherit_assoc 2.9.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b55c3f0e3b88e52836c8412b5f90299f6bfb5cd3850338328b58e3409afdeefd
-  data.tar.gz: 743abb357de27dd7954bbbabc1a72ef95ac9928b4762f8031ba55082bb7fed2d
+  metadata.gz: 3114b730174fd26ee0f56c6e133fb5d93706d80770fa265d3c040eb1c29638ec
+  data.tar.gz: b3e5f39e1255c5f588b7b250920eadea41d50fac9285b19f387958d8367eb4b9
 SHA512:
-  metadata.gz: e911e8243061ca030b4293150cd433c1963f72154b849754d2460f02fa85e5b885a691ad3fe7df442de3cb5539fb70b016f100a7bbf0f578a51d9d3d38d42d26
-  data.tar.gz: 0ad8b533b645a0f71bc7e9978afb571ccdaad7fe889f6d1015b411f457268b62b86cab07d17acaa02cce904d332603606bb4cdb27bd2c521123773e7c4c9df6a
+  metadata.gz: 3fae511b4f18e0908e2c155a841896f76b2bd10d30a699c4d104233ad92d1666af3e51d93429e6ec430ec02a1bdc1d90454373b391893f7734536186e364ff39
+  data.tar.gz: 1d270c6bc45fdbbf784ac4c7e465a303a06f2f4248f960f68b788fe85516c1848ddc7a4cdbe92ee5b85378f3b2434b8a5270832f9226df397e06314a6a7aeab7

data/lib/active_record_inherit_assoc.rb

@@ -3,7 +3,7 @@ require 'active_record'
 case ActiveRecord::VERSION::MAJOR
 when 4
   ActiveRecord::Associations::Builder::Association.valid_options << :inherit
-  ActiveRecord::Associations::Builder::Association.valid_options << :inherit_if
+  ActiveRecord::Associations::Builder::Association.valid_options << :inherit_allowed_list
 when 5
   # We can't add options into `valid_options` anymore.
   # Here are the possible solutions:
@@ -13,7 +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
+  ActiveRecord::Associations::Builder::Association::VALID_OPTIONS << :inherit_allowed_list
 end
 
 module ActiveRecordInheritAssocPrepend
@@ -29,10 +29,11 @@ module ActiveRecordInheritAssocPrepend
 
   def attribute_inheritance_hash
     return nil unless reflection.options[:inherit]
+    inherit_allowed_list = reflection.options[:inherit_allowed_list]
 
     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)
+      assoc_value = Array(assoc_value).concat(inherit_allowed_list) if inherit_allowed_list
       hash[association] = assoc_value
       hash["#{through_reflection.table_name}.#{association}"] = assoc_value if reflection.options.key?(:through)
     end
@@ -72,7 +73,10 @@ module ActiveRecordInheritPreloadAssocPrepend
 
     if inherit = reflection.options[:inherit]
       Array(inherit).each do |inherit_assoc|
-        owner_values = owners.map(&inherit_assoc).compact.uniq
+        owner_values = owners.map(&inherit_assoc)
+        owner_values.compact!
+        owner_values.uniq!
+        owner_values.concat(reflection.options[:inherit_allowed_list]) if reflection.options[:inherit_allowed_list]
         prescope = prescope.where(inherit_assoc => owner_values)
       end
     end
@@ -83,7 +87,8 @@ module ActiveRecordInheritPreloadAssocPrepend
   def filter_associated_records_with_inherit!(owner, associated_records, inherit)
     associated_records.select! do |record|
       Array(inherit).all? do |association|
-        record.send(association) == owner.send(association)
+        record_value = record.send(association)
+        record_value == owner.send(association) || reflection.options[:inherit_allowed_list]&.include?(record_value)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_inherit_assoc
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord