acts_as_ordered_tree 1.1.4 → 1.1.5

data/lib/acts_as_ordered_tree/instance_methods.rb

@@ -243,6 +243,8 @@ module ActsAsOrderedTree
     end
 
     def compute_ordered_tree_columns(target, pos) #:nodoc:
+      position_was = send("#{position_column}_was")
+
       case pos
         when :root  then
           parent_id = nil
@@ -256,12 +258,12 @@ module ActsAsOrderedTree
         when :left  then
           parent_id = target[parent_column]
           position = target[position_column]
-          position -= 1 if target[parent_column] == send("#{parent_column}_was") && target[position_column] > position_was # right
+          position -= 1 if position_was && target[parent_column] == send("#{parent_column}_was") && target[position_column] > position_was # right
           depth = target.level
         when :right then
           parent_id = target[parent_column]
           position = target[position_column]
-          position += 1 if target[parent_column] != send("#{parent_column}_was") || target[position_column] < position_was # left
+          position += 1 if target[parent_column] != send("#{parent_column}_was") || position_was.blank? || target[position_column] < position_was # left
           depth = target.level
         when :child then
           parent_id = target.id
@@ -299,8 +301,8 @@ module ActsAsOrderedTree
           raise ActiveRecord::ActiveRecordError, "Impossible move"
         end
 
-        position_was = send "#{position_column}_was".intern
-        parent_id_was = send "#{parent_column}_was".intern
+        position_was = send("#{position_column}_was")
+        parent_id_was = send("#{parent_column}_was")
         parent_id, position, depth = compute_ordered_tree_columns(target, pos)
 
         # nothing changed - quit

data/lib/acts_as_ordered_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsOrderedTree
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/spec/acts_as_ordered_tree_spec.rb

@@ -875,6 +875,13 @@ describe ActsAsOrderedTree, :transactional do
       it "should not throw error" do
         expect{ create :default, :position => 22 }.not_to raise_error
       end
+
+      it "should be saved at proper position" do
+        root = create :default
+
+        node = create :default, :position => 2
+        node.position.should eq 2
+      end
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: acts_as_ordered_tree
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Alexei Mikhailov
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 4288647735453151869
+      hash: -3132185917960313730
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 4288647735453151869
+      hash: -3132185917960313730
       version: '0'
   none: false
 requirements: []