closure_tree 3.4.1 → 3.4.2

data/README.md

@@ -324,6 +324,11 @@ Closure tree is [tested under every combination](http://travis-ci.org/#!/mceache
 ## Change log
 
 
+### 3.4.2
+
+* Fixed [issue 18](https://github.com/mceachen/closure_tree/issues/18), which affected
+  append_node/prepend_node ordering when the first node didn't have an explicit order_by value
+
 ### 3.4.1
 
 * Reverted .gemspec mistake that changed add_development_dependency to add_runtime_dependency

data/lib/closure_tree/acts_as_tree.rb

@@ -474,6 +474,8 @@ module ClosureTree
 
     def add_sibling(sibling_node, use_update_all = true, add_after = true)
       fail "can't add self as sibling" if self == sibling_node
+      # issue 18: we need to set the order_value explicitly so subsequent orders will work.
+      update_attribute(:order_value, 0) if self.order_value.nil?
       sibling_node.order_value = self.order_value.to_i + (add_after ? 1 : -1)
       # We need to incr the before_siblings to make room for sibling_node:
       if use_update_all

data/lib/closure_tree/version.rb

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

data/spec/fixtures/labels.yml

@@ -48,4 +48,8 @@ e2:
   parent: d2
   sort_order: 1
 
+f3:
+  name: f3
 
+f4:
+  name: f4

data/spec/label_spec.rb

@@ -130,6 +130,26 @@ describe Label do
       labels(:c2).self_and_siblings.to_a.should == [labels(:b1), labels(:c2), labels(:b2)]
     end
 
+    it "should move a node before another node which has an uninitialized sort_order" do
+      labels(:f3).ancestry_path.should == %w{f3}
+      labels(:e2).children << labels(:f3)
+      labels(:f3).reload.ancestry_path.should == %w{a1 b2 c2 d2 e2 f3}
+      labels(:f3).self_and_siblings.to_a.should == [labels(:f3)]
+      labels(:f3).prepend_sibling labels(:f4)
+      labels(:f3).siblings_before.to_a.should == [labels(:f4)]
+      labels(:f3).self_and_siblings.to_a.should == [labels(:f4), labels(:f3)]
+    end
+
+    it "should move a node after another node which has an uninitialized sort_order" do
+      labels(:f3).ancestry_path.should == %w{f3}
+      labels(:e2).children << labels(:f3)
+      labels(:f3).reload.ancestry_path.should == %w{a1 b2 c2 d2 e2 f3}
+      labels(:f3).self_and_siblings.to_a.should == [labels(:f3)]
+      labels(:f3).append_sibling labels(:f4)
+      labels(:f3).siblings_after.to_a.should == [labels(:f4)]
+      labels(:f3).self_and_siblings.to_a.should == [labels(:f3), labels(:f4)]
+    end
+
     it "should move a node after another node" do
       labels(:c2).ancestry_path.should == %w{a1 b2 c2}
       labels(:b2).append_sibling(labels(:c2), false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-02 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -192,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1683026865803138794
+      hash: 2623137531718887180
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1683026865803138794
+      hash: 2623137531718887180
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23