graph 2.1.0 → 2.2.0

data/History.txt

@@ -1,3 +1,15 @@
+=== 2.2.0 / 2011-08-12
+
+* 3 minor enhancements:
+
+  * Added brewer color scheme support: colorscheme(:reds, 5) creates c1 - c5.
+  * Added cluster subgraph shortcut
+  * added Node.connected? and Node.orphan?
+
+* 1 bug fix:
+
+  * Fixed output of single node graphs. (aja)
+
 === 2.1.0 / 2011-05-26
 
 * 3 minor enhancements:

data/README.txt

@@ -1,6 +1,6 @@
 = graph
 
-* http://rubyforge.org/projects/seattlerb
+home :: https://github.com/seattlerb/graph
 
 == DESCRIPTION:
 

data/lib/graph.rb

@@ -7,7 +7,7 @@ require "enumerator"
 # dot format.
 
 class Graph
-  VERSION = "2.1.0" # :nodoc:
+  VERSION = "2.2.0" # :nodoc:
 
   LIGHT_COLORS = %w(gray lightblue lightcyan lightgray lightpink
                     lightslategray lightsteelblue white)
@@ -27,6 +27,22 @@ class Graph
                  "dodgerblue", "sienna", "limegreen", "royalblue",
                  "darkorange", "blue"]
 
+  ##
+  # Defines the brewer color schemes and the maximum number of colors
+  # in each set.
+
+  COLOR_SCHEME_MAX = {
+    :accent   => 8,  :blues    => 9,  :brbg     => 11, :bugn     => 9,
+    :dark2    => 8,  :gnbu     => 9,  :greens   => 9,  :greys    => 9,
+    :oranges  => 9,  :orrd     => 9,  :paired   => 12, :pastel1  => 9,
+    :pastel2  => 8,  :piyg     => 11, :prgn     => 11, :pubu     => 9,
+    :pubugn   => 9,  :puor     => 11, :purd     => 9,  :purples  => 9,
+    :rdbu     => 11, :rdgy     => 11, :rdylbu   => 11, :rdylgn   => 11,
+    :reds     => 9,  :set1     => 9,  :set2     => 8,  :set3     => 12,
+    :spectral => 11, :ylgn     => 9,  :ylgnbu   => 9,  :ylorbr   => 9,
+    :ylorrd   => 9
+  }
+
   SHAPES = %w(Mcircle Mdiamond Msquare box box3d circle component
               diamond doublecircle doubleoctagon egg ellipse folder
               hexagon house invhouse invtrapezium invtriangle none
@@ -139,10 +155,27 @@ class Graph
   end
 
   ##
-  # Shortcut method to create a new colorscheme Attribute instance.
+  # Shortcut method to create a new colorscheme Attribute instance. If
+  # passed +n+, +name+ must match one of the brewer color scheme names
+  # and it will generate accessors for each fillcolor as well as push
+  # the colorscheme onto the node_attribs.
+
+  def colorscheme name, n = nil
+    scheme = Attribute.new "colorscheme = #{name}#{n}"
+    max = COLOR_SCHEME_MAX[name.to_sym]
+
+    if max then
+      node_attribs << scheme
 
-  def colorscheme name
-    Attribute.new "colorscheme = #{name}"
+      mc = (class << self; self; end)
+
+      (1..n).map { |m|
+        mc.send :attr_accessor, "c#{m}"
+        self.send "c#{m}=", Graph::Attribute.new("fillcolor = #{m}")
+      }
+    end
+
+    scheme
   end
 
   ##
@@ -257,6 +290,15 @@ class Graph
     Graph.new name, self, &block
   end
 
+  ##
+  # Shortcut method to create a clustered subgraph in the current
+  # graph. Use with the top-level +digraph+ method in block form for a
+  # graph DSL.
+
+  def cluster name, &block
+    subgraph "cluster_#{name}", &block
+  end
+
   ##
   # Outputs a graphviz graph.
 
@@ -284,7 +326,7 @@ class Graph
     end
 
     nodes.each do |name, node|
-      result << "    #{node};" if graph or node.attributes?
+      result << "    #{node};" if graph or node.attributes? or node.orphan?
     end
 
     edges.each do |from, deps|
@@ -397,6 +439,17 @@ class Graph
 
     attr_accessor :name
 
+    def connected?
+      node = self.name
+      edges = graph.edges
+
+      edges.include?(name) or edges.any? { |from, deps| deps.include? name }
+    end
+
+    def orphan?
+      not connected?
+    end
+
     ##
     # Create a new Node. Takes a parent graph and a name.
 

data/test/test_graph.rb

@@ -1,3 +1,4 @@
+require "rubygems"
 require "minitest/autorun"
 require "tmpdir"
 require "graph"
@@ -37,6 +38,19 @@ class TestGraph < MiniTest::Unit::TestCase
 
   def test_colorscheme
     assert_attribute "colorscheme", "blah", graph.colorscheme("blah")
+    assert_empty graph.node_attribs
+    refute_respond_to graph, :c1
+  end
+
+  def test_colorscheme_n
+    cs = graph.colorscheme("reds", 5)
+    assert_attribute "colorscheme", "reds5", cs
+    assert_equal [cs], graph.node_attribs
+    assert_equal "fillcolor = 1", graph.c1.to_s
+    assert_equal "fillcolor = 2", graph.c2.to_s
+    assert_equal "fillcolor = 3", graph.c3.to_s
+    assert_equal "fillcolor = 4", graph.c4.to_s
+    assert_equal "fillcolor = 5", graph.c5.to_s
   end
 
   def test_fillcolor
@@ -76,6 +90,19 @@ class TestGraph < MiniTest::Unit::TestCase
     assert_equal %w(a), invert.edges["c"].keys
   end
 
+  def test_node_orphan
+    exp = 'digraph { "B"; }'
+
+    y = digraph do node "B" end
+
+    assert_equal exp, y.to_s.gsub(/\s+/m, " ")
+
+    z = digraph do self["B"] end
+
+    assert_equal exp, z.to_s.gsub(/\s+/m, " ")
+  end
+
+
   def test_label
     graph.label "blah"
 
@@ -152,6 +179,17 @@ class TestGraph < MiniTest::Unit::TestCase
     assert_equal 42, n
   end
 
+  def test_cluster
+    n = nil
+    s = graph.cluster "blah" do
+      n = 42
+    end
+
+    assert_equal graph, s.graph
+    assert_equal "cluster_blah", s.name
+    assert_equal 42, n
+  end
+
   def test_to_s
     assert_graph graph, '"a" -> "b"'
 
@@ -255,6 +293,34 @@ class TestNode < MiniTest::Unit::TestCase
     self.n = Graph::Node.new :graph, "n"
   end
 
+  def test_connected_eh
+    graph = Graph.new
+    self.n = graph.node "n"
+    m = graph.node "m"
+
+    refute n.connected?
+    refute m.connected?
+
+    graph.edge("n", "m")
+
+    assert n.connected?
+    assert m.connected?
+  end
+
+  def test_orphan_eh
+    graph = Graph.new
+    self.n = graph.node "n"
+    m = graph.node "m"
+
+    assert n.orphan?
+    assert m.orphan?
+
+    graph.edge("n", "m")
+
+    refute n.orphan?
+    refute m.orphan?
+  end
+
   def test_rshift
     graph = Graph.new
     self.n = graph.node "blah"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: graph
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-05-27 00:00:00 Z
+date: 2011-08-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -46,12 +46,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 31
         segments: 
         - 2
-        - 1
+        - 4
         - 0
-        version: 2.1.0
+        version: 2.4.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -60,14 +60,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 21
         segments: 
         - 2
-        - 9
-        - 4
-        version: 2.9.4
+        - 11
+        version: "2.11"
   type: :development
   version_requirements: *id002
 description: |-
@@ -120,7 +119,7 @@ files:
 - lib/rubygems_plugin.rb
 - test/test_graph.rb
 - .gemtest
-homepage: http://rubyforge.org/projects/seattlerb
+homepage: https://github.com/seattlerb/graph
 licenses: []
 
 post_install_message: 
@@ -150,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.8.3
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Graph is a type of hash that outputs in graphviz's dot format