awesome_nested_set 3.0.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5ab643ea1dfe98a3df89d5bf2c142fd22d8d96f
-  data.tar.gz: 3f6089e375d849c9cb600eb4c776c40323b3e67e
+  metadata.gz: 886dba55e5efcba602756917fdd82ae57c3e6942
+  data.tar.gz: 0f17ad95fef44901498f7b21b2767b0b0e0d0259
 SHA512:
-  metadata.gz: 3afe6283157bd9937196de7ffe4239dac7be930417b505b306c92685cfdd703d9cf7463317994bc822490f4a426c0c88f3f3425501036cd00b00025a6f81dc8c
-  data.tar.gz: d96cf10ce68aa34ccee951f3b04beec6eebd960748c42502ba48016b3f559cf798c657b2b9b36d4238c38d1ba0dbca08f53dab5f39f3d3bb37044dcb4dafe902
+  metadata.gz: e52c139d7f15f8a9428ec22967c50899e9f31cdcbb301b59cdc322f796b2ce6ad51fa30e28e16cd975c76e73bc48c32e869ba24df06bad0a8e2a6e87b58169f7
+  data.tar.gz: 610280af1b3026696fd3980f7f6bb49d206ad255c770a9be9f0ab3372af455fa62c610cc8de3c68cfb6c8dcbd06431383a8082f8f9449157f668a7c13da8a6a9

data/CHANGELOG

@@ -1,4 +1,20 @@
-3.0.4
+3.1.4
+* Add support for Rails 5.2 [John Hawthorn](https://github.com/jhawthorn) and [marocchino](https://github.com/marocchino)
+
+3.1.3
+* Add support for Rails 5.1 [John Hawthorn](https://github.com/jhawthorn)
+
+3.1.2
+* Make belongs_to relation optional again [Jan Matusz](https://marahin.pl/)
+
+3.1.1
+* Fix a reloading bug when using default scope [Krzysztof Rybka](https://github.com/krzysiek1507)
+
+3.1.0
+* Ensure that nested_set queries respect the model's default_scope. [oesgalha](https://github.com/oesgalha)
+* Add Rails 5 support [Krzysztof Rybka](https://github.com/krzysiek1507)
+* Drop support for ruby 1.9.3 [Krzysztof Rybka](https://github.com/krzysiek1507)
+* Fix .all_roots_valid? method when model is ordered by default [Adam Hodowany](https://github.com/hodak)
 * Reuse the current model's connection when available [Tim Bugai] [#322](https://github.com/collectiveidea/awesome_nested_set/pull/322)
 
 3.0.3

data/README.md

@@ -1,12 +1,12 @@
 # Awesome Nested Set
 
-[![Build Status](https://travis-ci.org/collectiveidea/awesome_nested_set.png?branch=master)](https://travis-ci.org/collectiveidea/awesome_nested_set) [![Code Climate](https://codeclimate.com/github/collectiveidea/awesome_nested_set.png)](https://codeclimate.com/github/collectiveidea/awesome_nested_set) [![Dependency Status](https://gemnasium.com/collectiveidea/awesome_nested_set.svg)](https://gemnasium.com/collectiveidea/awesome_nested_set)
+[![Build Status](https://travis-ci.org/collectiveidea/awesome_nested_set.svg?branch=master)](https://travis-ci.org/collectiveidea/awesome_nested_set) [![Code Climate](https://codeclimate.com/github/collectiveidea/awesome_nested_set.svg)](https://codeclimate.com/github/collectiveidea/awesome_nested_set) [![Dependency Status](https://gemnasium.com/collectiveidea/awesome_nested_set.svg)](https://gemnasium.com/collectiveidea/awesome_nested_set) [![Security](https://hakiri.io/github/collectiveidea/awesome_nested_set/master.svg)](https://hakiri.io/github/collectiveidea/awesome_nested_set/master)
 
 
 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 supports Rails 4. Version 2 supports Rails 3. Gem versions prior to 2.0 support Rails 2.
+Version 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?
 
@@ -26,6 +26,8 @@ gem 'awesome_nested_set'
 To make use of `awesome_nested_set` your model needs to have 3 fields:
 `lft`, `rgt`, and `parent_id`. The names of these fields are configurable.
 You can also have optional fields: `depth` and `children_count`. These fields are configurable.
+Note that the `children_count` column must have `null: false` and `default: 0` to
+function properly.
 
 ```ruby
 class CreateCategories < ActiveRecord::Migration
@@ -66,7 +68,7 @@ You can pass various options to `acts_as_nested_set` macro. Configuration option
 * `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)
-* `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 can also pass an array to scope by multiple attributes. Example: `acts_as_nested_set :scope => [:notable_id, :notable_type]`
+* `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 can also pass an array to scope by multiple attributes. Example: `acts_as_nested_set :scope => [:notable_id, :notable_type]`
 * `dependent`: behavior for cascading destroy. If set to :destroy, all the child objects are destroyed alongside this object by calling their destroy method. If set to :delete_all (default), all the child objects are deleted without calling their destroy method. If set to :nullify, all child objects will become orphaned and become roots themselves.
 * `counter_cache`: adds a counter cache for the number of children. defaults to false. Example: `acts_as_nested_set :counter_cache => :children_count`
 * `order_column`: on which column to do sorting, by default it is the left_column_name. Example: `acts_as_nested_set :order_column => :position`
@@ -133,7 +135,7 @@ class Category < ActiveRecord::Base
 end
 ```
 
-## Protecting attributes from mass assignment
+## Protecting attributes from mass assignment (for Rails < 4)
 
 It's generally best to "whitelist" the attributes that can be used in mass assignment:
 
@@ -229,12 +231,8 @@ Example usage:
 
 See [CollectiveIdea::Acts::NestedSet::Helper](lib/awesome_nested_set/helper.rb) for more information about the helpers.
 
-## References
-
-You can learn more about nested sets at: http://threebit.net/tutorials/nestedset/tutorial1.html
-
 ## How to contribute
 
 Please see the ['Contributing' document](CONTRIBUTING.md).
 
-Copyright © 2008 - 2014 Collective Idea, released under the MIT license
+Copyright © 2008–2015 [Collective Idea](http://collectiveidea.com), released under the MIT license.

data/lib/awesome_nested_set.rb

@@ -1,8 +1,11 @@
+require 'active_support/lazy_load_hooks'
 require 'awesome_nested_set/awesome_nested_set'
-require 'active_record'
-ActiveRecord::Base.send :extend, CollectiveIdea::Acts::NestedSet
 
-if defined?(ActionView)
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::Base.send :extend, CollectiveIdea::Acts::NestedSet
+end
+
+ActiveSupport.on_load(:action_view) do
   require 'awesome_nested_set/helper'
   ActionView::Base.send :include, CollectiveIdea::Acts::NestedSet::Helper
 end

data/lib/awesome_nested_set/awesome_nested_set.rb

@@ -5,7 +5,7 @@ module CollectiveIdea #:nodoc:
   module Acts #:nodoc:
     module NestedSet #:nodoc:
 
-      # This acts provides Nested Set functionality. Nested Set is a smart way to implement
+      # This provides Nested Set functionality. Nested Set is a smart way to implement
       # an _ordered_ tree, with the added feature that you can select the children and all of their
       # descendants with a single query. The drawback is that insertion or move need some complex
       # sql queries. But everything is done here by this module!
@@ -15,8 +15,8 @@ module CollectiveIdea #:nodoc:
       #
       # == API
       #
-      # Methods names are aligned with acts_as_tree as much as possible to make replacment from one
-      # by another easier.
+      # Methods names are aligned with acts_as_tree as much as possible to make transition from one
+      # to another easier.
       #
       #   item.children.create(:name => "child1")
       #
@@ -87,18 +87,22 @@ module CollectiveIdea #:nodoc:
           ) if acts_as_nested_set_options[ar_callback]
         end
 
-        has_many :children, -> { order(quoted_order_column_full_name) },
+        has_many :children, -> { order(order_column => :asc) },
                  has_many_children_options
       end
 
       def acts_as_nested_set_relate_parent!
-        belongs_to :parent, :class_name => self.base_class.to_s,
-                            :foreign_key => parent_column_name,
-                            :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 = {
+          :class_name => self.base_class.to_s,
+          :foreign_key => parent_column_name,
+          :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[:optional] = true if ActiveRecord::VERSION::MAJOR >= 5
+        belongs_to :parent, options
       end
 
       def acts_as_nested_set_default_options

data/lib/awesome_nested_set/columns.rb

@@ -31,6 +31,10 @@ module CollectiveIdea #:nodoc:
           Array(acts_as_nested_set_options[:scope])
         end
 
+        def counter_cache_column_name
+          acts_as_nested_set_options[:counter_cache]
+        end
+
         def quoted_left_column_name
           model_connection.quote_column_name(left_column_name)
         end

data/lib/awesome_nested_set/model.rb

@@ -79,7 +79,7 @@ module CollectiveIdea #:nodoc:
           end
 
           def nested_set_scope(options = {})
-            options = {:order => quoted_order_column_full_name}.merge(options)
+            options = {:order => { order_column => :asc }}.merge(options)
 
             where(options[:conditions]).order(options.delete(:order))
           end
@@ -145,7 +145,7 @@ module CollectiveIdea #:nodoc:
             end
           end
 
-          self.class.base_class.unscoped.nested_set_scope options
+          self.class.base_class.nested_set_scope options
         end
 
         # Separate an other `nested_set_scope` for unscoped model
@@ -154,7 +154,7 @@ module CollectiveIdea #:nodoc:
         # 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.unscoped do
+          self.class.base_class.unscoped do
             nested_set_scope(*args)
           end
         end
@@ -182,8 +182,8 @@ module CollectiveIdea #:nodoc:
         end
 
         def right_most_node
-          @right_most_node ||= nested_set_scope(
-            :order => "#{quoted_right_column_full_name} desc"
+          @right_most_node ||= nested_set_scope_without_default_scope(
+            :order => {right_column_name => :desc}
           ).first
         end
 
@@ -232,6 +232,20 @@ module CollectiveIdea #:nodoc:
           end
         end
 
+        def update_counter_cache
+          return unless acts_as_nested_set_options[:counter_cache]
+
+          # 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)
+          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)
+          end
+        end
+
         def set_default_left_and_right
           # adds the new node to the right of all existing nodes
           self[left_column_name] = right_most_bound + 1
@@ -250,7 +264,7 @@ module CollectiveIdea #:nodoc:
           if target.is_a? self.class.base_class
             target.reload
           elsif position != :root
-            nested_set_scope.where(primary_column_name => target).first!
+            nested_set_scope_without_default_scope.where(primary_column_name => target).first!
           end
         end
       end

data/lib/awesome_nested_set/model/movable.rb

@@ -46,7 +46,7 @@ module CollectiveIdea #:nodoc:
             elsif node.children.count == index
               move_to_right_of(node.children.last)
             else
-              my_position = node.children.index(self)
+              my_position = node.children.to_a.index(self)
               if my_position && my_position < index
                 # e.g. if self is at position 0 and we want to move self to position 1 then self
                 # needs to move to the *right* of the node at position 1. That's because the node
@@ -105,6 +105,7 @@ module CollectiveIdea #:nodoc:
                 self.reload_nested_set
 
                 Move.new(target, position, self).move
+                update_counter_cache
               end
               after_move_to(target, position)
             end

data/lib/awesome_nested_set/model/prunable.rb

@@ -47,12 +47,12 @@ module CollectiveIdea #:nodoc:
             elsif acts_as_nested_set_options[:dependent] == :restrict_with_error
               unless leaf?
                 record = self.class.human_attribute_name(:children).downcase
-                errors.add(:base, :"restrict_dependent_destroy.many", record: record)
+                errors.add(:base, :"restrict_dependent_destroy.#{Rails::VERSION::MAJOR < 5 ? 'many' : 'has_many'}", record: record)
                 return false
               end
               return true
              elsif acts_as_nested_set_options[:dependent] == :nullify
-               descendants.update_all(parent_id: nil)
+               descendants.update_all(parent_column_name => nil)
              else
               descendants.delete_all
             end

data/lib/awesome_nested_set/model/rebuildable.rb

@@ -32,7 +32,11 @@ module CollectiveIdea
           end
 
           def order_for_rebuild
-            "#{quoted_left_column_full_name}, #{quoted_right_column_full_name}, #{primary_key}"
+            {
+              left_column_name => :asc,
+              right_column_name => :asc,
+              primary_key => :asc
+            }
           end
         end
 

data/lib/awesome_nested_set/model/transactable.rb

@@ -17,7 +17,7 @@ module CollectiveIdea #:nodoc:
             rescue CollectiveIdea::Acts::NestedSet::Move::ImpossibleMove
               raise
             rescue ActiveRecord::StatementInvalid => error
-              raise OpenTransactionsIsNotZero.new(error.message) unless connection.open_transactions.zero?
+              raise OpenTransactionsIsNotZero.new(error.message) unless self.class.connection.open_transactions.zero?
               raise unless error.message =~ /[Dd]eadlock|Lock wait timeout exceeded/
               raise DeadlockDetected.new(error.message) unless retry_count < 10
               retry_count += 1

data/lib/awesome_nested_set/model/validatable.rb

@@ -20,7 +20,7 @@ module CollectiveIdea
               select("#{scope_string}#{column}, COUNT(#{column}) as _count").
                 group("#{scope_string}#{column}", quoted_primary_key_column_full_name).
                 having("COUNT(#{column}) > 1").
-                order(quoted_primary_key_column_full_name).
+                order(primary_column_name => :asc).
                 first.nil?
             end
           end
@@ -41,8 +41,10 @@ module CollectiveIdea
           end
 
           def each_root_valid?(roots_to_validate)
+            left_column = acts_as_nested_set_options[:left_column]
+            reordered_roots = roots_reordered_by_column(roots_to_validate, left_column)
             left = right = 0
-            roots_to_validate.all? do |root|
+            reordered_roots.all? do |root|
               (root.left > left && root.right > right).tap do
                 left = root.left
                 right = root.right
@@ -57,12 +59,21 @@ module CollectiveIdea
             }
           end
 
+          def roots_reordered_by_column(roots_to_reorder, column)
+            if roots_to_reorder.respond_to?(:reorder) # ActiveRecord's relation
+              roots_to_reorder.reorder(column)
+            elsif roots_to_reorder.respond_to?(:sort) # Array
+              roots_to_reorder.sort { |a, b| a.send(column) <=> b.send(column) }
+            else
+              roots_to_reorder
+            end
+          end
+
           def scope_string
             Array(acts_as_nested_set_options[:scope]).map do |c|
               connection.quote_column_name(c)
             end.push(nil).join(", ")
           end
-
         end
       end
     end

data/lib/awesome_nested_set/tree.rb

@@ -6,7 +6,7 @@ module CollectiveIdea #:nodoc:
         attr_accessor :indices
 
         delegate :left_column_name, :right_column_name, :quoted_parent_column_full_name,
-                 :order_for_rebuild, :scope_for_rebuild,
+                 :order_for_rebuild, :scope_for_rebuild, :counter_cache_column_name,
                  :to => :model
 
         def initialize(model, validate_nodes)
@@ -23,6 +23,7 @@ module CollectiveIdea #:nodoc:
             # setup index for this scope
             indices[scope_for_rebuild.call(root_node)] ||= 0
             set_left_and_rights(root_node)
+            reset_counter_cache(root_node)
           end
         end
 
@@ -57,6 +58,15 @@ module CollectiveIdea #:nodoc:
         def set_right!(node)
           node[right_column_name] = increment_indice!(node)
         end
+
+        def reset_counter_cache(node)
+          return unless counter_cache_column_name
+          node.class.reset_counters(node.id, :children)
+
+          node.children.each do |child|
+            reset_counter_cache(child)
+          end
+        end
       end
     end
   end

data/lib/awesome_nested_set/version.rb

@@ -1,3 +1,3 @@
 module AwesomeNestedSet
-  VERSION = '3.0.3' unless defined?(::AwesomeNestedSet::VERSION)
+  VERSION = '3.1.4' 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.0.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Brandon Keepers
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2018-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +21,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,21 +31,63 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.3'
+- !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'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: pry-nav
+  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: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +109,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.5.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,6 +119,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -138,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: An awesome nested set implementation for Active Record