nested_select 0.4.0 → 0.4.4

data/gemfiles/rails_8.gemfile.lock

@@ -0,0 +1,254 @@
+PATH
+  remote: ..
+  specs:
+    nested_select (0.4.4)
+      activerecord (>= 7)
+      activesupport (>= 7)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (8.0.2)
+      actionpack (= 8.0.2)
+      activesupport (= 8.0.2)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (8.0.2)
+      actionpack (= 8.0.2)
+      activejob (= 8.0.2)
+      activerecord (= 8.0.2)
+      activestorage (= 8.0.2)
+      activesupport (= 8.0.2)
+      mail (>= 2.8.0)
+    actionmailer (8.0.2)
+      actionpack (= 8.0.2)
+      actionview (= 8.0.2)
+      activejob (= 8.0.2)
+      activesupport (= 8.0.2)
+      mail (>= 2.8.0)
+      rails-dom-testing (~> 2.2)
+    actionpack (8.0.2)
+      actionview (= 8.0.2)
+      activesupport (= 8.0.2)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actiontext (8.0.2)
+      actionpack (= 8.0.2)
+      activerecord (= 8.0.2)
+      activestorage (= 8.0.2)
+      activesupport (= 8.0.2)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (8.0.2)
+      activesupport (= 8.0.2)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (8.0.2)
+      activesupport (= 8.0.2)
+      globalid (>= 0.3.6)
+    activemodel (8.0.2)
+      activesupport (= 8.0.2)
+    activerecord (8.0.2)
+      activemodel (= 8.0.2)
+      activesupport (= 8.0.2)
+      timeout (>= 0.4.0)
+    activestorage (8.0.2)
+      actionpack (= 8.0.2)
+      activejob (= 8.0.2)
+      activerecord (= 8.0.2)
+      activesupport (= 8.0.2)
+      marcel (~> 1.0)
+    activesupport (8.0.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    amazing_print (1.7.2)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.3)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
+    builder (3.3.0)
+    byebug (12.0.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
+    crass (1.0.6)
+    date (3.4.1)
+    drb (2.2.1)
+    erubi (1.13.1)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
+    io-console (0.8.0)
+    irb (1.15.2)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.11.3)
+    language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    loofah (2.24.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    mini_mime (1.1.5)
+    minitest (5.25.5)
+    net-imap (0.5.8)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.1)
+      net-protocol
+    niceql (0.6.1)
+    nio4r (2.7.4)
+    nokogiri (1.18.8-x86_64-linux-gnu)
+      racc (~> 1.4)
+    parallel (1.27.0)
+    parser (3.3.8.0)
+      ast (~> 2.4.1)
+      racc
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.4.0)
+    psych (5.2.4)
+      date
+      stringio
+    racc (1.8.1)
+    rack (3.1.13)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rackup (2.2.1)
+      rack (>= 3)
+    rails (8.0.2)
+      actioncable (= 8.0.2)
+      actionmailbox (= 8.0.2)
+      actionmailer (= 8.0.2)
+      actionpack (= 8.0.2)
+      actiontext (= 8.0.2)
+      actionview (= 8.0.2)
+      activejob (= 8.0.2)
+      activemodel (= 8.0.2)
+      activerecord (= 8.0.2)
+      activestorage (= 8.0.2)
+      activesupport (= 8.0.2)
+      bundler (>= 1.15.0)
+      railties (= 8.0.2)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    rails-i18n (8.0.1)
+      i18n (>= 0.7, < 2)
+      railties (>= 8.0.0, < 9)
+    rails_sql_prettifier (7.0.7)
+      activerecord (>= 7)
+      niceql (~> 0.6)
+    railties (8.0.2)
+      actionpack (= 8.0.2)
+      activesupport (= 8.0.2)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    rdoc (6.13.1)
+      psych (>= 4.0.0)
+    regexp_parser (2.10.0)
+    reline (0.6.1)
+      io-console (~> 0.5)
+    rubocop (1.75.4)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.44.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-shopify (2.17.0)
+      rubocop (~> 1.62)
+    ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
+    sqlite3 (2.6.0-x86_64-linux-gnu)
+    stringio (3.1.7)
+    stubberry (0.3.0)
+    thor (1.3.2)
+    timeout (0.4.3)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.3)
+    useragent (0.16.11)
+    websocket-driver (0.7.7)
+      base64
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.7.2)
+
+PLATFORMS
+  x86_64-linux-gnu
+
+DEPENDENCIES
+  amazing_print
+  appraisal
+  bundler (>= 1.11)
+  byebug
+  minitest (~> 5.16)
+  nested_select!
+  rails (>= 8)
+  rails-i18n (>= 4)
+  rails_sql_prettifier
+  rake (~> 13.0)
+  rubocop (~> 1.21)
+  rubocop-shopify
+  sqlite3
+  stubberry
+
+BUNDLED WITH
+   2.5.11

data/lib/nested_select/deep_merger.rb

@@ -7,22 +7,12 @@ module NestedSelect
         merge!(other.except(*keys))
         merge!(other.slice(*keys).map{ |key, value| [key, [self[key], value].flatten.deep_combine_elements]}.to_h )
       end
-
-      def relation_nesting_depth
-        1 + [*values.grep(Hash), *values.grep(Array)].map(&:relation_nesting_depth).max.to_i
-      end
     end
 
     refine Array do
       def deep_combine_elements
         [*grep_v(Hash), grep(Hash).inject(&:deep_combine)].uniq.compact
       end
-      # in terms of relation/selection nesting every array node
-      # should not add +1 to depth, that mean that array nesting
-      # does not count as nesting [[[]]] has depth equal 0.
-      def relation_nesting_depth
-        [*grep(Hash), *grep(Array)].map(&:relation_nesting_depth).max.to_i
-      end
     end
   end
 end

data/lib/nested_select/preloader/association.rb

@@ -4,17 +4,27 @@ module NestedSelect
       attr_reader :nested_select_values
 
       def build_scope
-        nested_select_values.blank? ? super :
-          super.select(*nested_select_values.grep_v(Hash).map{_1.try(:to_s) }.uniq)
+        association_nested_select_values.blank? ? super : super.select(association_nested_select_values)
       end
 
       def apply_nested_select_values(partial_select_values)
+        @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)
-        @nested_select_values = [*partial_select_values, *foreign_key, *reflection.klass.primary_key]
-        ensure_nesting_selection_integrity!
+        [*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) }
+        return if this_association_select_values.blank?
+
+        [*this_association_select_values, *reflection_relation_keys_attributes].uniq
       end
 
-      def ensure_nesting_selection_integrity!
+      # ensure that different preloading branches will match nested selected attributes
+      def ensure_nesting_selection_integrity!(nested_select_final_values)
         single_owner = owners.first
         # do nothing unless not yet loaded
         return unless single_owner.association(reflection.name).loaded?
@@ -25,7 +35,7 @@ module NestedSelect
         single_reflection_record = single_reflection_record.first if single_reflection_record.is_a?(Enumerable)
 
         attributes_loaded = single_reflection_record.attributes.keys.map(&:to_s)
-        current_selection = @nested_select_values.grep_v(Hash).map(&:to_s)
+        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

data/lib/nested_select/preloader/branch.rb

@@ -23,7 +23,7 @@ module NestedSelect
 
           raise ActiveModel::MissingAttributeError, <<~ERR
             Parent reflection #{parent.association} was missing foreign key #{reflection.foreign_key} in nested selection,
-            while trying to preload belongs_to reflection named #{reflection.name}. 
+            while trying to preload belongs_to reflection named #{reflection.name}.
             Hint: didn't you forgot to add #{reflection.foreign_key} inside #{parent.nested_select_values}?
           ERR
         end

data/lib/nested_select/preloader/through_association.rb

@@ -1,20 +1,6 @@
 module NestedSelect
   module Preloader
     module ThroughAssociation
-      # this preloader root will preload intermediate records, so here we should apply 'through'
-      # selection limitation AS A BASIC nested selection and it wuold be either __minimize_through_selection sym OR
-      # nested_selection tree
-      # def source_preloaders
-      #   @source_preloaders ||= ActiveRecord::Associations::Preloader.new(
-      #     records: middle_records,
-      #     associations: source_reflection.name,
-      #     scope: scope,
-      #     associate_by_default: false
-      #   ).tap {
-      #     byebug
-      #     _1.apply_nested_select_values([*@limit_through_selection])
-      #   }.loaders
-      # end
       def through_preloaders
         @through_preloaders ||= ActiveRecord::Associations::Preloader.new(
           records: owners,
@@ -22,62 +8,14 @@ module NestedSelect
           scope: through_scope,
           associate_by_default: false,
           ).tap do
-          _1.apply_nested_select_values(nested_select_values.grep(Hash))
+          _1.apply_nested_select_values(nested_select_values&.grep(Hash))
         end.loaders
       end
 
-      # def through_scope
-      #   if @limit_through_selection.present?
-      #     # through_selection is either __minimize_through_selection symbol, or an array
-      #     through_selection = [*@limit_through_selection]
-      #     through_selection = [*through_selection.grep_v(Hash),
-      #                          *through_selection.grep(Hash).first&.dig(through_reflection.source_reflection_name)]
-      #     through_selection << through_reflection.foreign_key
-      #     through_selection << through_reflection.klass.primary_key
-      #     super.select(through_selection)
-      #   else
-      #     super
-      #   end
-      # end
-
-      # def through_scope
-      #   if @limit_through_selection.present?
-      #     super.select(through_reflection.foreign_key.to_sym, through_reflection.klass.primary_key.to_sym)
-      #   else
-      #     super
-      #   end
-      # end
-      # def through_selection_nesting
-      #   return if @limit_through_selection.blank?
-      #   through_limit_selection = [through_reflection.foreign_key.to_sym, through_reflection.klass.primary_key.to_sym]
-      #   through_limit_selection << :__minimize_through_selection if through_reflection.is_a?(ActiveRecord::Reflection::ThroughReflection)
-      #   through_limit_selection
-      # end
-
-      def apply_nested_select_values(partial_select_values)
-
-        if reflection.parent_reflection.is_a?(ActiveRecord::Reflection::HasAndBelongsToManyReflection)
-          # when parent reflection is a HasAndBelongsToManyReflection,
-          # then we don't need foreign_key to be included, as it does in super
-          @nested_select_values = partial_select_values
-        else
-          @limit_through_selection = partial_select_values.delete(:__minimize_through_selection)
-          super(partial_select_values)
-        end
+      def reflection_relation_keys_attributes
+        foreign_key = reflection.foreign_key unless reflection.parent_reflection.is_a?(ActiveRecord::Reflection::HasAndBelongsToManyReflection)
+        [*foreign_key, *reflection.klass.primary_key].map(&:to_s)
       end
-      # def exract_through_selections(partial_select_values)
-      #   # __minimize_through_selection: [ :user_id, user_profile: [] ]
-      #   # there should not be more than one such limitation definition
-      #   through_selection_rules, cleaned_partial_select_values = partial_select_values&.partition do
-      #     _1 == :__minimize_through_selection || _1.is_a?(Hash) && _1[:__minimize_through_selection].present?
-      #   end
-      #   @limit_through_selection = through_selection_rules.map do
-      #     _1.is_a?(Hash) && _1[:__minimize_through_selection] || _1
-      #   end.first
-      #
-      #   byebug
-      #   cleaned_partial_select_values
-      # end
 
     end
   end

data/lib/nested_select/preloader.rb

@@ -18,13 +18,6 @@ module NestedSelect
       distribute_nested_select_over_loading_tree(@tree, nested_select_values)
     end
 
-    # this one either subtree roots only when its first, OR current branch selection root
-    # + its branches in array
-    # 1) [:__minimize_through_selection, ...]
-    # 2) []
-    # Логика следующая:
-    #  если мы передаем __minimize_through_selection как символ, то его надо пробросить до всех бранчей, они с этим разберутся, там где надо
-    #  если у нас там хеш, то его надо оставить на текущем уровне и дальше если это through, то оно превратит это в нестед селект для вложенных
     def distribute_nested_select_over_loading_tree(sub_tree, nested_select_values)
       #  nested_select_values = [:id, :title, comments: [:id, :body], cover: [:id, img: [:url]]]
       return if nested_select_values.blank?

data/lib/nested_select/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NestedSelect
-  VERSION = "0.4.0"
+  VERSION = "0.4.4"
 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"
 
 module NestedSelect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nested_select
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.4
 platform: ruby
 authors:
 - alekseyl
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-09 00:00:00.000000000 Z
+date: 2025-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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'
 description: ActiveRecord improved select on nested models, allows partial instantiation
   on nested models, easy one step improvements on performance and memory
 email:
@@ -186,21 +200,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".idea/.gitignore"
-- ".idea/inspectionProfiles/profiles_settings.xml"
-- ".idea/misc.xml"
-- ".idea/modules.xml"
-- ".idea/nested_select.iml"
-- ".idea/vcs.xml"
 - ".rubocop.yml"
 - ABOUT_NESTED_SELECT.md
+- Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Dockerfile
+- Dockerfile_apprsl
 - LICENSE.txt
 - README.md
 - Rakefile
 - docker-compose.yml
+- gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.0.gemfile.lock
+- gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.1.gemfile.lock
+- gemfiles/rails_7.2.gemfile
+- gemfiles/rails_7.2.gemfile.lock
+- gemfiles/rails_8.gemfile
+- gemfiles/rails_8.gemfile.lock
 - lib/nested_select.rb
 - lib/nested_select/deep_merger.rb
 - lib/nested_select/preloader.rb
@@ -210,7 +228,6 @@ files:
 - lib/nested_select/relation.rb
 - lib/nested_select/version.rb
 - sig/nested_select.rbs
-- test_habtm_reflections.rb
 homepage: https://github.com/alekseyl/nested_select
 licenses:
 - MIT

data/.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

data/.idea/inspectionProfiles/profiles_settings.xml

@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" />
-  </settings>
-</component>

data/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="NodePackageJsonFileManager">
-    <packageJsonPaths />
-  </component>
-</project>

data/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/nested_select.iml" filepath="$PROJECT_DIR$/.idea/nested_select.iml" />
-    </modules>
-  </component>
-</project>