nested_set 1.6.7 → 1.6.8

data/Gemfile

@@ -4,7 +4,7 @@ gem "railties", ">= 3.0.0"
 gem "activerecord", ">= 3.0.0"
 
 group :development, :test do
-  gem "sqlite3-ruby"
+  gem "sqlite3"
   gem "actionpack", ">= 3.0.0"
   gem "bench_press", ">= 0.3.1"
   gem "jeweler"

data/Gemfile.lock

@@ -52,7 +52,7 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    sqlite3-ruby (1.3.2)
+    sqlite3 (1.3.4)
     thor (0.14.6)
     tzinfo (0.3.23)
 
@@ -65,4 +65,4 @@ DEPENDENCIES
   bench_press (>= 0.3.1)
   jeweler
   railties (>= 3.0.0)
-  sqlite3-ruby
+  sqlite3

data/README.md

@@ -92,10 +92,11 @@ Benchmark tests
 
 You can learn more about nested sets at:
 
-  [1](http://www.dbmsmag.com/9603d06.html)
-  [2](http://threebit.net/tutorials/nestedset/tutorial1.html)
-  [3](http://api.rubyonrails.com/classes/ActiveRecord/Acts/NestedSet/ClassMethods.html)
-  [4](http://opensource.symetrie.com/trac/better_nested_set/)
+  [1](http://en.wikipedia.org/wiki/Nested_set_model)
+  [2](http://www.ibase.ru/devinfo/DBMSTrees/9603d06.html)
+  [3](http://threebit.net/tutorials/nestedset/tutorial1.html)
+  [4](http://rdoc.info/github/rails/acts_as_nested_set/master/ActiveRecord/Acts/NestedSet/ClassMethods)
+  [5](http://agilewebdevelopment.com/plugins/betternestedset)
 
 ## How to contribute
 

data/VERSION

@@ -1 +1 @@
-1.6.7
+1.6.8

data/lib/nested_set/base.rb

@@ -222,7 +222,7 @@ module CollectiveIdea #:nodoc:
               nodes_for_rebuild(node, node_scope).each{ |n| set_left_and_rights.call(n) }
               # set right
               node[right_column_name] = indices[node_scope] += 1
-              node.save!
+              node.save(:validate => false)
             end
 
             # Find root node(s)
@@ -478,6 +478,11 @@ module CollectiveIdea #:nodoc:
             siblings.where("#{q_left} > ?", left).first
           end
 
+          # Lock rows whose lfts and rgts are to be updated
+          def lock_check(cond=nil)
+            nested_set_scope.select(primary_key_column_name).where(cond).lock
+          end
+
           # Shorthand method for finding the left sibling and moving to the left of it.
           def move_left
             move_to_left_of left_sibling
@@ -576,16 +581,19 @@ 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
-                descendants.each do |model|
-                  model.skip_before_destroy = true
-                  model.destroy
-                end
-              else
-                nested_set_scope.delete_all(["#{q_left} > ? AND #{q_right} < ?", left, right])
+              lock_check(["#{quoted_right_column_name} > ?", right])
+              reload_nested_set
+              case destroy_method
+                when :delete_all then
+                  nested_set_scope.delete_all(["#{q_left} > ? AND #{q_right} < ?", left, right])
+
+                else
+                  descendants.each do |model|
+                    model.skip_before_destroy = true
+                    model.respond_to?(destroy_method) ? model.send(destroy_method) : raise(NoMethodError, "#{model} does not have a method #{destroy_method}")
+                  end
+
               end
 
               # update lefts and rights for remaining nodes
@@ -604,6 +612,11 @@ module CollectiveIdea #:nodoc:
             end
           end
 
+          # just a shortcut
+          def destroy_method
+            acts_as_nested_set_options[:dependent]
+          end
+
           # reload left, right, and parent
           def reload_nested_set
             reload(:select => "#{quoted_left_column_name}, " +
@@ -650,11 +663,8 @@ module CollectiveIdea #:nodoc:
                 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
-                )
+                cond = ["#{quoted_left_column_name} >= :a and #{quoted_right_column_name} <= :d", { :a => a, :d => d }]
+                lock_check(cond)
 
                 new_parent = case position
                   when :child;  target.id

data/nested_set.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nested_set}
-  s.version = "1.6.7"
+  s.version = "1.6.8"
 
   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-06-20}
+  s.date = %q{2011-08-31}
   s.description = %q{An awesome nested set implementation for Active Record}
   s.email = %q{info@collectiveidea.com}
   s.extra_rdoc_files = [
@@ -62,14 +62,14 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<railties>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<actionpack>, [">= 3.0.0"])
       s.add_development_dependency(%q<bench_press>, [">= 0.3.1"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<railties>, [">= 3.0.0"])
       s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<actionpack>, [">= 3.0.0"])
       s.add_dependency(%q<bench_press>, [">= 0.3.1"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -77,7 +77,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<railties>, [">= 3.0.0"])
     s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<actionpack>, [">= 3.0.0"])
     s.add_dependency(%q<bench_press>, [">= 0.3.1"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/test/fixtures/category.rb

@@ -24,3 +24,13 @@ end
 class Category_DefaultScope < Category
   default_scope order('categories.id ASC')
 end
+
+class Category_WithCustomDestroy < ActiveRecord::Base
+  set_table_name 'categories'
+  acts_as_nested_set
+
+  private :destroy
+  def custom_destroy
+    destroy
+  end
+end

data/test/nested_set/helper_test.rb

@@ -118,7 +118,7 @@ class HelperTest < ActionView::TestCase
       ['Child 2', 3],
       ['Child 2.1', 4]
     ]
-    actual = nested_set_options Category_NoToArray.find(3) do |c|
+    actual = nested_set_options Category_NoToArray.find(3) do |c, l|
       c.name
     end
     assert_equal expected, actual

data/test/nested_set_test.rb

@@ -684,6 +684,17 @@ class NestedSetTest < ActiveSupport::TestCase
     assert Category.valid?
   end
 
+  def test_custom_destroy_method_does_not_invalidate
+    Category_WithCustomDestroy.acts_as_nested_set_options[:dependent] = :custom_destroy
+    Category_WithCustomDestroy.find_by_name('Child 2').custom_destroy
+    assert Category_WithCustomDestroy.valid?
+  end
+
+  def test_custom_destroy_raises_an_error_if_method_does_not_exist
+    Category.acts_as_nested_set_options[:dependent] = :custom_destroy
+    assert_raise(NoMethodError) { categories(:child_2).destroy }
+  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

metadata

@@ -1,94 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nested_set
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.6.8
   prerelease: 
-  version: 1.6.7
 platform: ruby
-authors: 
+authors:
 - Brandon Keepers
 - Daniel Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-20 00:00:00 +04:00
+date: 2011-08-31 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: &27660600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *27660600
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &27660100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *27660100
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &27659600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *27659600
+- !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &27659120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *27659120
+- !ruby/object:Gem::Dependency
   name: bench_press
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &27658640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *27658640
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &27658160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *27658160
 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
@@ -118,35 +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: 2412843186330894320
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -14733230779459134
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 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