awesome_nested_set 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70956fe8d08167ab96e67894222f423188919dcb05a5a607f33d3372b5c909db
-  data.tar.gz: cd34dc69edd00532c4cf8315263fb5f4b81c65ce02057600b514cf650bc5ff91
+  metadata.gz: 987975770adaff76d0b73ccbb82d5bdc008023485d822ac07e84586a550a2ede
+  data.tar.gz: 35dace0d877e6abcd9cacc806447311eea226d916cf753fb17c23d957a73a398
 SHA512:
-  metadata.gz: 60354ed14c223e08bdec1da6ed56c533d3247ffedc846bf11f5c54b6065e0f3ea886db0a19405eac0dfc30721dd417b8ae441e0a1432dea6eb5caa7dd45dab7f
-  data.tar.gz: 2ec0377f5fa405db532d6b7bb630d6225157d958e3cf868dabfcdec11536886ab83f809aa6443cfefa59c55f689cbe8ca123b78e845bd8cf233531a333f3bf31
+  metadata.gz: bf339d676ccbb8258b642f7017b950d2d1947e9819648b8e5b6254ad6e460c2e129648de11c969833eabaacdc1a481743c2a0441b7b8a8cfe17242bd2546a3fc
+  data.tar.gz: 492ecf9fac7fe59bc51a60a630a595a5f8c533c3799d7d4cc137e75f8c60b088f717a8b146395779f3835f0bcc0174890c1463fbd23385faea04ad6c57f3a0cd

data/CHANGELOG

@@ -1,5 +1,12 @@
 Unreleased version
-* [Compare to 3.2.1](https://github.com/collectiveidea/awesome_nested_set/compare/v3.2.1...master)
+
+* [Compare to 3.3.0](https://github.com/collectiveidea/awesome_nested_set/compare/v3.3.0...master)
+
+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)

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?
 

data/lib/awesome_nested_set/awesome_nested_set.rb

@@ -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!
@@ -102,7 +102,7 @@ module CollectiveIdea #:nodoc:
           :touch => acts_as_nested_set_options[:touch]
         }
         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

@@ -79,9 +79,13 @@ module CollectiveIdea #:nodoc:
           end
 
           def nested_set_scope(options = {})
-            options = {:order => { order_column_name => :asc }}.merge(options)
+            order = scope_order_from_options(options)
+            default_scoped.where(options[:conditions]).order(order)
+          end
 
-            where(options[:conditions]).order(options.delete(:order))
+          def nested_set_scope_without_default_scope(options = {})
+            order = scope_order_from_options(options)
+            unscoped.where(options[:conditions]).order(order)
           end
 
           def primary_key_scope(id)
@@ -95,6 +99,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,11 +149,7 @@ 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
         end
@@ -153,10 +159,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.nested_set_scope_without_default_scope options
         end
 
         def to_text
@@ -167,6 +173,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])

data/lib/awesome_nested_set/move.rb

@@ -96,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.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.1' unless defined?(::AwesomeNestedSet::VERSION)
+  VERSION = '3.3.0' unless defined?(::AwesomeNestedSet::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awesome_nested_set
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Brandon Keepers
@@ -36,7 +36,7 @@ cert_chain:
   Hsej0MQ3drCB1eA4c9OXdCUQJnY2aLTq3uNvTbZvoTgWK55eq3KLBJ4zzoKZ4tBX
   /HIFI/fEwYlI1Ji3oikUrHkc4rWgaQ==
   -----END CERTIFICATE-----
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2021-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: An awesome nested set implementation for Active Record