deep_end 0.0.4 → 0.0.5

data/lib/deep_end/version.rb

@@ -1,3 +1,3 @@
 module DeepEnd
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/deep_end.rb

@@ -5,12 +5,13 @@ module DeepEnd
   # Errors
   class SelfDependencyError < StandardError; end
   class CircularDependencyError < StandardError; end
-  
+
   # Graph Node
   class Node
 
     attr_reader :key
     attr_accessor :seen
+    alias_method :seen?, :seen
     attr_reader :edges
 
     def initialize(key)
@@ -20,18 +21,16 @@ module DeepEnd
 
     def addEdge(node)
       @edges << node
-    end 
-    
+    end
+
   end
 
   # Dependency Graph
   class Graph
 
     def resolved_dependencies
-      a = []
-      @resolved.each{|node| a << node.key}
-      return a
-    end 
+      @resolved.map{|node| node.key}
+    end
 
     def initialize
       reset
@@ -47,70 +46,58 @@ module DeepEnd
         node.addEdge(node_for_key_or_new(dependency))
       end
       resolve_dependencies
-      return @resolved
     end
 
     # Return the graph to its virgin state
     def reset
       @resolved = []
-      @seen_this_pass
       @nodes = []
     end
 
     protected
 
-      # Recurse through nodes
-      def resolve_dependencies
-        reset_seen
-        @resolved = []
-        @nodes.each do |node| 
-          @seen_this_pass = []
-          resolve_dependency node unless node.seen
-        end
+    # Recurse through nodes
+    def resolve_dependencies
+      reset_seen
+      @resolved = []
+      @nodes.each do |node|
+        @seen_this_pass = []
+        resolve_dependency node unless node.seen?
       end
+      @resolved
+    end
 
-      # Recurse through node edges
-      def resolve_dependency(node)
-        node.seen = true
-        @seen_this_pass << node
-        
-        node.edges.each do |edge| 
-          unless @resolved.include? edge 
-            unless @seen_this_pass.include? edge
-              unless edge.seen
-                resolve_dependency edge
-              end
-            else
-              raise CircularDependencyError, "Circular reference detected: #{node.key.to_s} - #{edge.key.to_s}"
+    # Recurse through node edges
+    def resolve_dependency(node)
+      node.seen = true
+      @seen_this_pass << node
+
+      node.edges.each do |edge|
+        unless @resolved.include? edge
+          unless @seen_this_pass.include? edge
+            unless edge.seen?
+              resolve_dependency edge
             end
+          else
+            raise CircularDependencyError, "Circular reference detected: #{node.key.to_s} - #{edge.key.to_s}"
           end
         end
-        @resolved << node
-      end
-      
-      def key_exists(key)
-        return node_for_key(key).present?
       end
+      @resolved << node
+    end
 
-      def node_for_key(key)
-        @nodes.each { |node| return node if node.key == key }
-        return 
-      end
+    def node_for_key(key)
+      @nodes.each { |node| return node if node.key == key }
+      return
+    end
 
-      def node_for_key_or_new(key)
-        existing_node = node_for_key(key)
-        if existing_node
-          return existing_node
-        else
-          node = Node.new key 
-          @nodes << node
-          return node
-        end
-      end
+    def node_for_key_or_new(key)
+      node_for_key(key) || (@nodes << Node.new(key)).last
+    end
 
-      def reset_seen
-        @nodes.each{ |node| node.seen = false}
-      end
+    def reset_seen
+      @nodes.each{ |node| node.seen = false}
+    end
 
   end
-end
+end

data/spec/lib/deep_end_spec.rb

@@ -1,20 +1,20 @@
 require 'spec_helper'
 
 module DeepEnd
-  
+
   describe Graph do
 
     before(:each) do
       @graph = Graph.new
     end
 
-    context 'when first created' do 
+    context 'when first created' do
       it 'should have no resolved dependencies' do
         @graph.resolved_dependencies.should be_empty
       end
     end
 
-    context 'when given dendencies' do 
+    context 'when given dendencies' do
 
       # Create dependencies
       before(:each) do
@@ -61,34 +61,35 @@ module DeepEnd
 
       it 'should raise a SelfDependencyError if an object is added as its own dependency' do
         # Add dependencies
-        expect { @graph.add_dependency @dependency_a, [@dependency_a] }.to raise_error(SelfDependencyError) 
+        expect { @graph.add_dependency @dependency_a, [@dependency_a] }.to raise_error(SelfDependencyError)
       end
 
       it 'should raise a CircularDependencyError if objects are added with direct circular dependencies' do
         # Add dependencies
         @graph.add_dependency @dependency_b, [@dependency_a]
-        expect { @graph.add_dependency @dependency_a, [@dependency_b] }.to raise_error(CircularDependencyError) 
+        expect { @graph.add_dependency @dependency_a, [@dependency_b] }.to raise_error(CircularDependencyError)
       end
 
       it 'should raise a CircularDependencyError if objects are added with indirect circular dependencies' do
         # Add dependencies
         @graph.add_dependency @dependency_b, [@dependency_c]
         @graph.add_dependency @dependency_c, [@dependency_a]
-        expect { @graph.add_dependency @dependency_a, [@dependency_b] }.to raise_error(CircularDependencyError) 
+        expect { @graph.add_dependency @dependency_a, [@dependency_b] }.to raise_error(CircularDependencyError)
       end
 
-      context "when reset" do 
+      context "when reset" do
 
         it 'should have no resolved dependencies' do
           # Add dependencies
           @graph.add_dependency @dependency_c, [@dependency_b, @dependency_a]
           @graph.add_dependency @dependency_b, [@dependency_a]
           @graph.add_dependency @dependency_a
-          @graph.reset 
+          @graph.reset
           @graph.resolved_dependencies.length.should == 0
         end
+
       end
 
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep_end
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -105,3 +105,4 @@ summary: This gem processes a list of objects and their dependencies, ordering t
 test_files:
 - spec/lib/deep_end_spec.rb
 - spec/spec_helper.rb
+has_rdoc: