nested_set 1.6.4 → 1.6.5

data/VERSION

@@ -1 +1 @@
-1.6.4
+1.6.5

data/lib/nested_set/base.rb

@@ -25,6 +25,7 @@ module CollectiveIdea #:nodoc:
         module SingletonMethods
           # Configuration options are:
           #
+          # * +:primary_key_column+ - specifies the column name to use for keeping the position integer (default: id)
           # * +: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"
@@ -43,6 +44,7 @@ module CollectiveIdea #:nodoc:
           # to acts_as_nested_set models
           def acts_as_nested_set(options = {})
             options = {
+              :primary_key_column => self.primary_key,
               :parent_column => 'parent_id',
               :left_column => 'lft',
               :right_column => 'rgt',
@@ -54,8 +56,8 @@ module CollectiveIdea #:nodoc:
               options[:scope] = "#{options[:scope]}_id".intern
             end
 
-            write_inheritable_attribute :acts_as_nested_set_options, options
-            class_inheritable_reader :acts_as_nested_set_options
+            class_attribute :acts_as_nested_set_options
+            self.acts_as_nested_set_options = options
 
             unless self.is_a?(ClassMethods)
               include Comparable
@@ -142,7 +144,8 @@ module CollectiveIdea #:nodoc:
             arranged = ActiveSupport::OrderedHash.new
             insertion_points = [arranged]
             depth = 0
-            order(quoted_left_column_name).each_with_level do |node, level|
+            order("#{quoted_table_name}.#{quoted_left_column_name}").each_with_level do |node, level|
+              next if level > depth && insertion_points.last.keys.last && node.parent_id != insertion_points.last.keys.last.id
               insertion_points.push insertion_points.last.values.last if level > depth
               (depth - level).times { insertion_points.pop } if level < depth
               insertion_points.last.merge! node => ActiveSupport::OrderedHash.new
@@ -175,17 +178,18 @@ module CollectiveIdea #:nodoc:
             end.push(nil).join(", ")
             [quoted_left_column_name, quoted_right_column_name].all? do |column|
               # No duplicates
-              first(
+              unscoped.first(
                 :select => "#{scope_string}#{column}, COUNT(#{column})",
-                :group => "#{scope_string}#{column}
-                  HAVING COUNT(#{column}) > 1").nil?
+                :group => "#{scope_string}#{column}",
+                :having => "COUNT(#{column}) > 1"
+              ).nil?
             end
           end
 
           # Wrapper for each_root_valid? that can deal with scope.
           def all_roots_valid?
             if acts_as_nested_set_options[:scope]
-              roots.group(scope_column_names).group_by{|record| scope_column_names.collect{|col| record.send(col.to_sym)}}.all? do |scope, grouped_roots|
+              roots.group_by{|record| scope_column_names.collect{|col| record.send(col.to_sym)}}.all? do |scope, grouped_roots|
                 each_root_valid?(grouped_roots)
               end
             else
@@ -252,6 +256,14 @@ module CollectiveIdea #:nodoc:
             end
           end
 
+          def map_with_level(objects = nil)
+            result = []
+            each_with_level objects do |object, level|
+              result << yield(object, level)
+            end
+            result
+          end
+
           def before_move(*args, &block)
             set_callback :move, :before, *args, &block
           end
@@ -283,7 +295,7 @@ module CollectiveIdea #:nodoc:
             end
 
             def order_for_rebuild
-              "#{quoted_left_column_name}, #{quoted_right_column_name}, id"
+              "#{quoted_left_column_name}, #{quoted_right_column_name}, #{primary_key_column_name}"
             end
 
         end
@@ -310,6 +322,10 @@ module CollectiveIdea #:nodoc:
             acts_as_nested_set_options[:depth_column]
           end
 
+          def primary_key_column_name
+            acts_as_nested_set_options[:primary_key_column]
+          end
+
           def quoted_left_column_name
             connection.quote_column_name(left_column_name)
           end
@@ -383,6 +399,11 @@ module CollectiveIdea #:nodoc:
             self_and_ancestors.first
           end
 
+          # Returns the array of all children and self
+          def self_and_children
+            nested_set_scope.scoped.where("#{q_parent} = ? or id = ?", id, id)
+          end
+
           # Returns the array of all parents and self
           def self_and_ancestors
             nested_set_scope.scoped.where("#{q_left} <= ? AND #{q_right} >= ?", left, right)
@@ -496,8 +517,8 @@ module CollectiveIdea #:nodoc:
           end
 
           def to_text
-            self_and_descendants.map do |node|
-              "#{'*'*(node.level+1)} #{node.id} #{node.to_s} (#{node.parent_id}, #{node.left}, #{node.right})"
+            self.class.map_with_level(self_and_descendants) do |node,level|
+              "#{'*'*(level+1)} #{node.id} #{node.to_s} (#{node.parent_id}, #{node.left}, #{node.right})"
             end.join("\n")
           end
 
@@ -511,6 +532,10 @@ module CollectiveIdea #:nodoc:
             "#{self.class.quoted_table_name}.#{quoted_right_column_name}"
           end
 
+          def q_parent
+            "#{self.class.quoted_table_name}.#{quoted_parent_column_name}"
+          end
+
           def without_self(scope)
             scope.where("#{self.class.quoted_table_name}.#{self.class.primary_key} != ?", self)
           end
@@ -519,8 +544,8 @@ module CollectiveIdea #:nodoc:
           # the base ActiveRecord class, using the :scope declared in the acts_as_nested_set
           # declaration.
           def nested_set_scope
-            conditions = Array(acts_as_nested_set_options[:scope]).inject({}) do |conditions, attr|
-              conditions.merge attr => self[attr]
+            conditions = Array(acts_as_nested_set_options[:scope]).inject({}) do |cnd, attr|
+              cnd.merge attr => self[attr]
             end
 
             self.class.base_class.order(q_left).where(conditions)
@@ -551,6 +576,7 @@ module CollectiveIdea #:nodoc:
           # back to the left so the counts still work.
           def destroy_descendants
             return if right.nil? || left.nil? || skip_before_destroy
+            reload_nested_set
 
             self.class.base_class.transaction do
               if acts_as_nested_set_options[:dependent] == :destroy
@@ -623,6 +649,13 @@ module CollectiveIdea #:nodoc:
                 # so sorting puts both the intervals and their boundaries in order
                 a, b, c, d = [self[left_column_name], self[right_column_name], bound, other_bound].sort
 
+                # select the rows in the model between a and d, and apply a lock
+                self.class.base_class.find(:all,
+                  :select => primary_key_column_name,
+                  :conditions => ["#{quoted_left_column_name} >= :a and #{quoted_right_column_name} <= :d", {:a => a, :d => d}],
+                  :lock => true
+                )
+
                 new_parent = case position
                   when :child;  target.id
                   when :root;   nil

data/lib/nested_set/helper.rb

@@ -11,9 +11,13 @@ module CollectiveIdea #:nodoc:
         # You can pass a block receiving an item and returning the string displayed in the select.
         #
         # == Params
-        #  * +class_or_item+ - Class name or top level times
-        #  * +mover+ - The item that is being move, used to exlude impossible moves
-        #  * +&block+ - a block that will be used to display: { |item| ... item.name }
+        #  * +class_or_items+ - Class name or top level items
+        #  * +mover+ - The item that is being move, used to exclude impossible moves
+        #  * +options+ - hash of additional options
+        #  * +&block+ - a block that will be used to display: { |item| ... item.name }
+        #
+        # == Options
+        #  * +include_root+ - Include root object(s) in output. Default: true
         #
         # == Usage
         #
@@ -21,12 +25,23 @@ module CollectiveIdea #:nodoc:
         #       "#{'–' * level} #{i.name}"
         #     }) %>
         #
-        def nested_set_options(class_or_item, mover = nil)
-          class_or_item = class_or_item.roots if class_or_item.is_a?(Class)
-          items = Array(class_or_item)
+        def nested_set_options(class_or_items, mover = nil, options = {})
+          items = case
+          when class_or_items.is_a?(Class)
+            class_or_items.roots
+          when class_or_items.is_a?(Array)
+            class_or_items
+          else
+            [class_or_items]
+          end
+
+          options.assert_valid_keys :include_root
+          options.reverse_merge! :include_root => true
+
           result = []
           items.each do |item|
-            item.self_and_descendants.each_with_level do |i, level|
+            objects = options[:include_root] ? item.self_and_descendants : item.descendants
+            objects.each_with_level do |i, level|
               if mover.nil? || mover.new_record? || mover.move_possible?(i)
                 result.push([yield(i, level), i.id])
               end

data/lib/nested_set/railtie.rb

@@ -8,11 +8,11 @@ module CollectiveIdea
       class Railtie < ::Rails::Railtie
         config.before_initialize do
           ActiveSupport.on_load :active_record do
-            ActiveRecord::Base.send(:include, CollectiveIdea::Acts::NestedSet::Base)
+            include CollectiveIdea::Acts::NestedSet::Base
           end
 
           ActiveSupport.on_load :action_view do
-            ActionView::Base.send(:include, CollectiveIdea::Acts::NestedSet::Helper)
+            include CollectiveIdea::Acts::NestedSet::Helper
           end
         end
 

data/nested_set.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nested_set}
-  s.version = "1.6.4"
+  s.version = "1.6.5"
 
   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-02-10}
+  s.date = %q{2011-05-24}
   s.description = %q{An awesome nested set implementation for Active Record}
   s.email = %q{info@collectiveidea.com}
   s.extra_rdoc_files = [
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/skyeagle/nested_set}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{An awesome nested set implementation for Active Record}
   s.test_files = [
     "test/benchmarks.rb",
@@ -57,7 +57,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/fixtures/category.rb

@@ -5,12 +5,22 @@ class Category < ActiveRecord::Base
     name
   end
   
-  def recurse &block
+  def recurse(&block)
     block.call self, lambda{
       self.children.each do |child|
-        child.recurse &block
+        child.recurse(&block)
       end
     }
   end
 
 end
+
+class Category_NoToArray < Category
+  def to_a
+    raise 'to_a called'
+  end
+end
+
+class Category_DefaultScope < Category
+  default_scope order('categories.id ASC')
+end

data/test/nested_set/helper_test.rb

@@ -19,6 +19,19 @@ class HelperTest < ActionView::TestCase
     assert_equal expected, actual
   end
 
+  def test_nested_set_options_without_root
+    expected = [
+      [" Child 1", 2],
+      [' Child 2', 3],
+      ['- Child 2.1', 4],
+      [' Child 3', 5]
+    ]
+    actual = nested_set_options(categories(:top_level), nil, :include_root => false) do |c, level|
+      "#{'-' * level} #{c.name}"
+    end
+    assert_equal expected, actual
+  end
+
   def test_nested_set_options_with_mover
     expected = [
       [" Top Level", 1],
@@ -100,4 +113,15 @@ class HelperTest < ActionView::TestCase
     assert_equal html, "<ul><li>Top Level 2</li><li>Top Level</li><ul><li>Child 3</li><li>Child 2</li><ul><li>Child 2.1</li></ul><li>Child 1</li></ul></ul>"
   end
 
+  def test_nested_set_options_does_not_call_to_a
+    expected = [
+      ['Child 2', 3],
+      ['Child 2.1', 4]
+    ]
+    actual = nested_set_options Category_NoToArray.find(3) do |c|
+      c.name
+    end
+    assert_equal expected, actual
+  end
+
 end

data/test/nested_set_test.rb

@@ -130,10 +130,10 @@ class NestedSetTest < ActiveSupport::TestCase
   def test_leaves_class_method
     assert_equal Category.find(:all, :conditions => "#{Category.right_column_name} - #{Category.left_column_name} = 1"), Category.leaves
     assert_equal Category.leaves.count, 4
-    assert (Category.leaves.include? categories(:child_1))
-    assert (Category.leaves.include? categories(:child_2_1))
-    assert (Category.leaves.include? categories(:child_3))
-    assert (Category.leaves.include? categories(:top_level_2))
+    assert Category.leaves.include?(categories(:child_1))
+    assert Category.leaves.include?(categories(:child_2_1))
+    assert Category.leaves.include?(categories(:child_3))
+    assert Category.leaves.include?(categories(:top_level_2))
   end
 
   def test_leaf
@@ -147,11 +147,16 @@ class NestedSetTest < ActiveSupport::TestCase
     assert !Category.new.leaf?
   end
 
-
   def test_parent
     assert_equal categories(:child_2), categories(:child_2_1).parent
   end
 
+  def test_self_and_chilren
+    node = categories(:top_level)
+    self_and_children = [node, categories(:child_1), categories(:child_2), categories(:child_3)]
+    assert_equal self_and_children, node.self_and_children
+  end
+
   def test_self_and_ancestors
     child = categories(:child_2_1)
     self_and_ancestors = [categories(:top_level), categories(:child_2), child]
@@ -675,6 +680,12 @@ class NestedSetTest < ActiveSupport::TestCase
     assert Category.valid?
   end
 
+  def test_destroy_on_multiple_records_without_reload_does_not_invalidate
+    Category.acts_as_nested_set_options[:dependent] = :destroy
+    [categories(:child_1), categories(:child_2)].each(&:destroy)
+    assert Category.valid?
+  end
+
   def test_assigning_parent_id_on_create
     category = Category.create!(:name => "Child", :parent_id => categories(:child_2).id)
     assert_equal categories(:child_2), category.parent
@@ -756,6 +767,10 @@ class NestedSetTest < ActiveSupport::TestCase
     end
   end
 
+  def test_valid_with_default_scope
+    assert Category_DefaultScope.valid?
+  end
+
   def test_each_with_level
     levels = [
       [0, "Top Level"],
@@ -794,6 +809,20 @@ class NestedSetTest < ActiveSupport::TestCase
     check_scoped_structure(Category.root.self_and_descendants, levels)
   end
 
+  def test_map_with_level
+    expected = [
+      [0, "Top Level"],
+      [1, "Child 1"],
+      [1, "Child 2"],
+      [2, "Child 2.1"],
+      [1, "Child 3" ]
+    ]
+    actual = Category.map_with_level Category.root.self_and_descendants do |i, level|
+      [level, i.name]
+    end
+    assert_equal expected, actual
+  end
+
   def test_model_with_attr_accessible
     model = Class.new(ActiveRecord::Base)
     model.set_table_name 'categories'

metadata

@@ -1,118 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nested_set
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 6
-  - 4
-  version: 1.6.4
+version: !ruby/object:Gem::Version
+  version: 1.6.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Brandon Keepers
 - Daniel Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-10 00:00:00 +03:00
+date: 2011-05-24 00:00:00.000000000 +04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: railties
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &11153540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *11153540
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &11152400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *11152400
+- !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &11151640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *11151640
+- !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &11148600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *11148600
+- !ruby/object:Gem::Dependency
   name: bench_press
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &11147700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *11147700
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &11146880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *11146880
 description: An awesome nested set implementation for Active Record
 email: info@collectiveidea.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - .autotest
 - Gemfile
 - Gemfile.lock
@@ -142,37 +115,32 @@ files:
 has_rdoc: true
 homepage: http://github.com/skyeagle/nested_set
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 462466689
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1622325140072455651
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An awesome nested set implementation for Active Record
-test_files: 
+test_files:
 - test/benchmarks.rb
 - test/db/schema.rb
 - test/fixtures/category.rb