acts_as_ordered_tree 1.1.2 → 1.1.3

data/lib/acts_as_ordered_tree/instance_methods.rb

@@ -194,7 +194,7 @@ module ActsAsOrderedTree
       raise ActiveRecord::ActiveRecordError, "index can't be nil" unless index
 
       tenacious_transaction do
-        new_siblings = (node.try(:children) || self.class.roots).
+        new_siblings = (node.try(:children) || ordered_tree_scope.roots).
             reload.
             lock(true).
             reject { |root_node| root_node == self }

data/lib/acts_as_ordered_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsOrderedTree
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/spec/acts_as_ordered_tree_spec.rb

@@ -682,6 +682,23 @@ describe ActsAsOrderedTree, :transactional do
         expect{ root.move_to_child_with_index child_1, 1 }.to raise_exception ActiveRecord::ActiveRecordError
       end
 
+      context "with scoped tree" do
+        let!(:root1) { create :scoped, :scope_type => 's1' }
+        let!(:node1) { create :scoped, :scope_type => 's1', :parent => root1 }
+        let!(:root2) { create :scoped, :scope_type => 's2' }
+        let!(:node2) { create :scoped, :scope_type => 's2', :parent => root2 }
+
+        example "move_node1_to_root" do
+          node1.should_receive(:move_to_right_of).with(root1)
+          node1.move_to_child_with_index nil, 100
+        end
+
+        example "move_node2_to_root" do
+          node2.should_receive(:move_to_right_of).with(root2)
+          node2.move_to_child_with_index nil, 100
+        end
+      end
+
     end
 
     describe "#insert_at" do
@@ -860,4 +877,4 @@ describe ActsAsOrderedTree, :transactional do
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_ordered_tree
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77952600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,15 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+  version_requirements: *77952600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77952350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,15 +33,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.2
+  version_requirements: *77952350
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77952120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,15 +44,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  version_requirements: *77952120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77951890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -70,15 +55,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.11'
+  version_requirements: *77951890
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77951660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -86,15 +66,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+  version_requirements: *77951660
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77951430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <
@@ -102,15 +77,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3'
+  version_requirements: *77951430
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77951200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -118,12 +88,7 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
+  version_requirements: *77951200
 description: 
 email:
 - amikhailov83@gmail.com
@@ -162,21 +127,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1615306957006760355
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1615306957006760355
 requirements: []
 rubyforge_project: acts_as_ordered_tree
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: ActiveRecord extension for sorted adjacency lists support