graph 2.2.0 → 2.3.0

data/History.txt

@@ -1,3 +1,15 @@
+=== 2.3.0 / 2011-10-04
+
+* 7 minor enhancements:
+
+  * Added CompoundAttribute
+  * Added arrowhead, arrowtail, and arrowsize attribute methods.
+  * Added default arrowhead attribute helpers (vee, box, dot, etc)..
+  * Added fontsize
+  * Attribute#+ now returns a CompoundAttribute
+  * Colorscheme is now passed down to subgraphs.
+  * font shortcut no longer takes optional fontsize.
+
 === 2.2.0 / 2011-08-12
 
 * 3 minor enhancements:

data/gallery/cluster.rb

@@ -1,33 +1,5 @@
 #!/usr/bin/ruby -w
 
-# digraph G {
-#
-#   subgraph cluster_0 {
-#     style=filled;
-#     color=lightgrey;
-#     node [style=filled,color=white];
-#     a0 -> a1 -> a2 -> a3;
-#     label = "process #1";
-#   }
-#
-#   subgraph cluster_1 {
-#     node [style=filled];
-#     b0 -> b1 -> b2 -> b3;
-#     label = "process #2";
-#     color=blue
-#   }
-#   start -> a0;
-#   start -> b0;
-#   a1 -> b3;
-#   b2 -> a3;
-#   a3 -> a0;
-#   a3 -> end;
-#   b3 -> end;
-#
-#   start [shape=Mdiamond];
-#   end [shape=Msquare];
-# }
-
 require "graph"
 
 digraph do

data/gallery/fsm.rb

@@ -1,26 +1,5 @@
 #!/usr/bin/ruby
 
-# digraph finite_state_machine {
-#   rankdir=LR;
-#   size="8,5"
-#   node [shape = doublecircle]; LR_0 LR_3 LR_4 LR_8;
-#   node [shape = circle];
-#   LR_0 -> LR_2 [ label = "SS(B)" ];
-#   LR_0 -> LR_1 [ label = "SS(S)" ];
-#   LR_1 -> LR_3 [ label = "S($end)" ];
-#   LR_2 -> LR_6 [ label = "SS(b)" ];
-#   LR_2 -> LR_5 [ label = "SS(a)" ];
-#   LR_2 -> LR_4 [ label = "S(A)" ];
-#   LR_5 -> LR_7 [ label = "S(b)" ];
-#   LR_5 -> LR_5 [ label = "S(a)" ];
-#   LR_6 -> LR_6 [ label = "S(b)" ];
-#   LR_6 -> LR_5 [ label = "S(a)" ];
-#   LR_7 -> LR_8 [ label = "S(b)" ];
-#   LR_7 -> LR_5 [ label = "S(a)" ];
-#   LR_8 -> LR_6 [ label = "S(b)" ];
-#   LR_8 -> LR_5 [ label = "S(a)" ];
-# }
-
 require "graph"
 
 digraph do

data/gallery/unix.rb

@@ -1,60 +1,5 @@
 #!/usr/bin/ruby -w
 
-# /* courtesy Ian Darwin and Geoff Collyer, Softquad Inc. */
-# digraph unix {
-#   size="6,6";
-#   node [color=lightblue2, style=filled];
-#   "5th Edition" -> "6th Edition";
-#   "5th Edition" -> "PWB 1.0";
-#   "6th Edition" -> "LSX";
-#   "6th Edition" -> "1 BSD";
-#   "6th Edition" -> "Mini Unix";
-#   "6th Edition" -> "Wollongong";
-#   "6th Edition" -> "Interdata";
-#   "Interdata" -> "Unix/TS 3.0";
-#   "Interdata" -> "PWB 2.0";
-#   "Interdata" -> "7th Edition";
-#   "7th Edition" -> "8th Edition";
-#   "7th Edition" -> "32V";
-#   "7th Edition" -> "V7M";
-#   "7th Edition" -> "Ultrix-11";
-#   "7th Edition" -> "Xenix";
-#   "7th Edition" -> "UniPlus+";
-#   "V7M" -> "Ultrix-11";
-#   "8th Edition" -> "9th Edition";
-#   "1 BSD" -> "2 BSD";
-#   "2 BSD" -> "2.8 BSD";
-#   "2.8 BSD" -> "Ultrix-11";
-#   "2.8 BSD" -> "2.9 BSD";
-#   "32V" -> "3 BSD";
-#   "3 BSD" -> "4 BSD";
-#   "4 BSD" -> "4.1 BSD";
-#   "4.1 BSD" -> "4.2 BSD";
-#   "4.1 BSD" -> "2.8 BSD";
-#   "4.1 BSD" -> "8th Edition";
-#   "4.2 BSD" -> "4.3 BSD";
-#   "4.2 BSD" -> "Ultrix-32";
-#   "PWB 1.0" -> "PWB 1.2";
-#   "PWB 1.0" -> "USG 1.0";
-#   "PWB 1.2" -> "PWB 2.0";
-#   "USG 1.0" -> "CB Unix 1";
-#   "USG 1.0" -> "USG 2.0";
-#   "CB Unix 1" -> "CB Unix 2";
-#   "CB Unix 2" -> "CB Unix 3";
-#   "CB Unix 3" -> "Unix/TS++";
-#   "CB Unix 3" -> "PDP-11 Sys V";
-#   "USG 2.0" -> "USG 3.0";
-#   "USG 3.0" -> "Unix/TS 3.0";
-#   "PWB 2.0" -> "Unix/TS 3.0";
-#   "Unix/TS 1.0" -> "Unix/TS 3.0";
-#   "Unix/TS 3.0" -> "TS 4.0";
-#   "Unix/TS++" -> "TS 4.0";
-#   "CB Unix 3" -> "TS 4.0";
-#   "TS 4.0" -> "System V.0";
-#   "System V.0" -> "System V.2";
-#   "System V.2" -> "System V.3";
-# }
-
 require "graph"
 
 digraph "unix" do

data/lib/graph.rb

@@ -7,7 +7,7 @@ require "enumerator"
 # dot format.
 
 class Graph
-  VERSION = "2.2.0" # :nodoc:
+  VERSION = "2.3.0" # :nodoc:
 
   LIGHT_COLORS = %w(gray lightblue lightcyan lightgray lightpink
                     lightslategray lightsteelblue white)
@@ -52,6 +52,10 @@ class Graph
 
   STYLES = %w(dashed dotted solid invis bold filled diagonals rounded)
 
+  ARROW_RE = /(?:o?[lr]?(?:box|crow|diamond|dot|inv|none|normal|tee|vee)){1,4}/
+
+  ARROWS = %w(box crow diamond dot inv none normal tee vee)
+
   STYLES.each do |name|
     define_method(name) { style name }
   end
@@ -61,7 +65,13 @@ class Graph
   end
 
   SHAPES.each do |name|
-    define_method(name.downcase) { shape name }
+    method_name = name.downcase.sub(/none/, 'shape_none')
+    define_method(method_name) { shape name }
+  end
+
+  ARROWS.each do |name|
+    method_name = name.sub(/none/, 'arrow_none')
+    define_method(method_name) { arrowhead name }
   end
 
   ##
@@ -122,6 +132,9 @@ class Graph
     @edge_attribs  = []
     @subgraphs     = []
 
+    self.scheme = graph.scheme if graph
+    node_attribs << scheme if scheme
+
     instance_eval(&block) if block
   end
 
@@ -140,6 +153,20 @@ class Graph
     nodes[name]
   end
 
+  def arrowhead shape
+    raise ArgumentError, "Bad arrow shape: #{shape}" unless shape =~ ARROW_RE
+    Attribute.new "arrowhead = #{shape}"
+  end
+
+  def arrowtail shape
+    raise ArgumentError, "Bad arrow shape: #{shape}" unless shape =~ ARROW_RE
+    Attribute.new "arrowtail = #{shape}"
+  end
+
+  def arrowsize size
+    Attribute.new "arrowsize = #{size}"
+  end
+
   ##
   # A convenience method to set the global node attributes to use boxes.
 
@@ -160,24 +187,23 @@ class Graph
   # and it will generate accessors for each fillcolor as well as push
   # the colorscheme onto the node_attribs.
 
+  attr_accessor :scheme
+
   def colorscheme name, n = nil
-    scheme = Attribute.new "colorscheme = #{name}#{n}"
+    self.scheme = Attribute.new "colorscheme = #{name}#{n}"
     max = COLOR_SCHEME_MAX[name.to_sym]
 
-    if max then
-      node_attribs << scheme
-
-      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
+    node_attribs << scheme if max
 
     scheme
   end
 
+  (1..COLOR_SCHEME_MAX.values.max).map { |m|
+    define_method "c#{m}" do
+      Graph::Attribute.new("fillcolor = #{m}")
+    end
+  }
+
   ##
   # Define one or more edges.
   #
@@ -221,9 +247,12 @@ class Graph
   # Shortcut method to create a new font Attribute instance. You can
   # pass in both the name and an optional font size.
 
-  def font name, size=nil
-    Attribute.new "fontname = #{name.inspect}" +
-      (size ? ", fontsize = #{size}" : "")
+  def font name
+    Attribute.new "fontname = #{name.inspect}"
+  end
+
+  def fontsize size
+    Attribute.new "fontsize = #{size}"
   end
 
   ##
@@ -372,7 +401,31 @@ class Graph
     #   bad_nodes = red + filled + diamond
 
     def + style
-      Attribute.new "#{self}, #{style}"
+      c = CompoundAttribute.new
+      c.push self
+      c.push style
+      c
+    end
+  end
+
+  class CompoundAttribute < Attribute
+    def initialize attr = []
+      super
+    end
+
+    def push attrib
+      attr.push attrib
+    end
+
+    def << thing
+      attr.each do |subattr|
+        subattr << thing # allows for recursive compound attributes
+      end
+      self
+    end
+
+    def to_s
+      attr.join ", "
     end
   end
 

data/test/test_graph.rb

@@ -39,7 +39,6 @@ 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
@@ -63,7 +62,8 @@ class TestGraph < MiniTest::Unit::TestCase
 
   def test_font_size
     # cheating... but I didn't want to write a more complex assertion
-    assert_attribute "fontname", '"blah", fontsize = 12', graph.font("blah", 12)
+    assert_attribute "fontname", '"blah"', graph.font("blah")
+    assert_attribute "fontsize", '12',     graph.fontsize(12)
   end
 
   def test_digraph
@@ -278,7 +278,8 @@ class TestAttribute < MiniTest::Unit::TestCase
 
     c = a + b
 
-    assert_equal "blah, halb", c.attr
+    assert_equal [a, b], c.attr
+    assert_equal "blah, halb", c.to_s
   end
 
   def test_to_s
@@ -286,6 +287,19 @@ class TestAttribute < MiniTest::Unit::TestCase
   end
 end
 
+class TestCompoundAttribute < TestAttribute
+  def test_lshift
+    b = Graph::Attribute.new "halb"
+    n = Graph::Node.new nil, nil
+
+    c = a + b
+
+    c << n # paint the node with a + b
+
+    assert_equal [a, b], n.attributes
+  end
+end
+
 class TestNode < MiniTest::Unit::TestCase
   attr_accessor :n
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: graph
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 2
-  - 2
+  - 3
   - 0
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-08-13 00:00:00 Z
+date: 2011-10-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -44,14 +44,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 9
         segments: 
         - 2
-        - 4
-        - 0
-        version: 2.4.0
+        - 5
+        version: "2.5"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -62,11 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 27
         segments: 
         - 2
-        - 11
-        version: "2.11"
+        - 12
+        version: "2.12"
   type: :development
   version_requirements: *id002
 description: |-
@@ -149,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.8.8
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Graph is a type of hash that outputs in graphviz's dot format