acts_as_ordered_tree 1.1.5 → 1.1.6

data/lib/acts_as_ordered_tree/instance_methods.rb

@@ -453,7 +453,7 @@ module ActsAsOrderedTree
     end
 
     def update_descendants_depth #:nodoc:
-      depth_was = self[depth_column]
+      depth_was = send("#{depth_column}_was")
 
       yield
 

data/lib/acts_as_ordered_tree/version.rb

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

data/spec/acts_as_ordered_tree_spec.rb

@@ -209,7 +209,7 @@ describe ActsAsOrderedTree, :transactional do
       it { should be_a ActiveRecord::Relation }
       it { should have(3).items }
       its(:first) { should eq root }
-      its(:last) { should eq subject }
+      its(:last) { should eq grandchild }
     end
 
     context "child" do
@@ -218,7 +218,7 @@ describe ActsAsOrderedTree, :transactional do
       it { should be_a ActiveRecord::Relation }
       it { should have(2).items }
       its(:first) { should eq root }
-      its(:last) { should eq subject }
+      its(:last) { should eq child }
     end
 
     context "root" do
@@ -432,6 +432,7 @@ describe ActsAsOrderedTree, :transactional do
     let!(:child_1) { create :default_with_counter_cache, :parent => root, :name => 'child_1' }
     let!(:child_2) { create :default_with_counter_cache, :parent => root, :name => 'child_2' }
     let!(:child_3) { create :default_with_counter_cache, :parent => root, :name => 'child_3' }
+    let!(:child_4) { create :default_with_counter_cache, :parent => child_3, :name => 'child_4' }
 
     context "initial" do
       specify { expect([child_1, child_2, child_3]).to be_sorted }
@@ -456,6 +457,9 @@ describe ActsAsOrderedTree, :transactional do
         expect{ child_3.save! }.to_not raise_exception
         expect(child_3.position).to eq 2
         expect([root, child_3]).to be_sorted
+
+        expect(child_3.reload.level).to eq 0
+        expect(child_4.reload.level).to eq 1
       end
 
       example "move_grandchild" do
@@ -616,6 +620,23 @@ describe ActsAsOrderedTree, :transactional do
       it { expect([child_1, child_2, child_3, moved_child]).to be_sorted }
       it { expect{ root.move_to_child_of root }.to raise_exception ActiveRecord::ActiveRecordError }
       it { expect{ root.move_to_child_of child_1 }.to raise_exception ActiveRecord::ActiveRecordError }
+
+      context "when node with descendants moved and depth is changed" do
+        before { child_3.move_to_child_of child_2 }
+        before { child_4.reload }
+
+        it "changes parent of child_3" do
+          expect(child_3.parent).to eq child_2
+        end
+
+        it "moves to the end of new parents children list" do
+          expect(child_3).to be_last
+        end
+
+        it "changes depth of child_3 descendants" do
+          expect(child_4.level).to eq 3
+        end
+      end
     end
 
     describe "#move_to_child_with_index" do

metadata

@@ -2,7 +2,7 @@
 name: acts_as_ordered_tree
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Alexei Mikhailov
@@ -10,18 +10,18 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
     none: false
-  name: activerecord
   prerelease: false
+  name: activerecord
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -29,15 +29,15 @@ dependencies:
         version: 3.0.0
     none: false
 - !ruby/object:Gem::Dependency
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
     none: false
-  name: rake
   prerelease: false
+  name: rake
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -45,15 +45,15 @@ dependencies:
         version: 0.9.2
     none: false
 - !ruby/object:Gem::Dependency
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.0'
     none: false
-  name: bundler
   prerelease: false
+  name: bundler
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -61,15 +61,15 @@ dependencies:
         version: '1.0'
     none: false
 - !ruby/object:Gem::Dependency
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.11'
     none: false
-  name: rspec
   prerelease: false
+  name: rspec
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -77,15 +77,15 @@ dependencies:
         version: '2.11'
     none: false
 - !ruby/object:Gem::Dependency
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
     none: false
-  name: shoulda-matchers
   prerelease: false
+  name: shoulda-matchers
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -93,15 +93,15 @@ dependencies:
         version: 1.2.0
     none: false
 - !ruby/object:Gem::Dependency
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - <
       - !ruby/object:Gem::Version
         version: '3'
     none: false
-  name: factory_girl
   prerelease: false
+  name: factory_girl
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - <
@@ -109,15 +109,15 @@ dependencies:
         version: '3'
     none: false
 - !ruby/object:Gem::Dependency
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
     none: false
-  name: appraisal
   prerelease: false
+  name: appraisal
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -3132185917960313730
+      hash: 277439329
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -171,12 +171,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -3132185917960313730
+      hash: 277439329
       version: '0'
   none: false
 requirements: []
 rubyforge_project: acts_as_ordered_tree
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: ActiveRecord extension for sorted adjacency lists support