active_record_inherit_assoc 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 492331a685418fa3a1fb9de5f9b9e368271cda4ef228223a229416a742d6dfb5
-  data.tar.gz: cda8957c1fe83ac64a9e7dd257a45c397e9bb8c6ba351c1bd25cbebfe9333e05
+SHA1:
+  metadata.gz: 8bd387d89684408a56073510d1a9b3d14b119b2a
+  data.tar.gz: 39514eaff5903fb90e2a853e8fd1896678d36179
 SHA512:
-  metadata.gz: 1fc9fa5f73d3d24860badc833ecead64d4b69db0266fa260e7a143dde47de5b67542e027ce8c183cca57b31ee347938cea6f995b54565ea4610ae1a8c42e4a0d
-  data.tar.gz: 18407bef501e125baa7c670a38ac9aff3b17721d036b5fb5b6ce6099f836a8bc6f96bf6ee0e323e4556e5879af3f389b4de8d2c95c078f7d296dbeaca6c40d0a
+  metadata.gz: a5961ad5fefe3009e6ebec716ea1ca81de282db1ee4acf68267d9a838446c13c3860c61712dc94773f5e878917def5f5c2e2140702e1e23d79582a95e776614c
+  data.tar.gz: 1c4469bd61211da0e0f85a1603024a7c0c644de3ac68cddf38e5c72202cae165c8f4311f4536538da9c376879168547bb726616244bd00e22e0466cac7f88ed4

data/lib/active_record_inherit_assoc.rb

@@ -27,11 +27,11 @@ module ActiveRecordInheritAssocPrepend
 
   def attribute_inheritance_hash
     return nil unless reflection.options[:inherit]
-    Array(reflection.options[:inherit]).inject({}) do |hash, association|
+
+    Array(reflection.options[:inherit]).each_with_object({}) do |association, hash|
       assoc_value = owner.send(association)
       hash[association] = assoc_value
       hash["#{through_reflection.table_name}.#{association}"] = assoc_value if reflection.options.key?(:through)
-      hash
     end
   end
 
@@ -64,6 +64,19 @@ 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).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.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Attribute inheritance for AR associations