acts-as-dag 2.5.3 → 2.5.4

data/README.rdoc

@@ -6,11 +6,11 @@ Acts As Dag, short for Acts As Directed Acyclic Graph, is a plugin which allows
 
 Say you have been using one of the many great plugins that allow for Tree hierarchy like: acts_as_tree or acts_as_nested_set, acts_as_better_nested_set, etc. Yet, you feel something is missing. Tree's are just not good enough. You want to allow each record to have multiple parent objects within a hierarchy as well as multiple children. Then you are going to need a DAG instead of a tree, and thats were this plugin becomes useful.
 
-Version 1.1.1 tested using Rails 2.3.8 and Ruby 1.9.2-p0.
+Version 1.1.2 tested using Rails 2.3.8 and Ruby 1.9.2-p0 and Ruby 1.8.x.
 
 Version 2.0.x tested using Rails 3.0.0 and Ruby 1.9.2-p0, without major structural changes to code from the Rails 3 framework. Removes all deprecation warnings I have received while using AAD and Rails 3.0.0.
 
-Version 2.5.0 is based on Rails 3.0.0 and uses all of the new ActiveModel/ActiveRecord goodness found there.
+Version 2.5.3 is based on Rails 3.0.0 and uses all of the new ActiveModel/ActiveRecord goodness found there.
 
 === What's a DAG?
 

data/VERSION

@@ -1 +1 @@
-2.5.3
+2.5.4

data/lib/dag/edges.rb

@@ -82,7 +82,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
@@ -100,6 +100,28 @@ module Dag
       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)
       !self.find_edge(ancestor, descendant).nil?

data/test/dag_test.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'rubygems'
-gem 'activerecord', '= 3.0.0'
+gem 'activerecord', '= 3.0.3'
 require "./init"
 
 
@@ -813,4 +813,33 @@ 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

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 5
-  - 3
-  version: 2.5.3
+  - 4
+  version: 2.5.4
 platform: ruby
 authors: 
 - Matthew Leventi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -07:00
+date: 2011-02-04 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -47,8 +47,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