dag 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dag (0.0.2)
+    dag (0.0.3)
 
 GEM
   remote: http://rubygems.org/

data/lib/dag/vertex.rb

@@ -43,6 +43,23 @@ class DAG
       successors.include?(other) || successors.any? {|v| v.has_path_to?(other) }
     end
 
+    alias :has_descendent? :has_path_to?
+
+    #
+    # Is there a path from +other+ to here following edges in the DAG?
+    #
+    # @param [DAG::Vertex] another Vertex is the same DAG
+    # @raise [ArgumentError] if +other+ is not a Vertex in the same DAG
+    # @return true iff there is a path following edges within this DAG
+    #
+    def has_ancestor?(other)
+      raise ArgumentError.new('You must supply a vertex in this DAG') unless
+        other && Vertex === other && other.dag == self.dag
+      predecessors.include?(other) || predecessors.any? {|v| v.has_ancestor?(other) }
+    end
+
+    alias :is_reachable_from? :has_ancestor?
+
     #
     # Retrieve a value from the vertex's payload.
     # This is a shortcut for vertex.payload[key].

data/spec/lib/dag/vertex_spec.rb

@@ -5,8 +5,9 @@ describe DAG::Vertex do
   subject { dag.add_vertex }
   let(:v1) { dag.add_vertex(name: :v1) }
   let(:v2) { dag.add_vertex(name: :v2) }
+  let(:v3) { dag.add_vertex(name: 'v3') }
 
-  describe 'an instance' do
+  describe '#has_path_to?' do
     it 'cannot have a path to a non-vertex' do
       expect { subject.has_path_to?(23) }.to raise_error(ArgumentError)
     end
@@ -16,6 +17,16 @@ describe DAG::Vertex do
     end
   end
 
+  describe '#has_ancestor?' do
+    it 'ancestors must be a vertex' do
+      expect { subject.has_ancestor?(23) }.to raise_error(ArgumentError)
+    end
+
+    it 'ancestors must be in the same DAG' do
+      expect { subject.has_ancestor?(DAG.new.add_vertex) }.to raise_error(ArgumentError)
+    end
+  end
+
   describe 'with a payload' do
     subject { dag.add_vertex(name: 'Fred', size: 34) }
 
@@ -55,6 +66,12 @@ describe DAG::Vertex do
         subject.predecessors.should == [v1, v2]
       end
     end
+
+    it 'has the correct ancestors' do
+      subject.has_ancestor?(v1).should be_true
+      subject.has_ancestor?(v2).should be_true
+      subject.has_ancestor?(v3).should be_false
+    end
   end
 
   context 'with successors' do
@@ -77,11 +94,14 @@ describe DAG::Vertex do
         subject.successors.should == [v1, v2]
       end
     end
+
+    it 'has no ancestors' do
+      subject.has_ancestor?(v1).should be_false
+      subject.has_ancestor?(v2).should be_false
+    end
   end
 
   context 'in a deep DAG' do
-    let(:v3) { dag.add_vertex }
-
     before do
       dag.add_edge from: subject, to: v1
       dag.add_edge from: v1, to: v2
@@ -94,6 +114,10 @@ describe DAG::Vertex do
     it 'has no path to v3' do
       subject.has_path_to?(v3).should be_false
     end
+
+    it 'recognises that it is an ancestor of v2' do
+      v2.has_ancestor?(subject).should be_true
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dag
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake