active_record_inherit_assoc 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b50165093b3e78ef2a8ab8efbf0d96e2b31dbe7e
-  data.tar.gz: a84150b1592e79cced4c06219ebc5c78e9c88266
+  metadata.gz: df1b44b0b9255a29b797c8867e334c15b4ccff07
+  data.tar.gz: 998fd258d644d42b7136bab89bfc2d91c205c407
 SHA512:
-  metadata.gz: 1dc69e235c25fda1536c09d3c196891c4ae57ff8dce3eaf3a1f69f4785071f34f52704b6ffe2a626fa2e69d2090ab0793f418149d78c5f4e739aa6908aa2aeea
-  data.tar.gz: ccbe88f549fed65ccafbb003c34cfd53f190b0b4ec6228dcaa91813332e8f5bf420896147322996fd918379c70d458b29548ffbeb2c610ddd4626dc96243969e
+  metadata.gz: e7cb32c32626162fe0a9d0de90116341d9c1f076d3f184b885a1f62882c0322e05bf40be42f975dc26ac44c4d163acc8117a0c412ebb38a59d54e16faaa9c9e8
+  data.tar.gz: 013ef8fe9087f0f39a811f84aca8a66aead61046c8901d9859aff3057d4ff0c6b314f0ee362cbe6f715a802fc135b4e0831671a2adc1153e2eb796a62505adee

data/lib/active_record_inherit_assoc.rb

@@ -21,14 +21,33 @@ module ActiveRecordInheritAssocPrepend
 
   def attribute_inheritance_hash
     return nil unless reflection.options[:inherit]
-    Array(reflection.options[:inherit]).inject({}) { |hash, obj| hash[obj] = owner.send(obj) ; hash }
+    Array(reflection.options[:inherit]).inject({}) { |hash, association| hash[association] = owner.send(association) ; hash }
   end
 end
 
-ActiveRecord::Associations::Association.class_eval do
-  prepend ActiveRecordInheritAssocPrepend
+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)
+      end
+    end
+  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)
+      end
+    end
+  end
 end
 
+ActiveRecord::Associations::Preloader::Association.send(:prepend, ActiveRecordInheritPreloadAssocPrepend)
+
 class ActiveRecord::Base
   # Makes the model inherit the specified attribute from a named association.
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_inherit_assoc
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-08-28 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.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Attribute inheritance for AR associations