awesome_nested_set 3.3.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21d0bfb95d740009c0df08b796d8cc8a7fcffb329a7071e3e8abac8b6b5bc4ad
-  data.tar.gz: 1ef4e781fe0300d2316ca1f6bbdcce5c208618e3a7ac0aa5fc0966a5ea8b8bea
+  metadata.gz: 5145938ca7a83f2c7f17b21792d96b43fc7c3e7ad90827af1e54bfc69b67d455
+  data.tar.gz: a7c20bb47b946a37e4946ca73577f292679e85624aeb03f75762be7b1e3bc3d7
 SHA512:
-  metadata.gz: a98ce815f1e820457f7e2b87358b8af5cc584c894bd08ef531d32abeb92aaf64d484edbdac6ef264bab8b03d946b2bb68f6eb3433fd27a0516ef2de69fa7fd7a
-  data.tar.gz: ed46eb2b3a4311aead5153608bb26c99add49a796eacfbc5ba910f7854614015bf8bea1bfa63181ebe602692d14864de0866625600326037a65aa468fd98ca89
+  metadata.gz: b5af92810fd9120cbc84f7ea9f70b444a9331c4ac532e80b03a7c88a506f63a72e80d84ee0b536dfa8f2691c3351d922d55812149188670d45c3945c91a8a651
+  data.tar.gz: 9abe2f9c68010fe4f8105949afc7ecb9941d0897d89bdc0e994920f7a4dec41b2ee1e372e52bc947cbce8395eedec18546d34ce873ba2e9694a53e4b6ab7ea95

data/CHANGELOG

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

data/lib/awesome_nested_set/model.rb

@@ -80,12 +80,7 @@ module CollectiveIdea #:nodoc:
 
           def nested_set_scope(options = {})
             order = scope_order_from_options(options)
-            default_scoped.where(options[:conditions]).order(order)
-          end
-
-          def nested_set_scope_without_default_scope(options = {})
-            order = scope_order_from_options(options)
-            unscoped.where(options[:conditions]).order(order)
+            where(options[:conditions]).order(order)
           end
 
           def primary_key_scope(id)
@@ -151,7 +146,7 @@ module CollectiveIdea #:nodoc:
         def nested_set_scope(options = {})
           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
@@ -162,7 +157,7 @@ module CollectiveIdea #:nodoc:
         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
+          self.class.base_class.unscoped.nested_set_scope options
         end
 
         def to_text
@@ -249,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

@@ -96,7 +96,7 @@ 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.nested_set_scope.
+          instance_base_class.default_scoped.nested_set_scope.
                               right_of(left_bound).left_of_right_side(right_bound).
                               select(primary_column_name).
                               lock(true)

data/lib/awesome_nested_set/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AwesomeNestedSet
-  VERSION = '3.3.1' unless defined?(::AwesomeNestedSet::VERSION)
+  VERSION = '3.4.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.3.1
+  version: 3.4.0
 platform: ruby
 authors:
 - Brandon Keepers
@@ -36,7 +36,7 @@ cert_chain:
   Hsej0MQ3drCB1eA4c9OXdCUQJnY2aLTq3uNvTbZvoTgWK55eq3KLBJ4zzoKZ4tBX
   /HIFI/fEwYlI1Ji3oikUrHkc4rWgaQ==
   -----END CERTIFICATE-----
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -154,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: []
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: An awesome nested set implementation for Active Record