nested_select 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90b648bcd4371a277e27841b52d173fa0951c49a8fa89e1e3894ce1e2c4a0a02
-  data.tar.gz: effb7e1afb4b609ff812ca1aaf7803eb6e65b2729650399656335fc1adee35a9
+  metadata.gz: 6cb1e948873e81d15bbe96e4c15c485d8b2835e8cfb1862966bd99bb69d52f27
+  data.tar.gz: e6e726bae63cf87e702131f80984e8021a229b7cc2c54b21031298e7f819cc08
 SHA512:
-  metadata.gz: 2d21c76feffd32cfb7950edd49027e0082a91a6473ad6713eb109fdf2285f42091f8bbbf034ab1c4b5a37c5119ae27ce678fd983a73dc99002cb8c832203ef83
-  data.tar.gz: cac45499b8c4748a80bf91210538216764400ede85f84fcf9afc3f1308f73822edfa0c3cfb5a9dbbc1b45fc48b8bb7a8ea7f720a34a7731a0e19f2b5cb1c16ff
+  metadata.gz: 0420e35c4ee39866db944fa381ce731136389f9ab15e4597242a72d03d0fb9b65c904476aa86492c471e73b19bffaf84403986ef15dcf6cd8659b71588c7aa83
+  data.tar.gz: e53e6d4c19564899d1643826a158072ca217a4b50d8baf14a7aa38d82ac0097b246008134a18bf24a6dcf84f1f65a92f9a209cd04cb8c0874b5d81795e8c1354

data/.rubocop.yml

@@ -1,5 +1,8 @@
+inherit_gem:
+  rubocop-shopify: rubocop.yml
+
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.4
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes

data/Appraisals

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 appraise "rails-7.0" do
   gem "rails", "~> 7.0.0"
 end
@@ -12,4 +14,4 @@ end
 
 appraise "rails-8" do
   gem "rails", ">= 8"
-end
+end

data/CHANGELOG.md

@@ -1,6 +1,9 @@
+## [0.5.0] - 2025-11-22
+- fixed issue with belongs_to as a root pf the preloading branch and multiple branches
+- partially rubocoped
+
 ## [0.4.4] - 2025-05-09
 - fixed appraisals and local docker compose
-- 
 
 ## [0.4.3] - 2025-05-09
 - fixed regression on through scopes whenever nested_select_values are blank

data/Rakefile

@@ -9,4 +9,4 @@ require "rubocop/rake_task"
 
 RuboCop::RakeTask.new
 
-task default: %i[test rubocop]
+task default: [:test, :rubocop]

data/lib/nested_select/deep_merger.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 module NestedSelect
   module DeepMerger
-
     # {user_profile: [:zip_code]} + {user_profile: [:bio]} -> { user_profile: [:zip_code, :bio] }
     refine Hash do
       def deep_combine(other)
         merge!(other.except(*keys))
-        merge!(other.slice(*keys).map{ |key, value| [key, [self[key], value].flatten.deep_combine_elements]}.to_h )
+        merge!(other.slice(*keys).map { |key, value| [key, [self[key], value].flatten.deep_combine_elements] }.to_h)
       end
     end
 
@@ -15,4 +16,4 @@ module NestedSelect
       end
     end
   end
-end
+end

data/lib/nested_select/preloader/association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NestedSelect
   module Preloader
     module Association
@@ -11,13 +13,14 @@ module NestedSelect
         @nested_select_values = [*partial_select_values]
         ensure_nesting_selection_integrity!(association_nested_select_values)
       end
+
       def reflection_relation_keys_attributes
         foreign_key = reflection.foreign_key unless reflection.is_a?(ActiveRecord::Reflection::BelongsToReflection)
         [*foreign_key, *reflection.klass.primary_key].map(&:to_s)
       end
 
       def association_nested_select_values
-        this_association_select_values = nested_select_values&.grep_v(Hash)&.map {_1.try(:to_s) }
+        this_association_select_values = nested_select_values&.grep_v(Hash)&.map { _1.try(:to_s) }
         return if this_association_select_values.blank?
 
         [*this_association_select_values, *reflection_relation_keys_attributes].uniq
@@ -38,7 +41,7 @@ module NestedSelect
         current_selection = nested_select_final_values.grep_v(Hash).map(&:to_s)
 
         basic_attributes_matched = (attributes_loaded & reflection.klass.column_names).tally ==
-                                   (current_selection & reflection.klass.column_names).tally
+          (current_selection & reflection.klass.column_names).tally
 
         # this is not a 100% safe verification, but it will match cases with custom attributes selection for example:
         # "(SELECT COUNT(*) FROM images) as IMG_count" =~ /img_count/
@@ -58,4 +61,3 @@ module NestedSelect
     end
   end
 end
-

data/lib/nested_select/preloader/branch.rb

@@ -1,25 +1,29 @@
-# TODO describe Branch dedications
+# frozen_string_literal: true
+
+# TODO: describe Branch dedications
 module NestedSelect
   module Preloader
     module Branch
       attr_accessor :nested_select_values
+
       def preloaders_for_reflection(reflection, reflection_records)
         prevent_belongs_to_foreign_key_absence!(reflection)
 
         super.tap do |ldrs|
           # nested_select_values contains current level selection + nested relation selections
-          ldrs.each{ _1.apply_nested_select_values(nested_select_values) } if nested_select_values.present?
+          ldrs.each { _1.apply_nested_select_values(nested_select_values) } if nested_select_values.present?
         end
       end
 
       private
+
       def prevent_belongs_to_foreign_key_absence!(reflection)
         return unless reflection.is_a?(ActiveRecord::Reflection::BelongsToReflection)
 
         # ActiveRecord will not raise in case its missing, so we should prevent silent error here
         if parent.nested_select_values.present? &&
-          !parent.nested_select_values.grep_v(Hash)
-                 .map(&:to_sym).include?(reflection.foreign_key.to_sym)
+            !parent.nested_select_values.grep_v(Hash)
+                .map(&:to_sym).include?(reflection.foreign_key.to_sym)
 
           raise ActiveModel::MissingAttributeError, <<~ERR
             Parent reflection #{parent.association} was missing foreign key #{reflection.foreign_key} in nested selection,
@@ -30,4 +34,4 @@ module NestedSelect
       end
     end
   end
-end
+end

data/lib/nested_select/preloader/through_association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NestedSelect
   module Preloader
     module ThroughAssociation
@@ -7,7 +9,7 @@ module NestedSelect
           associations: through_reflection.name,
           scope: through_scope,
           associate_by_default: false,
-          ).tap do
+        ).tap do
           _1.apply_nested_select_values(nested_select_values&.grep(Hash))
         end.loaders
       end
@@ -16,8 +18,6 @@ module NestedSelect
         foreign_key = reflection.foreign_key unless reflection.parent_reflection.is_a?(ActiveRecord::Reflection::HasAndBelongsToManyReflection)
         [*foreign_key, *reflection.klass.primary_key].map(&:to_s)
       end
-
     end
   end
 end
-

data/lib/nested_select/preloader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NestedSelect
   module Preloader
     extend ActiveSupport::Autoload
@@ -13,13 +15,13 @@ module NestedSelect
       ActiveRecord::Associations::Preloader::Association.prepend(Association)
     end
 
-    # first one will start from the roots [included_1: [{}], included_2: [{}] ]
+    # first one will start from the roots [{included_1: [{}], included_2: [{}]}]
     def apply_nested_select_values(nested_select_values)
       distribute_nested_select_over_loading_tree(@tree, nested_select_values)
     end
 
     def distribute_nested_select_over_loading_tree(sub_tree, nested_select_values)
-      #  nested_select_values = [:id, :title, comments: [:id, :body], cover: [:id, img: [:url]]]
+      # Ex: nested_select_values = [:id, :title, comments: [:id, :body], cover: [:id, img: [:url]]]
       return if nested_select_values.blank?
 
       sub_tree.nested_select_values = [*nested_select_values.grep_v(Hash)]
@@ -40,4 +42,4 @@ module NestedSelect
       end
     end
   end
-end
+end

data/lib/nested_select/relation.rb

@@ -25,16 +25,34 @@ module NestedSelect
     #   end
     # end
 
+    # this is copy of the original ActiveRecord::Relation#preload_associations method
+    # the only patching I' doing -- streaming down nested_select_values over the preloading trees
     def preload_associations(records) # :nodoc:
       preload = preload_values
       preload += includes_values unless eager_loading?
       scope = strict_loading_value ? StrictLoadingScope : nil
       preload.each do |associations|
         ActiveRecord::Associations::Preloader.new(records:, associations:, scope:)
-          .tap{_1.apply_nested_select_values(nested_select_values) } # <-- Patching code
-          .call
+          .tap do# <-- Patching code goes here
+            # at this moment nested_select_values will have a structure of an array of one hash element,
+            # with multiple keys matching those in associations, so we need to separate them per branch
+            if nested_select_values.present?
+              # associations will have a structure of either tree like hash or str/sym
+              # Ex: includes(:relation1, relation2: :nested_relation)
+              # associations will be either :relation1 or { relation2: :nested_relation }
+              root_association_name = (associations.try(:keys) || associations.try(:to_sym) || associations)
+              # nested_select_values, after deep_combine_elements
+              # will have structure of an array of single element at this moment:
+              # [{relation1: [columns..], relation2: [columns, nested_relation: [columns]] }]
+              # so we need to populate nested_select_values over associations branch
+              _1.apply_nested_select_values([nested_select_values.first.slice(*root_association_name)])
+            end
+        end.call
       end
     end
   end
 
 end
+
+
+# ActiveRecord::Associations::Preloader.new(records:, associations:, scope:)

data/lib/nested_select/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NestedSelect
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

data/lib/nested_select.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "logger" # Fix concurrent-ruby removing logger dependency which Rails itself does not have
 require_relative "nested_select/version"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nested_select
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - alekseyl
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-09 00:00:00.000000000 Z
+date: 2025-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,7 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: amazing_print
+  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: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,19 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rails_sql_prettifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +137,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-shopify
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: stubberry
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails_sql_prettifier
+  name: stubberry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: amazing_print
+  name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-shopify
+  name: drb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: mutex_m
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="