active_record_inherit_assoc 2.5.1 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5744502d4b1e1941a08f829565227940755e2242
-  data.tar.gz: 5f27dc1364e9859a0cae9dd40d03cafa25f57534
+SHA256:
+  metadata.gz: 3114b730174fd26ee0f56c6e133fb5d93706d80770fa265d3c040eb1c29638ec
+  data.tar.gz: b3e5f39e1255c5f588b7b250920eadea41d50fac9285b19f387958d8367eb4b9
 SHA512:
-  metadata.gz: ac5a23f39ff9ed338c004966f7e0077c27c71309932636379af39a49598abab216718481f0f91d2b21550cc9acc5b202a48599dadea739aa3e31865111e70924
-  data.tar.gz: e9eaa77c7e46fec4faf8401828144b1d84b12d6250cef9205d1ad817fdd330d3e7c60a59c7896b0ad278cb46c6693d13bc29c2269ddfd3e7feebbd65421478da
+  metadata.gz: 3fae511b4f18e0908e2c155a841896f76b2bd10d30a699c4d104233ad92d1666af3e51d93429e6ec430ec02a1bdc1d90454373b391893f7734536186e364ff39
+  data.tar.gz: 1d270c6bc45fdbbf784ac4c7e465a303a06f2f4248f960f68b788fe85516c1848ddc7a4cdbe92ee5b85378f3b2434b8a5270832f9226df397e06314a6a7aeab7

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_allowed_list
 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_allowed_list
 end
 
 module ActiveRecordInheritAssocPrepend
@@ -31,7 +29,14 @@ 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 }
+    inherit_allowed_list = reflection.options[:inherit_allowed_list]
+
+    Array(reflection.options[:inherit]).each_with_object({}) do |association, hash|
+      assoc_value = owner.send(association)
+      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
   end
 
   if ActiveRecord::VERSION::MAJOR >= 4
@@ -63,10 +68,27 @@ module ActiveRecordInheritPreloadAssocPrepend
     end
   end
 
+  def scope
+    prescope = super
+
+    if inherit = reflection.options[:inherit]
+      Array(inherit).each do |inherit_assoc|
+        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
+
+    prescope
+  end
+
   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.5.1
+  version: 2.10.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2020-07-21 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.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Attribute inheritance for AR associations