DanaDanger-hyrarchy 0.2 → 0.3

data/lib/hyrarchy/awesome_nested_set_compatibility.rb

@@ -260,13 +260,28 @@ module Hyrarchy
       def same_scope?(other)
         true
       end
-
+      
+      # Returns the sibling before this node. If this node is its parent's
+      # first child, returns nil.
       def left_sibling # :nodoc:
-        raise NotImplementedError, "awesome_nested_set's left_sibling method isn't implemented in this version of Hyrarchy"
+        path = send(:encoded_path)
+        return nil if path == path.parent.first_child
+        sibling_path = path.previous_sibling
+        until self.class.exists?(:lft_numer => sibling_path.numerator, :lft_denom => sibling_path.denominator)
+          sibling_path = sibling_path.previous_sibling
+        end
+        self.class.send(:find_by_encoded_path, sibling_path)
       end
 
-      def right_sibling # :nodoc:
-        raise NotImplementedError, "awesome_nested_set's right_sibling method isn't implemented in this version of Hyrarchy"
+      # Returns the sibling after this node. If this node is its parent's last
+      # child, returns nil.
+      def right_sibling
+        return nil if self == parent.children.last
+        sibling_path = send(:encoded_path).next_sibling
+        until self.class.exists?(:lft_numer => sibling_path.numerator, :lft_denom => sibling_path.denominator)
+          sibling_path = sibling_path.next_sibling
+        end
+        self.class.send(:find_by_encoded_path, sibling_path)
       end
 
       def move_left # :nodoc:
@@ -276,13 +291,58 @@ module Hyrarchy
       def move_right # :nodoc:
         raise NotImplementedError, "awesome_nested_set's move_right method isn't implemented in this version of Hyrarchy"
       end
-
-      def move_to_left_of(other) # :nodoc:
-        raise NotImplementedError, "awesome_nested_set's move_to_left_of method isn't implemented in this version of Hyrarchy"
+      
+      # The semantics of left and right don't quite map exactly from
+      # awesome_nested_set to Hyrarchy. For the purpose of this method, "left"
+      # means "before."
+      #
+      # If this node isn't a sibling of +other+, its parent will be set to
+      # +other+'s parent.
+      def move_to_left_of(other)
+        # Don't attempt an impossible move.
+        if other.is_descendant_of?(self)
+          raise ArgumentError, "you can't move a node to the left of one of its descendants"
+        end
+        # Find the first unused path after +other+'s path.
+        open_path = other.send(:encoded_path).next_sibling
+        while self.class.exists?(:lft_numer => open_path.numerator, :lft_denom => open_path.denominator)
+          open_path = open_path.next_sibling
+        end
+        # Move +other+, and all nodes following it, down.
+        while open_path != other.send(:encoded_path)
+          p = open_path.previous_sibling
+          n = self.class.send(:find_by_encoded_path, p)
+          n.send(:encoded_path=, open_path)
+          n.save!
+          open_path = p
+        end
+        puts open_path
+        # Insert this node.
+        send(:encoded_path=, open_path)
+        save!
       end
 
-      def move_to_right_of(other) # :nodoc:
-        raise NotImplementedError, "awesome_nested_set's move_to_right_of method isn't implemented in this version of Hyrarchy"
+      # The semantics of left and right don't quite map exactly from
+      # awesome_nested_set to Hyrarchy. For the purpose of this method, "right"
+      # means "after."
+      #
+      # If this node isn't a sibling of +other+, its parent will be set to
+      # +other+'s parent.
+      def move_to_right_of(other)
+        # Don't attempt an impossible move.
+        if other.is_descendant_of?(self)
+          raise ArgumentError, "you can't move a node to the right of one of its descendants"
+        end
+        # If +other+ is its parent's last child, we can simply append this node
+        # to the parent's children.
+        if other == other.parent.children.last
+          send(:encoded_path=, other.parent.send(:next_child_encoded_path))
+          save!
+        else
+          # Otherwise, this is equivalent to moving this node to the left of
+          # +other+'s right sibling.
+          move_to_left_of(other.right_sibling)
+        end
       end
 
       # Sets this node's parent to +node+ and calls save!.

data/lib/hyrarchy/encoded_path.rb

@@ -55,6 +55,16 @@ module Hyrarchy
       parent(false).mediant(self)
     end
     
+    # Returns the path of the sibling immediately before the node at this path.
+    # If this is the path of the first sibling, returns nil.
+    def previous_sibling
+      p = parent(false)
+      return nil if self == p.first_child
+      Hyrarchy::EncodedPath(
+        numerator - p.numerator,
+        denominator - p.denominator)
+    end
+    
     # Finds the mediant of this fraction and +other+.
     def mediant(other)
       Hyrarchy::EncodedPath(

data/lib/hyrarchy.rb

@@ -81,6 +81,7 @@ module Hyrarchy
       before_save :set_encoded_paths
       before_save :set_parent_id
       after_save :update_descendant_paths
+      after_save :reset_flags
       
       named_scope :roots,
         :conditions => { :parent_id => nil },
@@ -210,6 +211,7 @@ module Hyrarchy
     # associations.
     def reload(options = nil) # :nodoc:
       @cached = {}
+      reset_flags
       super
     end
 
@@ -292,8 +294,9 @@ module Hyrarchy
     
     # after_save callback to ensure that this node's descendants are updated if
     # this node has moved.
-    def update_descendant_paths
+    def update_descendant_paths # :nodoc:
       return true unless @path_has_changed
+      children.reload if children.loaded? && children.empty?
       
       child_path = encoded_path.first_child
       children.each do |c|
@@ -304,5 +307,10 @@ module Hyrarchy
       
       true
     end
+    
+    # Resets internal flags after saving.
+    def reset_flags # :nodoc:
+      @path_has_changed = @new_parent = @make_root = nil
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: DanaDanger-hyrarchy
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Dana Danger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-22 00:00:00 -08:00
+date: 2009-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: []