awesome_nested_set 3.2.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3ecf7f786a6b917601a6818b9ea57db89a2ed41f74e5053455ce1cb7f121229
-  data.tar.gz: 31ffd151ff36b304e8c89cdcb129bc52a63b8a500577adf775df4eb11ef216f5
+  metadata.gz: 5145938ca7a83f2c7f17b21792d96b43fc7c3e7ad90827af1e54bfc69b67d455
+  data.tar.gz: a7c20bb47b946a37e4946ca73577f292679e85624aeb03f75762be7b1e3bc3d7
 SHA512:
-  metadata.gz: b64fdc6283aa35df65896df891124c89d305eb38e47f02fe151ff698dc4653570497839464205c74300ec05821107b5c2a6f04c48c5cb103b4df598609d8b606
-  data.tar.gz: 1f26c9f63c803266dbd07016a4bee0c3034af2b236b84a889dd9ee361e7f3bc3531dae49b7d474177e0fcc2cb782292d735625440d613b0f435506914a5ec227
+  metadata.gz: b5af92810fd9120cbc84f7ea9f70b444a9331c4ac532e80b03a7c88a506f63a72e80d84ee0b536dfa8f2691c3351d922d55812149188670d45c3945c91a8a651
+  data.tar.gz: 9abe2f9c68010fe4f8105949afc7ecb9941d0897d89bdc0e994920f7a4dec41b2ee1e372e52bc947cbce8395eedec18546d34ce873ba2e9694a53e4b6ab7ea95

data/CHANGELOG

@@ -1,3 +1,27 @@
+Unreleased version
+
+* [Compare to 3.4.0](https://github.com/collectiveidea/awesome_nested_set/compare/v3.4.0...master)
+
+3.4.0
+* Keep current scope when calling `roots` [Petrik de Heus](https://github.com/p8)
+* STI record now can update counter cache correctly [Issei Murasawa](http://github.com/issei-m)
+* [Compare to 3.3.1](https://github.com/collectiveidea/awesome_nested_set/compare/v3.3.1...master)
+
+3.3.1
+* Add belongs_to :polymorphic key option only when used [Filippo Liverani](https://github.com/filippoliverani)
+* [Compare to 3.3.0](https://github.com/collectiveidea/awesome_nested_set/compare/v3.3.0...v3.3.1)
+
+3.3.0
+* Update for compatibility with Rails 6.1 which no longer inherits scoping
+  (Messages of the form "DEPRECATION WARNING: Class level methods will no longer inherit scoping from ...") [Marc Rohloff](https://github.com/marcrohloff)
+* Fix ruby 2.7 keyword parameters deprecation warning [Krisdigital](https://github.com/krisdigital)
+* [Compare to 3.2.1](https://github.com/collectiveidea/awesome_nested_set/compare/v3.2.1...v3.3.0)
+
+3.2.1
+* Don't reload in after_save callback. [Petrik de Heus](https://github.com/p8)
+* Fix deprecation warning "Passing a range to `#in` is deprecated". [Konstantin Mochalov](https://github.com/kolen)
+* [Compare to 3.2.0](https://github.com/collectiveidea/awesome_nested_set/compare/v3.2.0...v3.2.1)
+
 3.2.0
 * Add support for Rails 6.0 [Stefan Andersen](https://github.com/stfnndrsn) and [Damian Legawiec](https://github.com/damianlegawiec) and [Jonathan Tapia](https://github.com/jtapia) and [Alex](https://github.com/a-ta-ta)
 * [Compare to 3.1.4](https://github.com/collectiveidea/awesome_nested_set/compare/v3.1.4...v3.2.0)

data/README.md

@@ -6,7 +6,8 @@
 Awesome Nested Set is an implementation of the nested set pattern for ActiveRecord models.
 It is a replacement for acts_as_nested_set and BetterNestedSet, but more awesome.
 
-Version 3.1 supports Rails 5 & 4. Version 2 supports Rails 3. Gem versions prior to 2.0 support Rails 2.
+Version 3.2 supports Rails 6, 3.1 supports Rails 5 & 4. Version 2 supports Rails 3. 
+Gem versions prior to 2.0 support Rails 2.
 
 ## What makes this so awesome?
 
@@ -65,6 +66,7 @@ Run `rake rdoc` to generate the API docs and see [CollectiveIdea::Acts::NestedSe
 You can pass various options to `acts_as_nested_set` macro. Configuration options are:
 
 * `parent_column`: specifies the column name to use for keeping the position integer (default: parent_id)
+* `primary_column`: specifies the column name to use as the inverse of the parent column (default: id)
 * `left_column`: column name for left boundary data (default: lft)
 * `right_column`: column name for right boundary data (default: rgt)
 * `depth_column`: column name for the depth data default (default: depth)

data/lib/awesome_nested_set/awesome_nested_set.rb

@@ -25,8 +25,8 @@ module CollectiveIdea #:nodoc:
       #
       # * +:parent_column+ - specifies the column name to use for keeping the position integer (default: parent_id)
       # * +:primary_column+ - specifies the column name to use as the inverse of the parent column (default: id)
-      # * +:left_column+ - column name for left boundry data, default "lft"
-      # * +:right_column+ - column name for right boundry data, default "rgt"
+      # * +:left_column+ - column name for left boundary data, default "lft"
+      # * +:right_column+ - column name for right boundary data, default "rgt"
       # * +:depth_column+ - column name for the depth data, default "depth"
       # * +:scope+ - restricts what is to be considered a list. Given a symbol, it'll attach "_id"
       #   (if it hasn't been already) and use that as the foreign key restriction. You
@@ -88,7 +88,7 @@ module CollectiveIdea #:nodoc:
         end
 
         has_many :children, -> { order(order_column_name => :asc) },
-                 has_many_children_options
+                 **has_many_children_options
       end
 
       def acts_as_nested_set_relate_parent!
@@ -98,11 +98,11 @@ module CollectiveIdea #:nodoc:
           :primary_key => primary_column_name,
           :counter_cache => acts_as_nested_set_options[:counter_cache],
           :inverse_of => (:children unless acts_as_nested_set_options[:polymorphic]),
-          :polymorphic => acts_as_nested_set_options[:polymorphic],
           :touch => acts_as_nested_set_options[:touch]
         }
+        options[:polymorphic] = true if acts_as_nested_set_options[:polymorphic]
         options[:optional] = true if ActiveRecord::VERSION::MAJOR >= 5
-        belongs_to :parent, options
+        belongs_to :parent, **options
       end
 
       def acts_as_nested_set_default_options

data/lib/awesome_nested_set/model.rb

@@ -52,7 +52,7 @@ module CollectiveIdea #:nodoc:
 
           # Iterates over tree elements and determines the current level in the tree.
           # Only accepts default ordering, odering by an other column than lft
-          # does not work. This method is much more efficent than calling level
+          # does not work. This method is much more efficient than calling level
           # because it doesn't require any additional database queries.
           #
           # Example:
@@ -79,9 +79,8 @@ module CollectiveIdea #:nodoc:
           end
 
           def nested_set_scope(options = {})
-            options = {:order => { order_column_name => :asc }}.merge(options)
-
-            where(options[:conditions]).order(options.delete(:order))
+            order = scope_order_from_options(options)
+            where(options[:conditions]).order(order)
           end
 
           def primary_key_scope(id)
@@ -95,6 +94,12 @@ module CollectiveIdea #:nodoc:
           def roots
             nested_set_scope.children_of nil
           end
+
+          private
+
+          def scope_order_from_options(options)
+            options.fetch(:order, { order_column_name => :asc })
+          end
         end # end class methods
 
         # Any instance method that returns a collection makes use of Rails 2.1's named_scope (which is bundled for Rails 2.0), so it can be treated as a finder.
@@ -139,13 +144,9 @@ module CollectiveIdea #:nodoc:
         # performs finds on the base ActiveRecord class, using the :scope
         # declared in the acts_as_nested_set declaration.
         def nested_set_scope(options = {})
-          if (scopes = Array(acts_as_nested_set_options[:scope])).any?
-            options[:conditions] = scopes.inject({}) do |conditions,attr|
-              conditions.merge attr => self[attr]
-            end
-          end
+          add_scope_conditions_to_options(options)
 
-          self.class.base_class.nested_set_scope options
+          self.class.base_class.default_scoped.nested_set_scope options
         end
 
         # Separate an other `nested_set_scope` for unscoped model
@@ -153,10 +154,10 @@ module CollectiveIdea #:nodoc:
         # Only activerecord callbacks need unscoped model to handle the nested set records
         # And class level `nested_set_scope` seems just for query `root` `child` .. etc
         # I think we don't have to provide unscoped `nested_set_scope` in class level.
-        def nested_set_scope_without_default_scope(*args)
-          self.class.base_class.unscoped do
-            nested_set_scope(*args)
-          end
+        def nested_set_scope_without_default_scope(options = {})
+          add_scope_conditions_to_options(options)
+
+          self.class.base_class.unscoped.nested_set_scope options
         end
 
         def to_text
@@ -167,6 +168,13 @@ module CollectiveIdea #:nodoc:
 
         protected
 
+        def add_scope_conditions_to_options(options)
+          scopes = scope_column_names
+          return if scopes.empty?
+
+          options[:conditions] = scopes.map { |attr| [attr, self[attr] ] }.to_h
+        end
+
         def without_self(scope)
           return scope if new_record?
           scope.where(["#{self.class.quoted_table_name}.#{self.class.quoted_primary_column_name} != ?", self.primary_id])
@@ -200,7 +208,6 @@ module CollectiveIdea #:nodoc:
           return unless has_depth_column?
 
           in_tenacious_transaction do
-            reload
             update_depth(level)
           end
         end
@@ -237,12 +244,12 @@ module CollectiveIdea #:nodoc:
 
           # Decrease the counter for all old parents
           if old_parent = self.parent
-            self.class.decrement_counter(acts_as_nested_set_options[:counter_cache], old_parent)
+            old_parent.class.decrement_counter(acts_as_nested_set_options[:counter_cache], old_parent)
           end
 
           # Increase the counter for all new parents
           if new_parent = self.reload.parent
-            self.class.increment_counter(acts_as_nested_set_options[:counter_cache], new_parent)
+            new_parent.class.increment_counter(acts_as_nested_set_options[:counter_cache], new_parent)
           end
         end
 

data/lib/awesome_nested_set/move.rb

@@ -41,9 +41,21 @@ module CollectiveIdea #:nodoc:
         delegate :base_class, :to => :instance_class, :prefix => :instance
 
         def where_statement(left_bound, right_bound)
-          instance_arel_table[left_column_name].in(left_bound..right_bound).
+          instance_arel_table[left_column_name].between(left_bound..right_bound).
+            or(instance_arel_table[right_column_name].between(left_bound..right_bound))
+        end
+
+        # Before Arel 6, there was 'in' method, which was replaced
+        # with 'between' in Arel 6 and now gives deprecation warnings
+        # in verbose mode. This is patch to support rails 4.0 (Arel 4)
+        # and 4.1 (Arel 5).
+        module LegacyWhereStatementExt
+          def where_statement(left_bound, right_bound)
+            instance_arel_table[left_column_name].in(left_bound..right_bound).
             or(instance_arel_table[right_column_name].in(left_bound..right_bound))
+          end
         end
+        prepend LegacyWhereStatementExt unless Arel::Predications.method_defined?(:between)
 
         def conditions(a, b, c, d)
           _conditions = case_condition_for_direction(:quoted_left_column_name) +
@@ -84,8 +96,10 @@ module CollectiveIdea #:nodoc:
 
         def lock_nodes_between!(left_bound, right_bound)
           # select the rows in the model between a and d, and apply a lock
-          instance_base_class.right_of(left_bound).left_of_right_side(right_bound).
-                              select(primary_column_name).lock(true)
+          instance_base_class.default_scoped.nested_set_scope.
+                              right_of(left_bound).left_of_right_side(right_bound).
+                              select(primary_column_name).
+                              lock(true)
         end
 
         def root

data/lib/awesome_nested_set/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AwesomeNestedSet
-  VERSION = '3.2.0' unless defined?(::AwesomeNestedSet::VERSION)
+  VERSION = '3.4.0' unless defined?(::AwesomeNestedSet::VERSION)
 end

metadata

@@ -1,16 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: awesome_nested_set
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Brandon Keepers
 - Daniel Morrison
 - Philip Arndt
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEMjCCApqgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhnZW1z
+  L0RDPXAvREM9YXJuZHQvREM9aW8wHhcNMjAwNTEwMjIxOTQ2WhcNMjEwNTEwMjIx
+  OTQ2WjAjMSEwHwYDVQQDDBhnZW1zL0RDPXAvREM9YXJuZHQvREM9aW8wggGiMA0G
+  CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDT+JzHYPGMYJt9ct2DCsbIymn1uJJp
+  HnDkQESfsGe40jTC90oF2iVbVOkaacNc1N3CSWUZvZjuygUuS86P6/kpBILGdO2+
+  bkXXKtfGC2YGGx9TdNLpCb4925vQHvdFeKXGpQDZdDw1SNC6zraZou47CvOE1cl2
+  Bp+1QMZuGRZ4+5CzOEWDWurjqce3O1jUEbyBB7z5H0h/YEaxfXipxhL1Dhi0sgkH
+  qP/e6SxzifdifdZCksJFQ06a1ji9hJY6eM23qbv/aaluVHAZSVBAQBS7rYniLo+N
+  G4vpFhoubQO5u8UluUtCaPUpI/qOvVcSaZn3ZkzlMwC8b1RwAeXBQmtFE2wnrv2i
+  ovTwoN7rHchwhgaHbkuFh4Wr92wGbrWL7J+X8rWKk1f8RF4kvtNE/NA6YrkxTpVh
+  QMyDmekt7rTxvcq2NneLGroWIUVCx/JID+Jw492LKQ6Sl1/P2TRzdEDtqZAZL0gt
+  xlWeMUfGG2D/gLnhs5qnaFaWQwGTmBnTgHcCAwEAAaNxMG8wCQYDVR0TBAIwADAL
+  BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEqtAyQVxPgKsrgoTQ1YmaIu/fmvMBoGA1Ud
+  EQQTMBGBD2dlbXNAcC5hcm5kdC5pbzAaBgNVHRIEEzARgQ9nZW1zQHAuYXJuZHQu
+  aW8wDQYJKoZIhvcNAQELBQADggGBALu2HM50B8xqlAXkCwavJDvWWtV9pG1igFUg
+  friZRWprUQ5nTaNmAd8p8qbJQwaIK2gt+DfYWfB9LtKnQTfbhLRBbmJ7zYw8LjKY
+  PwCs4RWjDAiuyCO3ppfsz+1bsMUXPLgWlaUkXsUy3nr2NruEFTO9zu3wGYQQ93Tt
+  vYSHOnP35UB4QjsjNrOO7FBaQfy6O909PP+GnVcJ62s9c26voJz63RSolwY7Jydw
+  XUlG68jjJKSoDHRzVTmNB7sX8rs8P2kvYkpIUXPHyls3mWBWjBWbdEYWESZrxI2x
+  dS7jY3AnfqhvsWra2pSREb2IDqPnJrHVOejnEI/zuuufUxLwDx3AC6SMdsyWkZ7V
+  9OmLt2rg75Sct6h2220lO5ySqYtqAXuOMBDGv5L0zLalx1g8LACA7uILTKVWh8B8
+  Hsej0MQ3drCB1eA4c9OXdCUQJnY2aLTq3uNvTbZvoTgWK55eq3KLBJ4zzoKZ4tBX
+  /HIFI/fEwYlI1Ji3oikUrHkc4rWgaQ==
+  -----END CERTIFICATE-----
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -128,14 +154,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 4.0.0
 description: An awesome nested set implementation for Active Record
 email: info@collectiveidea.com
 executables: []
@@ -166,7 +192,7 @@ homepage: http://github.com/collectiveidea/awesome_nested_set
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -185,8 +211,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: An awesome nested set implementation for Active Record
 test_files: []

metadata.gz.sig

@@ -0,0 +1,4 @@
+~� �y���Z<v��R��C;�\����uy���;�kh����f�3����\l�S^�����=��Xu!�`�(9ʈ,&��q���nM1�H����wu3C��D��U&���,�>f�/�o�a�g
+�
+C�
+L+�!��l+FAy��o�V�R���O}b�ST��mx�|8;Jl�n����9�L!��\����o9{���L�F����z�xg�s��=M�3��_�`9+8X$~F�	zNz1����