active_record_inherit_assoc 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea75f7b36b592c164adc0681e3ce45891db2db2c
-  data.tar.gz: 39fc2cbc13071657fbe1b1352ced4d598da58572
+  metadata.gz: 5744502d4b1e1941a08f829565227940755e2242
+  data.tar.gz: 5f27dc1364e9859a0cae9dd40d03cafa25f57534
 SHA512:
-  metadata.gz: 03ff93fd9cc642d5a15eaec01718cb9671267826a95822ee6ca8aaf58eb46d2afd2ef7b384c16e1b0a5395bfc16926ad145d1202a9b68cca25fc73fdefd85cc4
-  data.tar.gz: 30d3fd6d78a8c18acd10f9e2c56452847d694def8650a789f18fe4fe8c41a4c27d7c36993d7dd4e9f739044c40f1ac28fb5dc9b6b92afe34acd8f7ad3ff366e2
+  metadata.gz: ac5a23f39ff9ed338c004966f7e0077c27c71309932636379af39a49598abab216718481f0f91d2b21550cc9acc5b202a48599dadea739aa3e31865111e70924
+  data.tar.gz: e9eaa77c7e46fec4faf8401828144b1d84b12d6250cef9205d1ad817fdd330d3e7c60a59c7896b0ad278cb46c6693d13bc29c2269ddfd3e7feebbd65421478da

data/lib/active_record_inherit_assoc.rb

@@ -35,7 +35,7 @@ module ActiveRecordInheritAssocPrepend
   end
 
   if ActiveRecord::VERSION::MAJOR >= 4
-    def skip_statement_cache?
+    def skip_statement_cache?(*)
       super || !!reflection.options[:inherit]
     end
   end
@@ -44,13 +44,23 @@ 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 filter_associated_records_with_inherit!(owner, associated_records, inherit)

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.5.1
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2017-12-29 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.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Attribute inheritance for AR associations