simple_nested_set 0.0.18 → 0.0.19

data/lib/simple_nested_set/class_methods.rb

@@ -26,7 +26,7 @@ module SimpleNestedSet
     end
 
     def without_node(id)
-      where(arel_table[:id].not_eq(id))
+      where(arel_table[:id].not_eq(id)).order(:lft)
     end
 
     def without_parent
@@ -34,27 +34,27 @@ module SimpleNestedSet
     end
 
     def with_parent(parent_id)
-      where(:parent_id => parent_id)
+      where(:parent_id => parent_id).order(:lft)
     end
 
     def with_ancestors(lft, rgt)
-      where(arel_table[:lft].lt(lft).and(arel_table[:rgt].gt(rgt)))
+      where(arel_table[:lft].lt(lft).and(arel_table[:rgt].gt(rgt))).order(:lft)
     end
 
     def with_descendants(lft, rgt)
-      where(arel_table[:lft].gt(lft).and(arel_table[:rgt].lt(rgt)))
+      where(arel_table[:lft].gt(lft).and(arel_table[:rgt].lt(rgt))).order(:lft)
     end
 
     def with_left_sibling(lft)
-      where(:rgt => lft - 1)
+      where(:rgt => lft - 1).order(:lft)
     end
 
     def with_right_sibling(rgt)
-      where(:lft => rgt + 1)
+      where(:lft => rgt + 1).order(:lft)
     end
 
     def with_leaves
-      where("#{arel_table[:lft].to_sql} = #{arel_table[:rgt].to_sql} - 1")
+      where("#{arel_table[:lft].to_sql} = #{arel_table[:rgt].to_sql} - 1").order(:lft)
     end
   end
-end
+end

data/lib/simple_nested_set/instance_methods.rb

@@ -155,21 +155,23 @@ module SimpleNestedSet
       move_to_right_of(right_sibling) if right_sibling
     end
 
-    # Move the node to the left of another node
+    # Move the node to the left of another node. If this other node is nil then
+    # this means the node is to be made the rightmost sibling.
     def move_to_left_of(node)
       if node
         nested_set.move_to(node, :left)
-      elsif left_most = siblings.first
-        move_to_right_of(left_most)
+      elsif right_most = siblings.last
+        move_to_right_of(right_most)
       end
     end
 
-    # Move the node to the left of another node
+    # Move the node to the left of another node. If this other node is nil then
+    # this means the node is to be made the leftmost sibling.
     def move_to_right_of(node)
       if node
         nested_set.move_to(node, :right)
-      elsif right_most = siblings.last
-        move_to_left_of(right_most)
+      elsif left_most = siblings.first
+        move_to_left_of(left_most)
       end
     end
 

data/lib/simple_nested_set/move/by_attributes.rb

@@ -16,12 +16,6 @@ module SimpleNestedSet
       def perform
         move_by_parent_id if move_by_parent_id?
 
-        # if left_id is given but blank, set right_id to leftmost sibling
-        attributes[:right_id] = siblings.first.id if blank_given?(:left_id) && siblings.any?
-
-        # if right_id is given but blank, set left_id to rightmost sibling
-        attributes[:left_id]  = siblings.last.id if blank_given?(:right_id) && siblings.any?
-
         if path && node.path_changed?
           node.move_to_path(path)
         elsif move_by_left_id?

data/lib/simple_nested_set/nested_set.rb

@@ -34,7 +34,8 @@ module SimpleNestedSet
     def initialize(*args)
       super(node_class, node_class.arel_table)
       @node = args.first if args.size == 1
-      @where_values = self.class.scope(node).instance_variable_get(:@where_values) if node
+      @where_values = self.class.scope(args.first).instance_variable_get(:@where_values) if args.size == 1
+      # TODO how to set order(:lft) here? it's now being added on various scopes (see class methods), would be better to have it here.
     end
 
     def save!

data/lib/simple_nested_set/version.rb

@@ -1,3 +1,3 @@
 module SimpleNestedSet
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_nested_set
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 0
-  - 18
-  version: 0.0.18
+  - 19
+  version: 0.0.19
 platform: ruby
 authors: 
 - Sven Fuchs