active_record_inherit_assoc 2.8.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8bd387d89684408a56073510d1a9b3d14b119b2a
-  data.tar.gz: 39514eaff5903fb90e2a853e8fd1896678d36179
+SHA256:
+  metadata.gz: 9524fb500abe5d5f81a49ca6b4c8e45fdcaaca94b18624fb9c1c31ac658f46df
+  data.tar.gz: 5002be646071088dc91dd12c2e6a7ddcb4ee9bc1e9e57789c94acfe1f9ea029c
 SHA512:
-  metadata.gz: a5961ad5fefe3009e6ebec716ea1ca81de282db1ee4acf68267d9a838446c13c3860c61712dc94773f5e878917def5f5c2e2140702e1e23d79582a95e776614c
-  data.tar.gz: 1c4469bd61211da0e0f85a1603024a7c0c644de3ac68cddf38e5c72202cae165c8f4311f4536538da9c376879168547bb726616244bd00e22e0466cac7f88ed4
+  metadata.gz: 155b4f0726f474e1bff0704cd5cefc009407e796e31df31cd456b33105ffb125534071c0056c8d2c9ae233ccba9db4e158b5ea585796958509e976cda66bbb30
+  data.tar.gz: 6d85eeddbeebb22610bba310f304f987ec20116e33f0ea390dcb8a2172ecb1d4ed32d84ac12a6f4219ad0e0ba9c37876c26ec45360c02e05bc81eaadac6c573f

data/lib/active_record_inherit_assoc.rb

@@ -1,19 +1,15 @@
 require 'active_record'
 
-case ActiveRecord::VERSION::MAJOR
-when 4
-  ActiveRecord::Associations::Builder::Association.valid_options << :inherit
-when 5
-  # We can't add options into `valid_options` anymore.
-  # Here are the possible solutions:
-  #   * monkey patch Assocition::VALID_OPTIONS
-  #   * prepend the `valid_options` method
-  #   * create an Extension class and add it via ActiveRecord::Associations::Builder::Association.extensions
-  #
-  # I went with the first one out of simplicity.
-  ActiveRecord::Associations::Builder::Association::VALID_OPTIONS << :inherit
+module ActiveRecordInheritBuildAssocPrepend
+  INHERIT_OPTIONS = %i[inherit inherit_allowed_list].freeze
+
+  def valid_options(options)
+    super + INHERIT_OPTIONS
+  end
 end
 
+ActiveRecord::Associations::Builder::Association.singleton_class.prepend(ActiveRecordInheritBuildAssocPrepend)
+
 module ActiveRecordInheritAssocPrepend
   def target_scope
     if inherited_attributes = attribute_inheritance_hash
@@ -27,9 +23,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)
+      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
@@ -69,7 +67,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
@@ -80,7 +81,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.8.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Ben Osheroff
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -100,20 +100,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +128,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - ben@gimbo.net
 executables: []
@@ -154,7 +140,7 @@ homepage: https://github.com/zendesk/active_record_inherit_assoc
 licenses:
 - Apache License Version 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,16 +148,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Attribute inheritance for AR associations
 test_files: []