nested_set 1.6.3 → 1.6.4

data/README.md

@@ -36,6 +36,8 @@ To make use of nested_set, your model needs to have 3 fields: lft, rgt, and pare
       end
     end
 
+###NB: There is no reason to use depth column. It's only add additional queries to DB without benefit. If you need level you should use `each_with_level` instead.
+
 Enable the nested set functionality by declaring acts_as_nested_set on your model
 
     class Category < ActiveRecord::Base

data/VERSION

@@ -1 +1 @@
-1.6.3
+1.6.4

data/lib/nested_set/base.rb

@@ -99,7 +99,7 @@ module CollectiveIdea #:nodoc:
               }
               scope :leaves, lambda {
                 where("#{quoted_right_column_name} - #{quoted_left_column_name} = 1").
-                order(quoted_left_column_name) 
+                order(quoted_left_column_name)
               }
               scope :with_depth, proc {|level| where(:depth => level).order(quoted_left_column_name) }
 
@@ -208,34 +208,24 @@ module CollectiveIdea #:nodoc:
             # Don't rebuild a valid tree.
             return true if valid?
 
-            scope = lambda{|node|}
-            if acts_as_nested_set_options[:scope]
-              scope = lambda{|node|
-                scope_column_names.inject(""){|str, column_name|
-                  str << "AND #{connection.quote_column_name(column_name)} = #{connection.quote(node.send(column_name.to_sym))} "
-                }
-              }
-            end
             indices = {}
 
             set_left_and_rights = lambda do |node|
+              node_scope = scope_for_rebuild(node)
               # set left
-              node[left_column_name] = indices[scope.call(node)] += 1
+              node[left_column_name] = indices[node_scope] += 1
               # find
-              where("#{quoted_parent_column_name} = ? #{scope.call(node)}", node).
-                order("#{quoted_left_column_name}, #{quoted_right_column_name}, id").
-                all.each{|n| set_left_and_rights.call(n) }
+              nodes_for_rebuild(node, node_scope).each{ |n| set_left_and_rights.call(n) }
               # set right
-              node[right_column_name] = indices[scope.call(node)] += 1
+              node[right_column_name] = indices[node_scope] += 1
               node.save!
             end
 
             # Find root node(s)
-            root_nodes = where(parent_column_name => nil).
-                order("#{quoted_left_column_name}, #{quoted_right_column_name}, id").
-                all.each do |root_node|
+            root_nodes_for_rebuild.each do |root_node|
+              node_scope = scope_for_rebuild(root_node)
               # setup index for this scope
-              indices[scope.call(root_node)] ||= 0
+              indices[node_scope] ||= 0
               set_left_and_rights.call(root_node)
             end
           end
@@ -269,6 +259,33 @@ module CollectiveIdea #:nodoc:
           def after_move(*args, &block)
             set_callback :move, :after, *args, &block
           end
+
+          private
+
+            def scope_for_rebuild(node)
+              scope_column_names.inject({}) do |hash, column_name|
+                hash[column_name] = node.send(column_name.to_sym)
+                hash
+              end
+            end
+
+            def nodes_for_rebuild(node, node_scope)
+              where(parent_column_name => node).
+                where(node_scope).
+                order(order_for_rebuild).
+                all
+            end
+
+            def root_nodes_for_rebuild
+              where(parent_column_name => nil).
+                order(order_for_rebuild).
+                all
+            end
+
+            def order_for_rebuild
+              "#{quoted_left_column_name}, #{quoted_right_column_name}, id"
+            end
+
         end
 
         # Mixed into both classes and instances to provide easy access to the column names

data/lib/nested_set/depth.rb

@@ -21,10 +21,11 @@ module CollectiveIdea #:nodoc:
 
         # Update cached_level attribute
         def update_depth
-          depth_delta = level - depth
-          if depth_delta != 0
-            self.depth += depth_delta
-            self.self_and_descendants.update_all(["#{self.class.quoted_depth_column_name} = #{self.class.quoted_depth_column_name} + ?", depth_delta])
+          self.depth = level
+          if depth_changed?
+            self.self_and_descendants.
+              update_all(["#{self.class.quoted_depth_column_name} = #{self.class.quoted_depth_column_name} + ?",
+                depth_change[1] - depth_change[0].to_i])
           end
         end
 

data/nested_set.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nested_set}
-  s.version = "1.6.3"
+  s.version = "1.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Keepers", "Daniel Morrison"]
-  s.date = %q{2011-01-02}
+  s.date = %q{2011-02-10}
   s.description = %q{An awesome nested set implementation for Active Record}
   s.email = %q{info@collectiveidea.com}
   s.extra_rdoc_files = [

data/test/db/schema.rb

@@ -6,7 +6,7 @@ ActiveRecord::Schema.define(:version => 0) do
     t.column :lft, :integer
     t.column :rgt, :integer
     t.column :organization_id, :integer
-    t.column :depth, :integer, :default => 0
+    t.column :depth, :integer
   end
 
   create_table :departments, :force => true do |t|

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 3
-  version: 1.6.3
+  - 4
+  version: 1.6.4
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-02 00:00:00 +03:00
+date: 2011-02-10 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -153,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 768447921
+      hash: 462466689
       segments: 
       - 0
       version: "0"