ruby-graphviz 0.8.3 → 0.9.0

data/ChangeLog

@@ -1,3 +1,16 @@
+0.9.0 :
+* Add fdp example (sample 15)
+* Add edge between cluster and node and cluster and cluster support
+* GraphViz.add_node now support array (sample 16)
+* Bug correction in GraphViz.output (sample 19)
+* Add GraphViz#default to set default options (:use, :path and :output)
+* Add possibility to set node or edge attribut via :
+		node.<attribut>=<value> or node.<attribut>( <value> )
+		adge.<attribut>=<value> or adge.<attribut>( <value> )
+* Add GraphViz::Edge.set and GraphViz::Node.net
+* Add sample 20
+* Add GraphViz.node_count and GraphViz.edge_count by Daniel Cadenas Nión
+
 0.8.2 : 
 * Update Node, Edge and Graph Attributes (see http://www.graphviz.org/doc/info/attrs.html)
 * Bugs corrections

data/examples/HTML-Labels.rb

@@ -1,7 +1,7 @@
 $:.unshift( "../lib" );
 require "graphviz"
 
-g = GraphViz::new( "structs", "output" => "png", :path => ARGV[0] )
+g = GraphViz::new( "structs", :output => "png" )
 
 g.node["shape"] = "plaintext"
 
@@ -17,4 +17,4 @@ g.add_edge( "struct1:f2", "struct3:here" )
 
 g.add_edge( "HTML", "struct1" )
 
-g.output( "file" => "HTML-Labels.png" )
+g.output( :path => '/usr/local/bin/', :file => "#{$0}.png" )

data/examples/arrowhead.rb

@@ -94,4 +94,4 @@ g.edge["arrowhead"] = "normal"
   g.add_edge( p, s, "arrowhead" => s )
 }
 
-g.output()
+g.output( :file => "#{$0}.png" )

data/examples/maketest.sh

@@ -1,15 +1,28 @@
 #!/bin/sh
 
-ruby sample01.rb $1 > sample01.png
-ruby sample02.rb $1 > sample02.png
-ruby sample03.rb $1 > sample03.png
-ruby sample04.rb $1 > sample04.png
+ruby shapes.rb $1
+ruby arrowhead.rb $1
 
-ruby sample07.rb $1 > sample07.png
-ruby sample08.rb $1 > sample08.png
-ruby sample09.rb $1 > sample09.png
+ruby sample01.rb $1
+ruby sample02.rb $1
+ruby sample03.rb $1
+ruby sample04.rb $1
+ruby sample05.rb $1
+                   
+ruby sample07.rb $1
+ruby sample08.rb $1
+ruby sample09.rb $1
+ruby sample10.rb $1
+ruby sample11.rb $1
+ruby sample12.rb $1
+ruby sample13.rb
+ruby sample14.rb
+ruby sample15.rb
+ruby sample16.rb
+ruby sample17.rb
+ruby sample18.rb
+ruby sample19.rb
 
-ruby sample11.rb $1 > sample11.png
-
-ruby shapes.rb $1 > shapes.png
-ruby arrowhead.rb $1 > arrowhead.png
+ruby testorder.rb $1
+ruby testxml.rb $1
+ruby HTML-Labels.rb

data/examples/sample01.rb

@@ -29,4 +29,4 @@ g.add_edge( init, make_string )
 g.add_edge( main, printf )
 g.add_edge( execute, compare )
 
-g.output( :output => "png" )
+g.output( :output => "png", :file => "#{$0}.png" )

data/examples/sample02.rb

@@ -39,4 +39,4 @@ g.add_edge( init, make_string )
 g.add_edge( main, printf, :color => "red", :style => "bold", :label => "100 times" )
 g.add_edge( execute, compare, :color => "red" )
 
-g.output( )
+g.output( :file => "#{$0}.png" )

data/examples/sample03.rb

@@ -28,4 +28,4 @@ g.add_edge( a, b )
 g.add_edge( b, c )
 g.add_edge( b, d )
 
-g.output()
+g.output( :file => "#{$0}.png" )

data/examples/sample04.rb

@@ -19,4 +19,4 @@ struct3 = g.add_node( "struct3", "shape" => "record", "label" => 'hello\nworld |
 g.add_edge( struct1, struct2 )
 g.add_edge( struct1, struct3 )
 
-g.output()
+g.output( :file => "#{$0}.png" )

data/examples/sample05.rb

@@ -29,4 +29,4 @@ g.add_edge( init, make_string )
 g.add_edge( main, printf )
 g.add_edge( execute, compare )
 
-g.output( "output" => "png" )
+g.output( "output" => "png", :file => "#{$0}.png" )

data/examples/sample07.rb

@@ -3,13 +3,14 @@
 $:.unshift( "../lib" );
 require "graphviz"
 
-g = nil
+GraphViz::options( :output => "png", :use => "dot" )
+
 if ARGV[0]
-  g = GraphViz::new( "structs", "output" => "png", "path" => ARGV[0] )
-else
-  g = GraphViz::new( "structs", "output" => "png" )
+  GraphViz::options( :path => ARGV[0] )
 end
 
+g = GraphViz::new( "structs", "output" => "png" )
+
 g.node["shape"] = "record"
 
 g.add_node( "struct1", "shape" => "record", "label" => "<f0> left|<f1> middle|<f2> right" )
@@ -19,4 +20,4 @@ g.add_node( "struct3", "shape" => "record", "label" => 'hello\nworld |{ b |{c|<h
 g.add_edge( "struct1:f1", "struct2:f0" )
 g.add_edge( "struct1:f2", "struct3:here" )
 
-g.output()
+g.output( :file => "#{$0}.png" )

data/examples/sample08.rb

@@ -31,4 +31,4 @@ g.add_edge( "node0:f6", "node5:n" )
 g.add_edge( "node2:p", "node6:n" )
 g.add_edge( "node4:p", "node7:n" )
 
-g.output()
+g.output( :file => "#{$0}.png" )

data/examples/sample09.rb

@@ -47,4 +47,4 @@ g.add_edge( a3, a0 )
 g.add_edge( a3, endn )
 g.add_edge( b3, endn )
 
-g.output()
+g.output( :file => "#{$0}.png" )

data/examples/sample10.rb

@@ -47,4 +47,4 @@ g.add_edge( a3, a0 )
 g.add_edge( a3, endn )
 g.add_edge( b3, endn )
 
-g.output()
+g.output( :file => "#{$0}.png" )

data/examples/sample11.rb

@@ -39,4 +39,4 @@ graph.add_edge( c, g, "ltail" => "cluster0", "lhead" => "cluster1" )
 graph.add_edge( c, e, "ltail" => "cluster0" )
 graph.add_edge( d, h )
 
-graph.output()
+graph.output( :file => "#{$0}.png" )

data/examples/sample12.rb

@@ -52,4 +52,4 @@ g.cluster0.a3 << g.cluster0.a0
 g.cluster0.a3 << g.endn
 g.cluster1.b3 << g.endn
 
-g.output( :path => '/usr/local/graphviz-2.14/bin/' )
+g.output( :file => "#{$0}.png" )

data/examples/sample13.rb

@@ -45,4 +45,4 @@ GraphViz::new( "G", "output" => "png" ) { |graph|
   graph.cluster0.a3 << graph.cluster0.a0
   graph.cluster0.a3 << graph.endn
   graph.cluster1.b3 << graph.endn
-}.output( :path => '/usr/local/graphviz-2.14/bin/' )
+}.output( :path => '/usr/local/bin/', :file => "#{$0}.png" )

data/examples/sample14.rb

@@ -41,4 +41,4 @@ GraphViz::new( "G", "output" => "png" ) { |graph|
   graph.cluster0.a3 << graph.cluster0.a0
   graph.cluster0.a3 << graph.endn
   graph.cluster1.b3 << graph.endn
-}.output( :path => '/usr/local/graphviz-2.14/bin/' )
+}.output( :path => '/usr/local/bin/', :file => "#{$0}.png" )

data/examples/sample15.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/ruby
+
+# fdp example 
+# see : http://www.graphviz.org/Gallery/undirected/fdpclust.html
+
+$:.unshift( "../lib" );
+require "graphviz"
+
+GraphViz::new( "G", :type => "graph", :output => "png", :use => "fdp" ) { |graph|
+  graph.e
+  graph.clusterA { |cA|
+    cA.a << cA.b
+    cA.clusterC { |cC|
+      cC._c( :label => "C" ) << cC._d( :label => "D" )
+    }
+  }
+  graph.clusterB { |cB|
+    cB.d << cB.f
+  }
+  graph.clusterB.d << graph.clusterA.clusterC._d
+  graph.e << graph.clusterB
+  graph.clusterA.clusterC << graph.clusterB
+}.output( :path => '/usr/local/bin/', :file => "#{$0}.png" )

data/examples/sample16.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../lib" );
+require "graphviz"
+
+GraphViz::new( "G", :type => "graph", :output => "png", :rankdir => "LR" ) { |graph|
+  graph.add_edge( [graph.a, graph.b, graph.c], [ graph.d, graph.e, graph.f ] )
+}.output( :path => '/usr/local/bin/', :file => "#{$0}.png" )

data/examples/sample17.rb

@@ -0,0 +1,92 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../lib" );
+require "graphviz"
+
+GraphViz::new( "G", :type => "graph", :output => "png", :rankdir => "LR", :bgcolor => "#808080" ) { |graph|
+  graph.edge[:dir] = "none"
+  
+  graph.node[:width] = "0.3"
+  graph.node[:height] = "0.3" 
+  graph.node[:label] = ""
+  
+  _ = {}
+  
+  ("1".."8").each do |v|
+    _[v] = graph.add_node( v, :shape => "circle", :style => "invis")
+  end
+  ["10","20","30","40","50","60","70","80"].each do |v|
+    _[v] = graph.add_node( v, :shape => "circle", :style => "invis")
+  end
+  
+  ("a".."x").each do |v|
+    _[v] = graph.add_node( v, :shape => "circle")
+  end
+
+  ("A".."X").each do |v|
+    _[v] = graph.add_node( v, :shape => "diamond")
+  end
+  
+  (_["1"] << _["a"])[:color]="#0000ff"
+  (_["a"] << _["A"])[:color]="#0000ff"
+  (_["a"] << _["B"])[:color]="#0000ff"
+  (_["2"] << _["b"])[:color]="#ff0000"
+  (_["b"] << _["B"])[:color]="#ff0000"
+  (_["b"] << _["A"])[:color]="#ff0000"
+  (_["3"] << _["c"])[:color]="#ffff00"
+  (_["c"] << _["C"])[:color]="#ffff00"
+  (_["c"] << _["D"])[:color]="#ffff00"
+  (_["4"] << _["d"])[:color]="#00ff00"
+  (_["d"] << _["D"])[:color]="#00ff00"
+  (_["d"] << _["C"])[:color]="#00ff00"
+  (_["5"] << _["e"])[:color]="#000000"
+  (_["e"] << _["E"])[:color]="#000000"
+  (_["e"] << _["F"])[:color]="#000000"
+  (_["6"] << _["f"])[:color]="#00ffff"
+  (_["f"] << _["F"])[:color]="#00ffff"
+  (_["f"] << _["E"])[:color]="#00ffff"
+  (_["7"] << _["g"])[:color]="#ffffff"
+  (_["g"] << _["G"])[:color]="#ffffff"
+  (_["g"] << _["H"])[:color]="#ffffff"
+  (_["8"] << _["h"])[:color]="#ff00ff"
+  (_["h"] << _["H"])[:color]="#ff00ff"
+  (_["h"] << _["G"])[:color]="#ff00ff"
+  
+  graph.edge[:color]="#ff0000:#0000ff"
+  _["A"] << _["i"]; _["i"] << [_["I"], _["K"]]
+  _["B"] << _["j"]; _["j"] << [_["J"], _["L"]]
+
+  graph.edge[:color]="#00ff00:#ffff00"
+  _["C"] << _["k"]; _["k"] << [_["K"], _["I"]]
+  _["D"] << _["l"]; _["l"] << [_["L"], _["J"]]
+
+  graph.edge[:color]="#00ffff:#000000"
+  _["E"] << _["m"]; _["m"] << [_["M"], _["O"]]
+  _["F"] << _["n"]; _["n"] << [_["N"], _["P"]]
+
+  graph.edge[:color]="#ff00ff:#ffffff"
+  _["G"] << _["o"]; _["o"] << [_["O"], _["M"]]
+  _["H"] << _["p"]; _["p"] << [_["P"], _["N"]]
+
+  graph.edge[:color]="#00ff00:#ffff00:#ff0000:#0000ff"
+  _["I"] << _["q"]; _["q"] << [_["Q"], _["U"]]
+  _["J"] << _["r"]; _["r"] << [_["R"], _["V"]]
+  _["K"] << _["s"]; _["s"] << [_["S"], _["W"]]
+  _["L"] << _["t"]; _["t"] << [_["T"], _["X"]]
+
+  graph.edge[:color]="#ff00ff:#ffffff:#00ffff:#000000"
+  _["M"] << _["u"]; _["u"] << [_["U"], _["Q"]]
+  _["N"] << _["v"]; _["v"] << [_["V"], _["R"]]
+  _["O"] << _["w"]; _["w"] << [_["W"], _["S"]]
+  _["P"] << _["x"]; _["x"] << [_["X"], _["T"]]
+
+	graph.edge[:color]="#ff00ff:#ffffff:#00ffff:#000000:#00ff00:#ffff00:#ff0000:#0000ff"
+	_["Q"] << _["10"]
+	_["R"] << _["20"]
+	_["S"] << _["30"]
+	_["T"] << _["40"]
+	_["U"] << _["50"]
+	_["V"] << _["60"]
+	_["W"] << _["70"]
+	_["X"] << _["80"]
+}.output( :path => '/usr/local/bin/', :file => "#{$0}.png" )

data/examples/sample18.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../lib" );
+require "graphviz"
+
+GraphViz::new( "G", :output => "png", :rankdir => "LR", :size => "8,5" ) { |graph|
+  graph.node[:shape] = "doublecircle"
+  graph._LR_0; graph._LR_3; graph._LR_4; graph._LR_8
+  graph.node[:shape] = "circle"
+  (graph._LR_0 << graph._LR_2)[:label] = "SS(B)"
+  (graph._LR_0 << graph._LR_1)[:label] = "SS(S)"
+  (graph._LR_1 << graph._LR_3)[:label] = "S($end)"
+  (graph._LR_2 << graph._LR_6)[:label] = "SS(b)"
+  (graph._LR_2 << graph._LR_5)[:label] = "SS(a)"
+  (graph._LR_2 << graph._LR_4)[:label] = "S(A)"
+  (graph._LR_5 << graph._LR_7)[:label] = "S(b)"
+  (graph._LR_5 << graph._LR_5)[:label] = "S(a)"
+  (graph._LR_6 << graph._LR_6)[:label] = "S(b)"
+  (graph._LR_6 << graph._LR_5)[:label] = "S(a)"
+  (graph._LR_7 << graph._LR_8)[:label] = "S(b)"
+  (graph._LR_7 << graph._LR_5)[:label] = "S(a)"
+  (graph._LR_8 << graph._LR_6)[:label] = "S(b)"
+  (graph._LR_8 << graph._LR_5)[:label] = "S(a)"
+}.output( :path => '/usr/local/bin/', :file => "#{$0}.png" )

data/examples/sample19.rb

@@ -0,0 +1,59 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../lib" );
+require "graphviz"
+
+GraphViz::new( "ER", :type => "graph", :output => "png", :use => "neato" ) { |graph|
+  graph.node[:shape] = "box"
+  graph.course; graph.institute; graph.student
+  
+  graph.node[:shape] = "ellipse"
+  graph.name0(:label => "name")
+  graph.name1(:label => "name")
+  graph.name2(:label => "name")
+  graph.code; graph.grade; graph.number
+  
+  graph.node[:shape] = "diamond"
+  graph.node[:style] = "filled"
+  graph.node[:color] = "lightgrey"
+  graph.ci( :label => "C-I" )
+  graph.sc( :label => "S-C" )
+  graph.si( :label => "S-I" )
+
+  graph.name0 << graph.course;
+  graph.code << graph.course;
+  
+  (graph.course << graph.ci).set { |e|
+    e.label = "n"
+    e.len = "1.00"
+  }
+  
+  e = (graph.ci << graph.institute)
+  e.label = "1"
+  e[:len] = "1.00"
+  
+  graph.institute << graph.name1;
+  
+  e = (graph.institute << graph.si)
+  e[:label] = "1"
+  e[:len] = "1.00"
+  
+  e = (graph.si << graph.student)
+  e[:label] = "n"
+  e[:len] = "1.00"
+  
+  graph.student << graph.grade
+  graph.student << graph.name2
+  graph.student << graph.number
+  
+  e = (graph.student << graph.sc)
+  e[:label] = "m"
+  e[:len] = "1.00"
+  
+  e = (graph.sc << graph.course)
+  e[:label] = "n"
+  e[:len] = "1.00"
+
+  graph[:label] = "\\n\\nEntity Relation Diagram\\ndrawn by NEATO";
+  graph[:fontsize] = "20";
+}.output( :path => '/usr/local/bin/', :file => "#{$0}.png" )

data/examples/sample20.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../lib" );
+require "graphviz"
+
+GraphViz::options( :output => "png", :use => "dot" )
+
+if ARGV[0]
+  GraphViz::options( :path => ARGV[0] )
+end
+
+GraphViz::new( "g", :rankdir => "LR", :type => "digraph" ) { |g|
+  g.node[:fontsize] = "16"
+  g.node[:shape] = "record"
+  
+  g.node0( :label => "<f0> 0x10ba8| <f1>" )
+  g.node1( :label => "<f0> 0xf7fc4380| <f1> | <f2> |-1" )
+  g.node2( :label => "<f0> 0xf7fc44b8| | |2" )
+  g.node3( :label => "<f0> 3.43322790286038071e-06|44.79998779296875|0" )
+  g.node4( :label => "<f0> 0xf7fc4380| <f1> | <f2> |2" )
+  g.node5( :label => "<f0> (nil)| | |-1" )
+  g.node6( :label => "<f0> 0xf7fc4380| <f1> | <f2> |1" )
+  g.node7( :label => "<f0> 0xf7fc4380| <f1> | <f2> |2" )
+  g.node8( :label => "<f0> (nil)| | |-1" )
+  g.node9( :label => "<f0> (nil)| | |-1" )
+  g.node10( :label => "<f0> (nil)| <f1> | <f2> |-1" )
+  g.node11( :label => "<f0> (nil)| <f1> | <f2> |-1" )
+  g.node12( :label => "<f0> 0xf7fc43e0| | |1" )
+  
+  g.add_edge( g.node0(:f0), g.node1(:f0) )
+  g.add_edge( g.node0(:f1), g.node2(:f0) )
+  g.add_edge( g.node1(:f0), g.node3(:f0) )
+  g.add_edge( g.node1(:f1), g.node4(:f0) )
+  g.add_edge( g.node1(:f2), g.node5(:f0) )
+  g.add_edge( g.node4(:f0), g.node3(:f0) )
+  g.add_edge( g.node4(:f1), g.node6(:f0) )
+  g.add_edge( g.node4(:f2), g.node10(:f0) )
+  g.add_edge( g.node6(:f0), g.node3(:f0) )
+  g.add_edge( g.node6(:f1), g.node7(:f0) )
+  g.add_edge( g.node6(:f2), g.node9(:f0) )
+  g.add_edge( g.node7(:f0), g.node3(:f0) )
+  g.add_edge( g.node7(:f1), g.node1(:f0) )
+  g.add_edge( g.node7(:f2), g.node8(:f0) )
+  g.add_edge( g.node10(:f1), g.node11(:f0) )
+  g.add_edge( g.node10(:f2), g.node12(:f0) )
+  g.add_edge( g.node11(:f2), g.node1(:f0) )
+}.output( :file => "#{$0}.png" )

data/examples/shapes.rb

@@ -14,10 +14,11 @@ g.node["shape"] = "ellipse"
 
 [ "box", "polygon", "ellipse", "circle", "point", 
   "egg", "triangle", "plaintext", "diamond", "trapezium", 
-  "parallelogram", "house", "hexagon", "octagon", "doublecircle", 
+  "parallelogram", "house", "pentagon", "hexagon", "septagon", "octagon", "doublecircle", 
   "doubleoctagon", "tripleoctagon", "invtriangle", "invtrapezium", "invhouse", 
-  "Mdiamond", "Msquare", "Mcircle" ].each { |s|
+  "Mdiamond", "Msquare", "Mcircle", "rect", "rectangle", "none", "note", "tab", "folder",
+  "box3d", "component" ].each { |s|
   g.add_node( s, "shape" => s )
 }
 
-g.output()
+g.output( :file => "shapes.png")

data/examples/testorder.rb

@@ -40,4 +40,4 @@ g.add_edge( init, make_string )
 g.add_edge( main, printf, "color" => "red", "style" => "bold", "label" => "100 times" )
 g.add_edge( execute, compare, "color" => "red" )
 
-g.output( )
+g.output( :file => "#{$0}.png" )

data/examples/testxml.rb

@@ -4,4 +4,4 @@ $:.unshift( "../lib" )
 require 'graphviz/xml'
 
 gvxml = GraphViz::XML::new( "test.xml", :text => true, :attrs => true )
-gvxml.output( :output => "png", :file => "test.png", :use => "dot", :path => ARGV[0] )
+gvxml.output( :output => "png", :file => "#{$0}.png", :use => "dot", :path => ARGV[0] )

data/lib/graphviz.rb

@@ -28,14 +28,17 @@ class GraphViz
   public
 
   ## Var: Output format (dot, png, jpeg, ...)
+  @@format = "canon"
   @format
   ## Var: Output file name
   @filename
   ## Var: program to use (dot|twopi)
+  @@prog = "dot"
   @prog
   ## Var: program path
+  @@path = nil
   @path
-
+  
   ## Var: Graph name
   @name
 
@@ -78,30 +81,44 @@ class GraphViz
   # Create a new edge
   # 
   # In:
-  #   oNodeOne : First node
-  #   oNodeTwo : Second Node
+  #   oNodeOne : First node (or node list)
+  #   oNodeTwo : Second Node (or node list)
   #   *hOpt : Edge attributs
   #
   def add_edge( oNodeOne, oNodeTwo, *hOpt )
-    oEdge = GraphViz::Edge::new( oNodeOne, oNodeTwo, self )
     
-    if hOpt.nil? == false and hOpt[0].nil? == false
-      hOpt[0].each do |xKey, xValue|
-        oEdge[xKey.to_s] = xValue
+    if( oNodeOne.class == Array ) 
+      oNodeOne.each do |no|
+        add_edge( no, oNodeTwo, *hOpt )
       end
-    end
+    else
+      if( oNodeTwo.class == Array )
+        oNodeTwo.each do |nt|
+          add_edge( oNodeOne, nt, *hOpt )
+        end
+      else
 
-    @elements_order.push( { 
-      "type" => "edge", 
-      "value" => oEdge
-    } )
-    
-    @loEdges.push( oEdge )
-    return( oEdge )
+        oEdge = GraphViz::Edge::new( oNodeOne, oNodeTwo, self )
+        
+        if hOpt.nil? == false and hOpt[0].nil? == false
+          hOpt[0].each do |xKey, xValue|
+            oEdge[xKey.to_s] = xValue
+          end
+        end
+
+        @elements_order.push( { 
+          "type" => "edge", 
+          "value" => oEdge
+        } )
+        @loEdges.push( oEdge )
+        
+        return( oEdge )
+      end
+    end
   end
 
   # 
-  # Create � new graph
+  # Create à new graph
   # 
   # In:
   #   xGraphName : Graph name
@@ -124,7 +141,21 @@ class GraphViz
     
     return( @hoGraphs[xGraphName] )
   end
-
+  
+  #
+  # Get the number of nodes
+  #
+  def node_count
+    @hoNodes.size
+  end
+  
+  #
+  # Get the number of edges
+  #
+  def edge_count
+    @loEdges.size
+  end
+  
   def method_missing( idName, *args, &block ) #:nodoc:
     xName = idName.id2name
   
@@ -136,7 +167,13 @@ class GraphViz
       yield( rCod )
     else
       # Create a node named '#{xName}' or search for a node, edge or cluster
-      return( @hoNodes[xName] ) if @hoNodes.keys.include?( xName )
+      if @hoNodes.keys.include?( xName )
+        if( args[0] )
+          return "#{xName}:#{args[0].to_s}"
+        else
+          return( @hoNodes[xName] ) 
+        end
+      end
       return( @hoGraphs[xName] ) if @hoGraphs.keys.include?( xName )
       
       rCod = add_node( xName, args[0] )
@@ -202,7 +239,7 @@ class GraphViz
       if kElement["value"] == nil then
         raise ArgumentError, "#{kElement["name"]} has a nil value!"
       end
-      
+
       case kElement["type"]
         when "graph_attr"
           xData << xSeparator + kElement["name"] + " = \"" + kElement["value"] + "\""
@@ -230,6 +267,18 @@ class GraphViz
       end
     }
     
+    if xData.length > 0 
+      case xLastType
+        when "graph_attr"
+          xDOTScript << "  " + xData + ";\n"
+
+        when "node_attr"
+          xDOTScript << "  node [" + xData + "];\n"
+        
+        when "edge_attr"
+          xDOTScript << "  edge [" + xData + "];\n"
+      end
+    end
     xDOTScript << "}"
 
     if @oParentGraph.nil? == false
@@ -288,6 +337,30 @@ class GraphViz
     end
   end
   
+  alias :save :output
+  
+  # 
+  # Get the graph name
+  #
+  def name 
+    @name.clone
+  end
+  
+  # 
+  # Create an edge between the current cluster and the node or cluster +oNode+
+  # 
+  def <<( oNode )
+    raise( ArgumentError, "Edge between root graph and node or cluster not allowed!" ) if self.pg.nil?
+
+    if( oNode.class == Array ) 
+      oNode.each do |no|
+        self << no
+      end
+    else
+      return GraphViz::commonGraph( oNode, self ).add_edge( self, oNode )
+    end
+  end
+  
   def pg #:nodoc:
     @oParentGraph
   end
@@ -312,6 +385,30 @@ class GraphViz
     } )
   end
   
+## ----------------------------------------------------------------------------
+
+  #
+  # Change default options (:use, :path and :output)
+  # 
+  def self.default( hOpts )
+    hOpts.each do |k, v|
+      case k.to_s
+        when "use"
+          @@prog = v
+        when "path"
+          @@path = v
+        when "output"
+          @@format = v
+        else
+          warn "Invalide option #{k}!"
+      end
+    end
+  end
+  
+  def self.options( hOpts )
+    GraphViz::default( hOpts )
+  end
+  
 ## ----------------------------------------------------------------------------
 
   private 
@@ -324,7 +421,7 @@ class GraphViz
   ## Var: Parent graph
   @oParentGraph
 
-  ## Var: Type de graphe (orient� ou non)
+  ## Var: Type de graphe (orienté ou non)
   @oGraphType
   
   # 
@@ -339,11 +436,11 @@ class GraphViz
   #   :type : Graph type (Constants::GRAPHTYPE) (default : digraph)
   # 
   def initialize( xGraphName, *hOpt, &block )
-    @format   = "dot"
     @filename = nil
-    @prog     = "dot"
-    @path     = nil
     @name     = xGraphName
+    @format   = @@format
+    @prog     = @@prog
+    @path     = @@path
     
     @elements_order = Array::new()
 

data/lib/graphviz/constants.rb

@@ -15,34 +15,53 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
 module Constants
-  RGV_VERSION = "0.8.3"
+  RGV_VERSION = "0.9.0"
   
   ## Const: Output formats
   FORMATS = [
+    "bmp",
+    "canon",
     "dot", 
-    "ps", 
-    "mif", 
+    "xdot",
+    "cmap", 
+    "dia",
+    "eps",
+    "fig",
+    "gd",
+    "gd2",
+    "gif",
+    "gtk",
     "hpgl", 
-    "pcl", 
-    "gif", 
+    "ico",
     "imap", 
+    "cmapx",
+    "imap_np", 
+    "cmapx_np",
     "ismap", 
-    "cmap", 
     "jpeg", 
-    "png", 
-    "xpm", 
+    "jpg", 
+    "jpe", 
+    "mif", 
+    "mp",
+    "pcl", 
+    "pdf",
     "pic", 
-    "gd", 
-    "gd2", 
-    "wbmp", 
+    "plain", 
+    "plain-ext",
+    "png", 
+    "ps", 
+    "ps2",
+    "svg", 
+    "svgz",
+    "tga",
+    "tiff",
+    "tif",
+    "vml",
+    "vmlz",
     "vrml", 
     "vtx", 
-    "mp", 
-    "fig", 
-    "svg", 
-    "plain", 
-    "text", 
-    "canon",
+    "wbmp", 
+    "xlib", 
     "none"
   ]
 

data/lib/graphviz/edge.rb

@@ -64,7 +64,30 @@ class GraphViz
     def []( xAttrName )
       @oAttrEdge[xAttrName.to_s].clone
     end
-
+    
+    #
+    # Set edge attributs
+    #
+    # Example :
+    #   e = graph.add_edge( ... )
+    #   ...
+    #   e.set { |_e|
+    #     _e.color = "blue"
+    #     _e.fontcolor = "red"
+    #   }
+    # 
+    def set( &b )
+      yield( self )
+    end
+    
+    # Add edge options
+    # use edge.<option>=<value> or edge.<option>( <value> )
+    def method_missing( idName, *args, &block ) #:nodoc:
+      xName = idName.id2name
+      
+      self[xName.gsub( /=$/, "" )]=args[0]
+    end
+    
 	  def output( oGraphType ) #:nodoc:
 	    xLink = " -> "
 	    if oGraphType == "graph"

data/lib/graphviz/node.rb

@@ -62,7 +62,36 @@ class GraphViz
     # Create an edge between the current node and the node +oNode+
     # 
     def <<( oNode )
-      return GraphViz::commonGraph( oNode, self ).add_edge( self, oNode )
+      if( oNode.class == Array ) 
+        oNode.each do |no|
+          self << no
+        end
+      else
+        return GraphViz::commonGraph( oNode, self ).add_edge( self, oNode )
+      end
+    end
+    
+    #
+    # Set node attributs
+    #
+    # Example :
+    #   n = graph.add_node( ... )
+    #   ...
+    #   n.set { |_n|
+    #     _n.color = "blue"
+    #     _n.fontcolor = "red"
+    #   }
+    # 
+    def set( &b )
+      yield( self )
+    end
+    
+    # Add node options
+    # use node.<option>=<value> or node.<option>( <value> )
+    def method_missing( idName, *args, &block ) #:nodoc:
+      xName = idName.id2name
+      
+      self[xName.gsub( /=$/, "" )]=args[0]
     end
     
     def pg #:nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-graphviz
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-16 00:00:00 +02:00
+date: 2008-06-12 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -35,11 +35,6 @@ files:
 - examples/HTML-Labels.rb
 - examples/maketest.sh
 - examples/p2p.rb
-- examples/s10.png
-- examples/s12.png
-- examples/s13.png
-- examples/s14.png
-- examples/sample-dsl-10.rb
 - examples/sample01.rb
 - examples/sample02.rb
 - examples/sample03.rb
@@ -53,6 +48,12 @@ files:
 - examples/sample12.rb
 - examples/sample13.rb
 - examples/sample14.rb
+- examples/sample15.rb
+- examples/sample16.rb
+- examples/sample17.rb
+- examples/sample18.rb
+- examples/sample19.rb
+- examples/sample20.rb
 - examples/shapes.rb
 - examples/test.xml
 - examples/testorder.rb

data/examples/sample-dsl-10.rb

@@ -1,33 +0,0 @@
-$:.unshift( "../lib" );
-require "graphviz"
-
-g = GraphViz::new( :path => ARGV[0] )
-
-g.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
-}