graph 2.5.0 → 2.5.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.5.1 / 2012-06-27
+
+* 1 bug fix:
+
+  * UGH. The latest 1.8.7 version has randomized hash buckets and that breaks JUST my tests.
+
 === 2.5.0 / 2012-02-13
 
 * 1 minor enhancement:

data/lib/graph.rb

@@ -7,7 +7,7 @@ require "enumerator"
 # dot format.
 
 class Graph
-  VERSION = "2.5.0" # :nodoc:
+  VERSION = "2.5.1" # :nodoc:
 
   LIGHT_COLORS = %w(gray lightblue lightcyan lightgray lightpink
                     lightslategray lightsteelblue white)
@@ -120,6 +120,10 @@ class Graph
 
   attr_reader :subgraphs
 
+  # TODO: remove if/when I drop 1.8 support.
+  attr_reader :nodes_order # :nodoc:
+  attr_reader :edges_order # :nodoc:
+
   ##
   # Creates a new graph object. Optional name and parent graph are
   # available. Also takes an optional block for DSL-like use.
@@ -128,9 +132,14 @@ class Graph
     @name = name
     @graph = graph
     graph << self if graph
-    @nodes  = Hash.new { |h,k| h[k] = Node.new self, k }
+    @nodes_order = []
+    @nodes  = Hash.new { |h,k| @nodes_order << k; h[k] = Node.new self, k }
+    @edges_order = []
     @edges  = Hash.new { |h,k|
-      h[k] = Hash.new { |h2, k2| h2[k2] = Edge.new self, self[k], self[k2] }
+      h[k] = Hash.new { |h2, k2|
+        @edges_order << [k, k2]
+        h2[k2] = Edge.new self, self[k], self[k2]
+      }
     }
     @graph_attribs = []
     @node_attribs  = []
@@ -360,14 +369,14 @@ class Graph
       result << "    #{line};"
     end
 
-    nodes.each do |name, node|
+    nodes_order.each do |name|
+      node = nodes[name]
       result << "    #{node};" if graph or node.attributes? or node.orphan?
     end
 
-    edges.each do |from, deps|
-      deps.each do |to, edge|
-        result << "    #{edge};"
-      end
+    edges_order.uniq.each do |(from, to)|
+      edge = edges[from][to]
+      result << "    #{edge};"
     end
 
     result << "  }"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: graph
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 2
   - 5
-  - 0
-  version: 2.5.0
+  - 1
+  version: 2.5.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-02-14 00:00:00 Z
+date: 2012-06-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -46,11 +46,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 7
         segments: 
-        - 2
-        - 11
-        version: "2.11"
+        - 3
+        - 0
+        version: "3.0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -76,11 +76,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 7
         segments: 
-        - 2
-        - 13
-        version: "2.13"
+        - 3
+        - 0
+        version: "3.0"
   type: :development
   version_requirements: *id003
 description: |-
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.8.12
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Graph is a type of hash that outputs in graphviz's dot format