nested_set 1.6.1 → 1.6.2

data/README.md

@@ -66,7 +66,7 @@ or sorted select:
 
     <%= f.select :parent_id, sorted_nested_set_options(Category, lambda(&:name)) {|i, level| "#{'-' * level} #{i.name}" } %>
 
-    <% sort_method = lambda{|x, y| x.name.downcase <=> y.name.downcase} %>
+    <% sort_method = lambda{|x| x.name.downcase} %>
 
 NOTE: to sort UTF-8 strings you should use `x.name.mb_chars.downcase`
 

data/VERSION

@@ -1 +1 @@
-1.6.1
+1.6.2

data/lib/nested_set/base.rb

@@ -28,6 +28,7 @@ module CollectiveIdea #:nodoc:
           # * +:parent_column+ - specifies the column name to use for keeping the position integer (default: parent_id)
           # * +:left_column+ - column name for left boundry data, default "lft"
           # * +:right_column+ - column name for right boundry data, default "rgt"
+          # * +:depth_column+ - column name for level cache 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
           #   can also pass an array to scope by multiple attributes.
@@ -45,6 +46,7 @@ module CollectiveIdea #:nodoc:
               :parent_column => 'parent_id',
               :left_column => 'lft',
               :right_column => 'rgt',
+              :depth_column => 'depth',
               :dependent => :delete_all, # or :destroy
             }.merge(options)
 
@@ -287,6 +289,10 @@ module CollectiveIdea #:nodoc:
             Array(acts_as_nested_set_options[:scope])
           end
 
+          def depth_column_name
+            acts_as_nested_set_options[:depth_column]
+          end
+
           def quoted_left_column_name
             connection.quote_column_name(left_column_name)
           end
@@ -302,6 +308,10 @@ module CollectiveIdea #:nodoc:
           def quoted_scope_column_names
             scope_column_names.collect {|column_name| connection.quote_column_name(column_name) }
           end
+
+          def quoted_depth_column_name
+            connection.quote_column_name(depth_column_name)
+          end
         end
 
         # 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.

data/lib/nested_set/depth.rb

@@ -21,7 +21,10 @@ module CollectiveIdea #:nodoc:
 
         # Update cached_level attribute
         def update_depth
-          self.update_attribute(:depth, level)
+          depth_delta = level - depth
+          if depth_delta != 0
+            self.self_and_descendants.update_all(["#{self.class.quoted_depth_column_name} = #{self.class.quoted_depth_column_name} + ?", depth_delta])
+          end
         end
 
         # Update cached_level attribute for all record tree

data/lib/nested_set/helper.rb

@@ -26,7 +26,6 @@ module CollectiveIdea #:nodoc:
           items = Array(class_or_item)
           result = []
           items.each do |item|
-            levels = []
             item.self_and_descendants.each_with_level do |i, level|
               if mover.nil? || mover.new_record? || mover.move_possible?(i)
                 result.push([yield(i, level), i.id])
@@ -55,28 +54,26 @@ module CollectiveIdea #:nodoc:
         #
         #   OR
         #
-        #   sort_method = lambda{|x,y| x.name.mb_chars.downcase <=> y.name.mb_chars.downcase}
+        #   sort_method = lambda{|x| x.name.mb_chars.downcase }
         #
         #   <%= f.select :parent_id, nested_set_options(Category, sort_method) {|i, level|
         #       "#{'–' * level} #{i.name}"
         #     }) %>
         #
         def sorted_nested_set_options(class_or_item, sort_proc, mover = nil, level = 0)
-          class_or_item = class_or_item.roots if class_or_item.is_a?(Class)
-          items = Array(class_or_item)
-          result = []
-          items.sort_by(&sort_proc).each do |item|
-            hash = item.self_and_descendants.arrange
-            result += build_node(hash, sort_proc, mover, level){|x, lvl| yield(x, lvl)}
-          end
-          result
+          hash = if class_or_item.is_a?(Class)
+                   class_or_item
+                 else
+                   class_or_item.self_and_descendants
+                 end.arrange
+          build_node(hash, sort_proc, mover, level){|x, lvl| yield(x, lvl)}
         end
 
         def build_node(hash, sort_proc, mover = nil, level = nil)
-          result ||= []
+          result = []
           hash.keys.sort_by(&sort_proc).each do |node|
             if mover.nil? || mover.new_record? || mover.move_possible?(node)
-              result << [yield(node, level.to_i), node.id]
+              result.push([yield(node, level.to_i), node.id])
               result.push(*build_node(hash[node], sort_proc, mover, level.to_i + 1){|x, lvl| yield(x, lvl)})
             end
           end if hash.present?

data/nested_set.gemspec

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

data/test/benchmarks.rb

@@ -49,7 +49,7 @@ if $0 == __FILE__
   end
 
   measure "sorted_nested_set_options" do
-    sorted_nested_set_options(Category, lambda(&:name)){|i, level| "#{'-' * level} #{i.name}" }
+    sorted_nested_set_options(Category, lambda{|x| x.name }){|i, level| "#{'-' * level} #{i.name}" }
   end
 
 end

data/test/db/schema.rb

@@ -5,14 +5,14 @@ ActiveRecord::Schema.define(:version => 0) do
     t.column :parent_id, :integer
     t.column :lft, :integer
     t.column :rgt, :integer
-    t.column :depth, :integer, :default => 0
     t.column :organization_id, :integer
+    t.column :depth, :integer, :default => 0
   end
 
   create_table :departments, :force => true do |t|
     t.column :name, :string
   end
-  
+
   create_table :notes, :force => true do |t|
     t.column :body, :text
     t.column :parent_id, :integer
@@ -21,11 +21,12 @@ ActiveRecord::Schema.define(:version => 0) do
     t.column :notable_id, :integer
     t.column :notable_type, :string
   end
-  
+
   create_table :renamed_columns, :force => true do |t|
     t.column :name, :string
     t.column :mother_id, :integer
     t.column :red, :integer
     t.column :black, :integer
+    t.column :level, :integer
   end
 end

data/test/fixtures/categories.yml

@@ -14,32 +14,38 @@ top_level:
   name: Top Level
   lft: 1
   rgt: 10
+  depth: 0
 child_1:
   id: 2
   name: Child 1
   parent_id: 1
   lft: 2
   rgt: 3
+  depth: 1
 child_2:
   id: 3
   name: Child 2
   parent_id: 1
   lft: 4
   rgt: 7
+  depth: 1
 child_2_1:
   id: 4
   name: Child 2.1
   parent_id: 3
   lft: 5
   rgt: 6
+  depth: 2
 child_3:
   id: 5
   name: Child 3
   parent_id: 1
   lft: 8
   rgt: 9
+  depth: 1
 top_level_2:
   id: 6
   name: Top Level 2
   lft: 11
   rgt: 12
+  depth: 0

data/test/nested_set_test.rb

@@ -15,7 +15,7 @@ class ScopedCategory < ActiveRecord::Base
 end
 
 class RenamedColumns < ActiveRecord::Base
-  acts_as_nested_set :parent_column => 'mother_id', :left_column => 'red', :right_column => 'black'
+  acts_as_nested_set :parent_column => 'mother_id', :left_column => 'red', :right_column => 'black', :depth_column => 'level'
 end
 
 class NestedSetTest < ActiveSupport::TestCase
@@ -32,11 +32,15 @@ class NestedSetTest < ActiveSupport::TestCase
     assert_equal 'parent_id', Default.acts_as_nested_set_options[:parent_column]
   end
 
+  def test_depth_column_default
+    assert_equal 'depth', Default.acts_as_nested_set_options[:depth_column]
+  end
+
   def test_scope_default
     assert_nil Default.acts_as_nested_set_options[:scope]
   end
 
-  def test_left_column_name
+  def test_left_column_default
     assert_equal 'lft', Default.left_column_name
     assert_equal 'lft', Default.new.left_column_name
     assert_equal 'red', RenamedColumns.left_column_name
@@ -57,6 +61,13 @@ class NestedSetTest < ActiveSupport::TestCase
     assert_equal 'mother_id', RenamedColumns.new.parent_column_name
   end
 
+  def test_depth_column_name
+    assert_equal 'depth', Default.depth_column_name
+    assert_equal 'depth', Default.new.depth_column_name
+    assert_equal 'level', RenamedColumns.depth_column_name
+    assert_equal 'level', RenamedColumns.new.depth_column_name
+  end
+
   def test_creation_with_altered_column_names
     assert_nothing_raised do
       RenamedColumns.create!()
@@ -75,6 +86,12 @@ class NestedSetTest < ActiveSupport::TestCase
     assert_equal quoted, Default.new.quoted_right_column_name
   end
 
+  def test_quoted_depth_column_name
+    quoted = Default.connection.quote_column_name('depth')
+    assert_equal quoted, Default.quoted_depth_column_name
+    assert_equal quoted, Default.new.quoted_depth_column_name
+  end
+
   def test_left_column_protected_from_assignment
     assert_raises(ActiveRecord::ActiveRecordError) { Category.new.lft = 1 }
   end
@@ -174,6 +191,24 @@ class NestedSetTest < ActiveSupport::TestCase
     assert_equal 2, categories(:child_2_1).level
   end
 
+  def test_depth
+    assert_equal 0, categories(:top_level).depth
+    assert_equal 1, categories(:child_1).depth
+    assert_equal 2, categories(:child_2_1).depth
+  end
+
+  def test_depth_after_move
+    categories(:child_2).move_to_root
+
+    assert_equal 0, categories(:child_2).reload.depth
+    assert_equal 1, categories(:child_2_1).reload.depth
+
+    categories(:child_2).move_to_child_of(categories(:top_level_2))
+
+    assert_equal 1, categories(:child_2).reload.depth
+    assert_equal 2, categories(:child_2_1).reload.depth
+  end
+
   def test_has_children?
     assert categories(:child_2_1).children.empty?
     assert !categories(:child_2).children.empty?

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 1
-  version: 1.6.1
+  - 2
+  version: 1.6.2
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-11 00:00:00 +03:00
+date: 2010-12-23 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: -134095791
+      hash: 754987949
       segments: 
       - 0
       version: "0"