ordered_tree 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/ordered_tree/instance_methods/list.rb

@@ -8,7 +8,6 @@ module OrderedTree
       #   return is cached
       #   use self_and_siblings(true) to force a reload
       def self_and_siblings(reload = false)
-        #parent(reload) ? parent.children(reload) : self.class.roots(scope_condition)
         parent(reload) ? parent.children(reload) : self.class.roots(scope_condition)
       end
 
@@ -141,7 +140,7 @@ module OrderedTree
       def reorder_roots
         self.class.transaction do
           self.class.roots(scope_condition).each do |root|
-            new_position = self.class.roots.index(root) + 1
+            new_position = self.class.roots(scope_condition).index(root) + 1
             root.update_attribute(order_column, new_position) if (root.position_in_list != new_position)
           end
         end

data/ordered_tree.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ordered_tree}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ramon Tayag"]
-  s.date = %q{2011-06-13}
+  s.date = %q{2011-06-15}
   s.description = %q{Uses parent_id and position to create an ordered tree.}
   s.email = %q{ramon@tayag.net}
   s.extra_rdoc_files = [

data/spec/ordered_tree_spec.rb

@@ -24,7 +24,9 @@ describe OrderedTree do
         Page.create(:person => @people[0]).position.should == 4
         Page.create(:person => @people[1]).position.should == 2
       end
+    end
 
+    it "should only work within that scope_condition overridden method" do
       # when the scope_condition method is overridden
       Page.class_eval do
         def scope_condition
@@ -37,12 +39,26 @@ describe OrderedTree do
       page_2.position.should == 1
       page_3 = Page.create(:person => @people[3], :name => "frankenstein")
       page_3.position.should == 2
+      page_4 = Page.create(:person => @people[3], :name => "frankenstein")
+      page_4.position.should == 3
+      page_5 = Page.create(:person => @people[4], :name => "frankenstein")
+      page_5.position.should == 1
 
       # when moving a root to be a child of another
       page_1.children << page_3
+
+      # reload all of them
+      [page_1, page_2, page_3, page_4, page_5].map(&:reload)
       page_1.position.should == 1
+      page_1.parent.should == nil
       page_2.position.should == 1
+      page_2.parent.should == nil
       page_3.position.should == 1
+      page_3.parent.should == page_1
+      page_4.position.should == 2
+      page_4.parent.should == nil
+      page_5.position.should == 1
+      page_5.parent.should == nil
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ordered_tree
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Ramon Tayag
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 +08:00
+date: 2011-06-15 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency