acts-as-dag 1.1.2 → 1.1.3

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/lib/dag/dag.rb

@@ -515,7 +515,7 @@ module Dag
     def longest_path_between(ancestor, descendant, path=[])
       longest = []
       ancestor.children.each do |child|
-        if child == descendent
+        if child == descendant
           temp = path.clone
           temp << child
           if temp.length > longest.length
@@ -533,6 +533,28 @@ module Dag
       return longest
     end
 
+    #Finds the shortest path between ancestor and descendant returning as an array
+    def shortest_path_between(ancestor, descendant, path=[])
+      shortest = []
+      ancestor.children.each do |child|
+        if child == descendant
+          temp = path.clone
+          temp << child
+          if shortest.blank? || temp.length < shortest.length
+            shortest = temp
+          end
+        elsif self.connected?(child, descendant)
+          temp = path.clone
+          temp << child
+          temp = self.shortest_path_between(child, descendant, temp)
+          if shortest.blank? || temp.length < shortest.length
+            shortest = temp
+          end
+        end
+      end
+      return shortest
+    end
+
     #Determines if an edge exists between two points
     def edge?(ancestor, descendant)
       return !self.find_edge(ancestor, descendant).nil?

data/test/dag_test.rb

@@ -811,4 +811,32 @@ class DagTest < Test::Unit::TestCase
     b.reload
     assert !b.root_for_beta_nodes?
   end
+  #Tests that longest_path_between works
+  def test_longest_path_between
+    a = Node.create!
+    b = Node.create!
+    c = Node.create!
+    d = Node.create!
+    e = Default.create_edge(a,b)
+    e = Default.create_edge(b,c)
+    e = Default.create_edge(a,c)
+    e = Default.create_edge(c,d)
+    path = Default.longest_path_between(a,d)
+    assert_equal [b,c,d], path
+  end
+
+  #Tests that shortest_path_between works
+  def test_shortest_path_between
+    a = Node.create!
+    b = Node.create!
+    c = Node.create!
+    d = Node.create!
+    e = Default.create_edge(a,b)
+    e = Default.create_edge(b,c)
+    e = Default.create_edge(a,c)
+    e = Default.create_edge(c,d)
+    path = Default.shortest_path_between(a,d)
+    assert_equal [c,d], path
+  end
+
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-dag
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Matthew Leventi
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 -07:00
+date: 2011-02-04 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -42,8 +41,8 @@ homepage: http://github.com/resgraph/acts-as-dag
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -51,7 +50,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -60,7 +58,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"