closure_tree 3.0.1 → 3.0.2

data/README.md

@@ -197,6 +197,10 @@ class WhatTag < Tag ; end
 
 * Support 3.2.0's fickle deprecation of InstanceMethods (Thanks, [jheiss](https://github.com/mceachen/closure_tree/pull/5))!
 
+### 3.0.2
+
+* Fix for ancestry-loop detection (performed by a validation, not through raising an exception in before_save)
+
 ## Thanks to
 
 * https://github.com/collectiveidea/awesome_nested_set

data/lib/closure_tree/acts_as_tree.rb

@@ -27,9 +27,10 @@ module ClosureTree
 
       include ClosureTree::Model
 
-      before_destroy :acts_as_tree_before_destroy
+      validate :acts_as_tree_validate
       before_save :acts_as_tree_before_save
       after_save :acts_as_tree_after_save
+      before_destroy :acts_as_tree_before_destroy
 
       belongs_to :parent,
         :class_name => ct_class.to_s,
@@ -162,16 +163,19 @@ module ClosureTree
 
     protected
 
-    def acts_as_tree_before_save
-      @was_new_record = new_record?
+    def acts_as_tree_validate
       if changes[parent_column_name] &&
         parent.present? &&
         parent.self_and_ancestors.include?(self)
-        # TODO: raise Ouroboros or Philip J. Fry error:
-        raise ActiveRecord::ActiveRecordError "You cannot add an ancestor as a descendant"
+        errors.add(parent_column_sym, "You cannot add an ancestor as a descendant")
       end
     end
 
+    def acts_as_tree_before_save
+      @was_new_record = new_record?
+      nil # AR will cancel the save if this is falsy
+    end
+
     def acts_as_tree_after_save
       rebuild! if changes[parent_column_name] || @was_new_record
     end

data/lib/closure_tree/version.rb

@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = "3.0.1" unless defined?(::ClosureTree::VERSION)
+  VERSION = "3.0.2" unless defined?(::ClosureTree::VERSION)
 end

data/spec/tag_spec.rb

@@ -83,16 +83,18 @@ describe "empty db" do
       Tag.leaves.should == [@leaf]
     end
 
-    it "should prevent parental loops" do
-      lambda do
-        @mid.children << @root
-      end.should raise_error
-
-      lambda do
-        @leaf.children << @root
-      end.should raise_error
+    it "should prevent parental loops from torso" do
+      @mid.children << @root
+      @root.valid?.should be_false
+      @mid.reload.children.should == [@leaf]
     end
 
+    it "should prevent parental loops from toes" do
+      @leaf.children << @root
+      @root.valid?.should be_false
+      @leaf.reload.children.should be_empty
+    end
+    
     it "should support reparenting" do
       @root.children << @leaf
       Tag.leaves.should =~ [@leaf, @mid]
@@ -168,9 +170,12 @@ describe Tag do
     end
 
     it "should fail to create ancestor loops" do
-      lambda do
-        tags(:child).add_child(tags(:grandparent))
-      end.should raise_error
+      child = tags(:child)
+      parent = child.parent
+      child.add_child(parent) # this should fail
+      parent.valid?.should be_false
+      child.reload.children.should be_empty
+      parent.reload.children.should =~ [child]
     end
 
     it "should move non-leaves" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: closure_tree
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 3
   - 0
-  - 1
-  version: 3.0.1
+  - 2
+  version: 3.0.2
 platform: ruby
 authors: 
 - Matthew McEachen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-30 00:00:00 Z
+date: 2012-02-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false