ordered_tree 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/ordered_tree.rb

@@ -30,7 +30,7 @@ module OrderedTree #:nodoc:
     has_many :child_nodes, :class_name => self.name, :foreign_key => ordered_tree_config[:foreign_key], :order => ordered_tree_config[:order]
     scope :roots, lambda { |*args|
       scope_condition = args[0]
-      where(self.ordered_tree_config[:foreign_key].to_sym => 0).where(scope_condition).order(self.ordered_tree_config[:order])
+      where(scope_condition).where(self.ordered_tree_config[:foreign_key].to_sym => 0).order(self.ordered_tree_config[:order])
     }
 
     # If the scope is something like :person, then turn it into :person_id
@@ -40,7 +40,8 @@ module OrderedTree #:nodoc:
 
     if self.ordered_tree_config[:scope].is_a?(Symbol) # ie :person_id
       define_method "scope_condition" do
-        self.class.send(:sanitize_sql_hash_for_conditions, {self.class.ordered_tree_config[:scope].to_sym => send(self.class.ordered_tree_config[:scope].to_sym)})
+        hash = {self.class.ordered_tree_config[:scope].to_sym => send(self.class.ordered_tree_config[:scope].to_sym)}
+        self.class.send(:sanitize_sql_hash_for_conditions, hash)
       end
     end
 

data/lib/ordered_tree/instance_methods/list.rb

@@ -140,7 +140,7 @@ module OrderedTree
 
       def reorder_roots
         self.class.transaction do
-          self.class.roots(true).each do |root|
+          self.class.roots(scope_condition).each do |root|
             new_position = self.class.roots.index(root) + 1
             root.update_attribute(order_column, new_position) if (root.position_in_list != new_position)
           end

data/lib/ordered_tree/instance_methods/misc.rb

@@ -15,7 +15,7 @@ module OrderedTree
 
       # Overwrite this method to define the scope of the list changes
       def scope_condition
-        "1 = 1"
+        "1"
       end
     end
   end

data/ordered_tree.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ordered_tree}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ramon Tayag"]

data/spec/ordered_tree_spec.rb

@@ -31,9 +31,18 @@ describe OrderedTree do
           "person_id = #{person_id} AND name = '#{name}'"
         end
       end
-      Page.create(:person => @people[3], :name => "frankenstein").position.should == 1
-      Page.create(:person => @people[3], :name => "steiners").position.should == 1
-      Page.create(:person => @people[3], :name => "frankenstein").position.should == 2
+      page_1 = Page.create(:person => @people[3], :name => "frankenstein")
+      page_1.position.should == 1
+      page_2 = Page.create(:person => @people[3], :name => "steiners")
+      page_2.position.should == 1
+      page_3 = Page.create(:person => @people[3], :name => "frankenstein")
+      page_3.position.should == 2
+
+      # when moving a root to be a child of another
+      page_1.children << page_3
+      page_1.position.should == 1
+      page_2.position.should == 1
+      page_3.position.should == 1
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ordered_tree
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Ramon Tayag