ruby-graphviz 0.8.1 → 0.8.3

data/ChangeLog

@@ -1,3 +1,7 @@
+0.8.2 : 
+* Update Node, Edge and Graph Attributes (see http://www.graphviz.org/doc/info/attrs.html)
+* Bugs corrections
+
 0.8.1 :
 * Documentation
 

data/README

@@ -1,46 +1,13 @@
-Ruby/GraphViz v0.6.0 
+Ruby/GraphViz 
 
-Copyright (C) 2004 Gregoire Lejeune
+Copyright (C) 2004, 2005, 2006, 2007, 2008 Gregoire Lejeune
 
-Ruby/Asp is freely distributable according to the terms of the
+Ruby/GraphViz is freely distributable according to the terms of the
 GNU General Public License (see the file 'COPYING').
 
 This program is distributed without any warranty. See the file
 'COPYING' for details.
 
----
-
-Ruby-GraphViz - Interface to the GraphViz graphing tool
-
-This modules provides an interface to layout and generate images of 
-directed graphs in a variety of formats (PostScript, PNG, etc.) using 
-GraphViz.
-
-This module require GraphViz version 1.10 (or higher)
-
-+-----------------------------------------------------+
-| CAUTION: You must uninstall Ruby/Graphviz 0.1.0 !!! |
-+-----------------------------------------------------+
-
----
-
-ChangeLog :
-
-0.6.0 : 
-  * Add undirected graph support
-  
-0.5.0 : 
-  * Preserve the original order of creation of nodes and edges
-
-0.4.0 : 
-  * Add HTML-Labels
-
-0.3.0 :
-  * Bugs corrections
-
-0.2.0 :
-  * Pure ruby
-  
-0.1.0 :
-  * Initial version
+= Examples 
 
+see http://ruby-asp.rubyforge.org/svn/trunk/ruby-graphviz/examples/

data/bin/{ruby2gv.rb → ruby2gv}

@@ -1,4 +1,4 @@
-#! /opt/rosx/bin/ruby
+#!/usr/bin/env ruby
 # Copyright (C) 2005, 2006, 2007 Gregoire Lejeune <gregoire.lejeune@free.fr>
 # 
 # This program is free software; you can redistribute it and/or modify
@@ -17,10 +17,10 @@
 
 require 'getoptlong'
 require 'graphviz'
+require "graphviz/constants"
 require 'rbconfig'
 
 DEBUG = false
-RGV_VERSION = "0.7.0"
 
 class Rb2Gv
   REQUIRE = /^\s*require\s*("|')([^\1]*)(\1)/
@@ -131,7 +131,7 @@ def usage
 end
 
 def version
-  puts "Ruby2GraphViz v#{RGV_VERSION}, (c)2005 Gregoire Lejeune <gregoire.lejeune@free.fr>"
+  puts "Ruby2GraphViz v#{Constants::RGV_VERSION}, (c)2005 Gregoire Lejeune <gregoire.lejeune@free.fr>"
   puts ""
   puts "This program is free software; you can redistribute it and/or modify"
   puts "it under the terms of the GNU General Public License as published by"

data/examples/sample-dsl-10.rb

@@ -0,0 +1,33 @@
+$:.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
+}

data/examples/sample10.rb

@@ -5,9 +5,9 @@ require "graphviz"
 
 g = nil
 if ARGV[0]
-  g = GraphViz::new( "G", "output" => "png", "type" => "graph", "path" => ARGV[0] )
+  g = GraphViz::new( "G", "output" => "png", "path" => ARGV[0] )
 else
-  g = GraphViz::new( "G", "output" => "png", "type" => "graph" )
+  g = GraphViz::new( "G", "output" => "png" )
 end
 
 g.node["shape"] = "ellipse"

data/examples/sample12.rb

@@ -42,23 +42,14 @@ g.cluster1( :label => "process #2" ) do |cluster|
 end
 
 g.start :shape => "Mdiamond"
-g.endn :shape => "Msquare"
+g.endn :shape => "Msquare", :label => "end"
 
-## THIS DON'T WORK !!!
-#g.start << g.cluster0.a0
-#g.start << g.cluster1.b0
-#g.cluster0.a1 << g.cluster1.b3
-#g.cluster1.b2 << g.cluster0.a3
-#g.cluster0.a3 << g.cluster0.a0
-#g.cluster0.a3 << g.endn
-#g.cluster1.b3 << g.endn
+g.start << g.cluster0.a0
+g.start << g.cluster1.b0
+g.cluster0.a1 << g.cluster1.b3
+g.cluster1.b2 << g.cluster0.a3
+g.cluster0.a3 << g.cluster0.a0
+g.cluster0.a3 << g.endn
+g.cluster1.b3 << g.endn
 
-g.add_edge( g.start, g.cluster0.a0 )
-g.add_edge( g.start, g.cluster1.b0 )
-g.add_edge( g.cluster0.a1, g.cluster1.b3 )
-g.add_edge( g.cluster1.b2, g.cluster0.a3 )
-g.add_edge( g.cluster0.a3, g.cluster0.a0 )
-g.add_edge( g.cluster0.a3, g.endn )
-g.add_edge( g.cluster1.b3, g.endn )
-
-g.output
+g.output( :path => '/usr/local/graphviz-2.14/bin/' )

data/examples/sample13.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../lib" );
+require "graphviz"
+
+GraphViz::new( "G", "output" => "png" ) { |graph|
+  graph.node[:shape] = "ellipse"
+  graph.node[:color] = "black"
+  
+  graph[:color] = "black"
+  
+  graph.cluster0( ) do |cluster|
+    cluster[:label] = "process #1"
+    cluster[:style] = "filled"
+    cluster[:color] = "lightgrey"
+    
+    cluster.a0 :style => "filled", :color => "white"
+    cluster.a1 :style => "filled", :color => "white"
+    cluster.a2 :style => "filled", :color => "white"
+    cluster.a3 :style => "filled", :color => "white"
+    
+    cluster.a0 << cluster.a1
+    cluster.a1 << cluster.a2
+    cluster.a2 << cluster.a3
+  end
+  
+  graph.cluster1( :label => "process #2" ) do |cluster|
+    cluster.b0 :style => "filled", :color => "blue"
+    cluster.b1 :style => "filled", :color => "blue"
+    cluster.b2 :style => "filled", :color => "blue"
+    cluster.b3 :style => "filled", :color => "blue"
+    
+    cluster.b0 << cluster.b1
+    cluster.b1 << cluster.b2
+    cluster.b2 << cluster.b3
+  end
+  
+  graph.start :shape => "Mdiamond"
+  graph.endn :shape => "Msquare", :label => "end"
+  
+  graph.start << graph.cluster0.a0
+  graph.start << graph.cluster1.b0
+  graph.cluster0.a1 << graph.cluster1.b3
+  graph.cluster1.b2 << graph.cluster0.a3
+  graph.cluster0.a3 << graph.cluster0.a0
+  graph.cluster0.a3 << graph.endn
+  graph.cluster1.b3 << graph.endn
+}.output( :path => '/usr/local/graphviz-2.14/bin/' )

data/examples/sample14.rb

@@ -0,0 +1,44 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../lib" );
+require "graphviz"
+
+GraphViz::new( "G", "output" => "png" ) { |graph|
+  graph.node[:shape] = "ellipse"
+  graph.node[:color] = "black"
+  
+  graph[:color] = "black"
+  
+  graph.cluster0( ) do |cluster|
+    cluster[:label] = "process #1"
+    cluster[:style] = "filled"
+    cluster[:color] = "lightgrey"
+    
+    cluster.node[:style] = "filled"
+    cluster.node[:color] = "white"
+    
+    cluster.a0 << cluster.a1
+    cluster.a1 << cluster.a2
+    cluster.a2 << cluster.a3
+  end
+  
+  graph.cluster1( :label => "process #2", :color => "blue" ) do |cluster|
+    cluster.node[:style] = "filled"
+    cluster.node[:color] = "lightgrey"
+    
+    cluster.b0 << cluster.b1
+    cluster.b1 << cluster.b2
+    cluster.b2 << cluster.b3
+  end
+  
+  graph.start :shape => "Mdiamond"
+  graph.endn :shape => "Msquare", :label => "end"
+  
+  graph.start << graph.cluster0.a0
+  graph.start << graph.cluster1.b0
+  graph.cluster0.a1 << graph.cluster1.b3
+  graph.cluster1.b2 << graph.cluster0.a3
+  graph.cluster0.a3 << graph.cluster0.a0
+  graph.cluster0.a3 << graph.endn
+  graph.cluster1.b3 << graph.endn
+}.output( :path => '/usr/local/graphviz-2.14/bin/' )

data/lib/graphviz.rb

@@ -125,7 +125,7 @@ class GraphViz
     return( @hoGraphs[xGraphName] )
   end
 
-  def method_missing( idName, *args, &block )
+  def method_missing( idName, *args, &block ) #:nodoc:
     xName = idName.id2name
   
     rCod = nil
@@ -288,6 +288,22 @@ class GraphViz
     end
   end
   
+  def pg #:nodoc:
+    @oParentGraph
+  end
+  
+  def self.commonGraph( o1, o2 ) #:nodoc:
+    g1 = o1.pg
+    g2 = o2.pg
+
+    return o1 if g1.nil?
+    return o2 if g2.nil?
+    
+    return g1 if g1.object_id == g2.object_id
+    
+    return GraphViz::commonGraph( g1, g2 )
+  end
+  
   def set_position( xType, xKey, xValue ) #:nodoc:
     @elements_order.push( { 
       "type" => "#{xType}_attr", 
@@ -312,17 +328,17 @@ class GraphViz
   @oGraphType
   
   # 
-  # Create a new Graphviz object
+  # Create a new graph object
   # 
   # Options :
-  #   :output : Output format (Constants::FORMATS)
-  #   :file : Output file name
-  #   :use : Program to use (Constants::PROGRAMS)
+  #   :output : Output format (Constants::FORMATS) (default : dot)
+  #   :file : Output file name (default : none)
+  #   :use : Program to use (Constants::PROGRAMS) (default : dot)
   #   :path : Program PATH
-  #   :parent : Parent graph
-  #   :type : Graph type (Constants::GRAPHTYPE)
+  #   :parent : Parent graph (default : none)
+  #   :type : Graph type (Constants::GRAPHTYPE) (default : digraph)
   # 
-  def initialize( xGraphName, *hOpt )
+  def initialize( xGraphName, *hOpt, &block )
     @format   = "dot"
     @filename = nil
     @prog     = "dot"
@@ -371,6 +387,8 @@ class GraphViz
         end
       end
     end
+  
+    yield( self ) if( block )
   end
   
   def find_executable( ) #:nodoc:

data/lib/graphviz/constants.rb

@@ -15,7 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
 module Constants
-  RGV_VERSION = "0.8.1"
+  RGV_VERSION = "0.8.3"
   
   ## Const: Output formats
   FORMATS = [
@@ -55,337 +55,173 @@ module Constants
     "circo"
   ]
 
-  ## Const: type de graphs
+  ## Const: graphs type
   GRAPHTYPE = [
     "digraph",
 	  "graph"
   ]
 
+  def self.getAttrsFor( x )
+    r = []
+    GENCS_ATTRS.each { |k,v|
+      r << k if /#{x}/.match( x.to_s ) and not r.include?( k )
+    }
+    r
+  end
+  
   # E, N, G, S and C represent edges, nodes, the root graph, subgraphs and cluster subgraphs, respectively
   GENCS_ATTRS = {
-    "Damping"         => { "UseBy" => "G",    "Type" => "double" },
-    "K"               => { "UseBy" => "GC",   "Tyep" => "double" },
-    "URL"             => { "UseBy" => "ENGC", "Type" => "escString, string" },
-    "arrowhead"       => { "UseBy" => "E",    "Type" => "arrowType" },
-    "arrowsize"       => { "UseBy" => "E",    "Type" => "double" },
-    "arrowtail"       => { "UseBy" => "E",    "Type" => "arrowType" },
-    "bb"              => { "UseBy" => "G",    "Type" => "rect" },
-    "bgcolor"         => { "UseBy" => "GC",   "Type" => "color" },
-    "bottomlabel"     => { "UseBy" => "N",    "Type" => "string" },
-    "center"          => { "UseBy" => "G",    "Type" => "bool" },
-    "charset"         => { "UseBy" => "G",    "Type" => "string" },
-    "clusterrank"     => { "UseBy" => "G",    "Type" => "clusterMode" },
-    "color"           => { "UseBy" => "ENC",  "Type" => "color, colorList" },
-    "colorscheme"     => { "UseBy" => "ENCG", "Type" => "string" },
-    "comment"         => { "UseBy" => "ENG",  "Type" => "string" },             
-    "compound"        => { "UseBy" => "G",    "Type" => "bool" },
-    "concentrate"     => { "UseBy" => "G",    "Type" => "bool" },
-    "constraint"      => { "UseBy" => "E",    "Type" => "bool" },
-    "decorate"        => { "UseBy" => "E",    "Type" => "bool" },
-    "defaultdist"     => { "UseBy" => "G",    "Type" => "double" },
-    "dim"             => { "UseBy" => "G",    "Type" => "int" },
-    "dir"             => { "UseBy" => "E",    "Type" => "dirType" },
-  "diredgeconstraints"=> { "UseBy" => "N",    "Type" => "double" },
-    "distortion"      => { "UseBy" => "N",    "Type" => "double" },
-    "dpi"             => { "UseBy" => "G",    "Type" => "double" },
-    "edgeURL"         => { "UseBy" => "E",    "Type" => "lblString" },
-    "edgehref"        => { "UseBy" => "E",    "Type" => "lblString" },
-    "edgetarget"      => { "UseBy" => "E",    "Type" => "escString" },
-    "edgetooltip"     => { "UseBy" => "E",    "Type" => "escString" },
-    "epsilon"         => { "UseBy" => "G",    "Type" => "double" },
-    "esep"            => { "UseBy" => "G",    "Type" => "double" },
-    "fillcolor"       => { "UseBy" => "NC",   "Type" => "color" },
-    "fixedsize"       => { "UseBy" => "N",    "Type" => "bool" },
-    "fontcolor"       => { "UseBy" => "ENGC", "Type" => "color" },
-    "fontname"        => { "UseBy" => "ENGC", "Type" => "string" },
-    "fontpath"        => { "UseBy" => "G",    "Type" => "string" },
-    "fontsize"        => { "UseBy" => "ENGC", "Type" => "double" },
-    "group"           => { "UseBy" => "N",    "Type" => "string" },
-    "headURL"         => { "UseBy" => "E",    "Type" => "escString" },
-    "headclip"        => { "UseBy" => "E",    "Type" => "bool" },
-    "headhref"        => { "UseBy" => "E",    "Type" => "escString" },
-    "headlabel"       => { "UseBy" => "E",    "Type" => "lblString" },
-    "headport"        => { "UseBy" => "E",    "Type" => "portPos" },
-    "headtarget"      => { "UseBy" => "E",    "Type" => "escString" },
-    "headtooltip"     => { "UseBy" => "E",    "Type" => "escString" },
-    "height"          => { "UseBy" => "N",    "Type" => "double" },
-    "href"            => { "UseBy" => "E",    "Type" => "lblString" },
-    "html"            => { "UseBy" => "N",    "Type" => "lblString" }, # API extension
-    "labelURL"        => { "UseBy" => "E",    "Type" => "double" },
-    "labelangle"      => { "UseBy" => "E",    "Type" => "double" },
-    "labeldistance"   => { "UseBy" => "E",    "Type" => "double" },
-    "labelfloat"      => { "UseBy" => "E",    "Type" => "bool" },
-    "labelfontcolor"  => { "UseBy" => "E",    "Type" => "color" },
-    "labelfontname"   => { "UseBy" => "E",    "Type" => "string" },
-    "labelfontsize"   => { "UseBy" => "E",    "Type" => "double" },
-    "labelhref"       => { "UseBy" => "E",    "Type" => "double" },
-    "labeljust"       => { "UseBy" => "GC",   "Type" => "string" },
-    "labelloc"        => { "UseBy" => "GC",   "Type" => "string" },
-    "labeltarget"     => { "UseBy" => "E",    "Type" => "escString" },
-    "labeltooltip"    => { "UseBy" => "E",    "Type" => "escString" },
-    "landscape"       => { "UseBy" => "G",    "Type" => "bool" },
-    "layer"           => { "UseBy" => "EN",   "Type" => "layerRange" },
-    "layers"          => { "UseBy" => "G",    "Type" => "layerList" },
-    "layersep"        => { "UseBy" => "G",    "Type" => "string" },
-    "len"             => { "UseBy" => "E",    "Type" => "double" },
-    "levelsgap"       => { "UseBy" => "G",    "Type" => "double" },
-    "lhead"           => { "UseBy" => "E",    "Type" => "string" },
-    "lp"              => { "UseBy" => "EGC",  "Type" => "point" },
-    "ltail"           => { "UseBy" => "E",    "Type" => "string" },
-    "margin"          => { "UseBy" => "NG",   "Type" => "double, pointf" },
-    "maxiter"         => { "UseBy" => "G",    "Type" => "int" },
-    "mclimit"         => { "UseBy" => "G",    "Type" => "double" },
-    "mindist"         => { "UseBy" => "G",    "Type" => "double" },
-    "minlen"          => { "UseBy" => "E",    "Type" => "int" },
-    "mode"            => { "UseBy" => "G",    "Type" => "string" },
-    "model"           => { "UseBy" => "G",    "Type" => "string" },
-    "mosek"           => { "UseBy" => "G",    "Type" => "bool" },
-    "nodesep"         => { "UseBy" => "G",    "Type" => "double" },
-    "nojustify"       => { "UseBy" => "GCNE", "Type" => "bool" },
-    "normalize"       => { "UseBy" => "G",    "Type" => "bool" },
-    "nslimit"         => { "UseBy" => "G",    "Type" => "double" },
-    "nslimit1"        => { "UseBy" => "G",    "Type" => "double" },
-    "ordering"        => { "UseBy" => "G",    "Type" => "string" },
-    "orientation"     => { "UseBy" => "N",    "Type" => "double" },
-    "orientation"     => { "UseBy" => "G",    "Type" => "string" },
-    "outputorder"     => { "UseBy" => "G",    "Type" => "outputMode" },
-    "overlap"         => { "UseBy" => "G",    "Type" => "string, bool" },
-    "pack"            => { "UseBy" => "G",    "Type" => "bool, int" },
-    "packmode"        => { "UseBy" => "G",    "Type" => "packMode" },
-    "pad"             => { "UseBy" => "G",    "Type" => "double, pointf" },
-    "page"            => { "UseBy" => "G",    "Type" => "pointf" },
-    "pagedir"         => { "UseBy" => "G",    "Type" => "pagedir" },
-    "pencolor"        => { "UseBy" => "C",    "Type" => "color" },
-    "peripheries"     => { "UseBy" => "NC",   "Type" => "int" },
-    "pin"             => { "UseBy" => "N",    "Type" => "bool" },
-    "pos"             => { "UseBy" => "EN",   "Type" => "point, splineType" },
-    "quantum"         => { "UseBy" => "G",    "Type" => "double" },
-    "rank"            => { "UseBy" => "S",    "Type" => "rankType" },
-    "rankdir"         => { "UseBy" => "G",    "Type" => "rankdir" },
-    "ranksep"         => { "UseBy" => "G",    "Type" => "double" },
-    "ratio"           => { "UseBy" => "G",    "Type" => "double, string" },
-    "rects"           => { "UseBy" => "N",    "Type" => "rect" },
-    "regular"         => { "UseBy" => "N",    "Type" => "bool" },
-    "remincross"      => { "UseBy" => "G",    "Type" => "bool" },
-    "resolution"      => { "UseBy" => "G",    "Type" => "double" },
-    "root"            => { "UseBy" => "GN",   "Type" => "string, bool" },
-    "rotate"          => { "UseBy" => "G",    "Type" => "int" },
-    "samehead"        => { "UseBy" => "E",    "Type" => "string" },
-    "sametail"        => { "UseBy" => "E",    "Type" => "string" },
-    "samplepoints"    => { "UseBy" => "G",    "Type" => "int" },
-    "searchsize"      => { "UseBy" => "G",    "Type" => "int" },
-    "sep"             => { "UseBy" => "G",    "Type" => "double, pointf" },
-    "shape"           => { "UseBy" => "N",    "Type" => "shape" },
-    "shapefile"       => { "UseBy" => "N",    "Type" => "string" },
-    "showboxes"       => { "UseBy" => "ENG",  "Type" => "int" },
-    "sides"           => { "UseBy" => "N",    "Type" => "int" },
-    "size"            => { "UseBy" => "G",    "Type" => "pointf" },
-    "skew"            => { "UseBy" => "N",    "Type" => "double" },
-    "splines"         => { "UseBy" => "G",    "Type" => "bool, string" },
-    "start"           => { "UseBy" => "G",    "Type" => "startType" },
-    "style"           => { "UseBy" => "ENC",  "Type" => "style" },
-    "stylesheet"      => { "UseBy" => "G",    "Type" => "string" },
-    "tailURL"         => { "UseBy" => "E",    "Type" => "escString" },
-    "tailclip"        => { "UseBy" => "E",    "Type" => "bool" },
-    "tailhref"        => { "UseBy" => "E",    "Type" => "escString" },
-    "taillabel"       => { "UseBy" => "E",    "Type" => "lblString" },
-    "tailport"        => { "UseBy" => "E",    "Type" => "portPos" },
-    "tailtarget"      => { "UseBy" => "E",    "Type" => "escString" },
-    "tailtooltip"     => { "UseBy" => "E",    "Type" => "escString" },
-    "target"          => { "UseBy" => "ENGC", "Type" => "escString, string" },
-    "tooltip"         => { "UseBy" => "NE",   "Type" => "escString" },
-    "toplabel"        => { "UseBy" => "N",    "Type" => "string" },
-    "truecolor"       => { "UseBy" => "G",    "Type" => "bool" },
-    "vertices"        => { "UseBy" => "N",    "Type" => "pointfList" },
-    "viewport"        => { "UseBy" => "G",    "Type" => "viewPort" },
-    "voro_margin"     => { "UseBy" => "G",    "Type" => "double" },
-    "weight"          => { "UseBy" => "E",    "Type" => "double" },
-    "width"           => { "UseBy" => "N",    "Type" => "double" },
-    "z"               => { "UseBy" => "N",    "Type" => "double" } 
+    "Damping"             => "G",
+    "K"                   => "GC",
+    "URL"                 => "ENGC",
+    "arrowhead"           => "E",
+    "arrowsize"           => "E",
+    "arrowtail"           => "E",
+    "bb"                  => "G",
+    "bgcolor"             => "GC",
+#    "bottomlabel"         => "N",
+    "center"              => "G",
+    "charset"             => "G",
+    "clusterrank"         => "G",
+    "color"               => "ENC",
+    "colorscheme"         => "ENCG",
+    "comment"             => "ENG",
+    "compound"            => "G",
+    "concentrate"         => "G",
+    "constraint"          => "E",
+    "decorate"            => "E",
+    "defaultdist"         => "G",
+    "dim"                 => "G",
+    "dir"                 => "E",
+    "diredgeconstraints"  => "G",
+    "distortion"          => "N",
+    "dpi"                 => "G",
+    "edgeURL"             => "E",
+    "edgehref"            => "E",
+    "edgetarget"          => "E",
+    "edgetooltip"         => "E",
+    "epsilon"             => "G",
+    "esep"                => "G",
+    "fillcolor"           => "NC",
+    "fixedsize"           => "N",
+    "fontcolor"           => "ENGC",
+    "fontname"            => "ENGC",
+    "fontnames"           => "G",
+    "fontpath"            => "G",
+    "fontsize"            => "ENGC",
+    "group"               => "N",
+    "headURL"             => "E",
+    "headclip"            => "E",
+    "headhref"            => "E",
+    "headlabel"           => "E",
+    "headport"            => "E",
+    "headtarget"          => "E",
+    "headtooltip"         => "E",
+    "height"              => "N",
+    "href"                => "E",
+    "html"                => "N", # API extension
+    "image"               => "N",
+    "imagescale"          => "N",
+    "label"               => "ENGC",
+    "labelURL"            => "E",
+    "labelangle"          => "E",
+    "labeldistance"       => "E",
+    "labelfloat"          => "E",
+    "labelfontcolor"      => "E",
+    "labelfontname"       => "E",
+    "labelfontsize"       => "E",
+    "labelhref"           => "E",
+    "labeljust"           => "GC",
+    "labelloc"            => "GCN",
+    "labeltarget"         => "E",
+    "labeltooltip"        => "E",
+    "landscape"           => "G",
+    "layer"               => "EN",
+    "layers"              => "G",
+    "layersep"            => "G",
+    "len"                 => "E",
+    "levelsgap"           => "G",
+    "lhead"               => "E",
+    "lp"                  => "EGC",
+    "ltail"               => "E",
+    "margin"              => "NG",
+    "maxiter"             => "G",
+    "mclimit"             => "G",
+    "mindist"             => "G",
+    "minlen"              => "E",
+    "mode"                => "G",
+    "model"               => "G",
+    "mosek"               => "G",
+    "nodesep"             => "G",
+    "nojustify"           => "GCNE",
+    "normalize"           => "G",
+    "nslimit"             => "G",
+    "nslimit1"            => "G",
+    "ordering"            => "G",
+    "orientation"         => "NG",
+    "outputorder"         => "G",
+    "overlap"             => "G",
+    "pack"                => "G",
+    "packmode"            => "G",
+    "pad"                 => "G",
+    "page"                => "G",
+    "pagedir"             => "G",
+    "pencolor"            => "C",
+    "penwidth"            => "CNE",
+    "peripheries"         => "NC",
+    "pin"                 => "N",
+    "pos"                 => "EN",
+    "quantum"             => "G",
+    "rank"                => "S",
+    "rankdir"             => "G",
+    "ranksep"             => "G",
+    "ratio"               => "G",
+    "rects"               => "N",
+    "regular"             => "N",
+    "remincross"          => "G",
+    "resolution"          => "G",
+    "root"                => "GN",
+    "rotate"              => "G",
+    "samehead"            => "E",
+    "sametail"            => "E",
+    "samplepoints"        => "G",
+    "searchsize"          => "G",
+    "sep"                 => "G",
+    "shape"               => "N",
+    "shapefile"           => "N",
+    "showboxes"           => "ENG",
+    "sides"               => "N",
+    "size"                => "G",
+    "skew"                => "N",
+    "splines"             => "G",
+    "start"               => "G",
+    "style"               => "ENC",
+    "stylesheet"          => "G",
+    "tailURL"             => "E",
+    "tailclip"            => "E",
+    "tailhref"            => "E",
+    "taillabel"           => "E",
+    "tailport"            => "E",
+    "tailtarget"          => "E",
+    "tailtooltip"         => "E",
+    "target"              => "ENGC",
+    "tooltip"             => "NEC",
+#    "toplabel"            => "N",
+    "truecolor"           => "G",
+    "vertices"            => "N",
+    "viewport"            => "G",
+    "voro_margin"         => "G",
+    "weight"              => "E",
+    "width"               => "N",
+    "z"                   => "N"
   }
 
   ## Const: Graph attributs
-  GRAPHSATTRS = [
-    "Damping",
-    "K",
-    "URL",
-    "bb",
-    "bgcolor",
-    "center",
-    "charset",
-    "clusterrank",
-    "color",
-    "colorscheme",
-    "comment",
-    "compound",
-    "concentrate",
-    "defaultdist",
-    "dim",
-    "diredgeconstraints",
-    "dpi",
-    "epsilon",
-    "esep",
-    "fillcolor",
-    "fontcolor",
-    "fontname",
-    "fontnames",
-    "fontpath",
-    "fontsize",
-    "label",
-    "labeljust",
-    "labelloc",
-    "landscape",
-    "layer",
-    "layers",
-    "layersep",
-    "lp",
-    "margin",
-    "maxiter",
-    "mclimit",
-    "mindist",
-    "mode",
-    "model",
-    "mosek",
-    "nodesep",
-    "nojustify",
-    "normalize",
-    "nslimit",
-    "nslimit1",
-    "ordering",
-    "orientation",
-    "outputorder",
-    "overlap",
-    "pack",
-    "packmode",
-    "pad",
-    "page",
-    "pagedir",
-    "pencolor",
-    "peripheries",
-    "quantum",
-    "rank",
-    "rankdir",
-    "ranksep",
-    "ratio",
-    "remincross",
-    "resolution",
-    "root",
-    "rotate",
-    "samplepoints",
-    "searchsize",
-    "sep",
-    "showboxes",
-    "size",
-    "splines",
-    "start",
-    "style",
-    "stylesheet",
-    "target",
-    "tooltip",
-    "truecolor",
-    "viewport",
-    "voro_margin"
-  ]
+  GRAPHSATTRS = Constants::getAttrsFor( :G ) + Constants::getAttrsFor( :S ) + Constants::getAttrsFor( :C )
 
   ## Const: Node attributs
-  NODESATTRS = [
-    "URL",
-    "bottomlabel",
-    "color",
-    "colorscheme",
-    "comment",
-    "distortion",
-    "fillcolor",
-    "fixedsize",
-    "fontcolor",
-    "fontname",
-    "fontsize",
-    "group",
-    "height",
-    "label", "html", 
-    "layer",
-    "margin",
-    "nojustify",
-    "orientation",
-    "peripheries",
-    "pin",
-    "pos",
-    "rects",
-    "regular",
-    "root",
-    "samplepoints",
-    "shape",
-    "shapefile",
-    "sides",
-    "skew",
-    "style",
-    "target",
-    "tooltip",
-    #"toplabel", 
-    #does not appear to be an option according to attributes info
-    "vertices",
-    "width",
-    "z"
-  ]
+  NODESATTRS = Constants::getAttrsFor( :N )
 
   ## Const: Edge attributs
-  EDGESATTRS = [
-    "arrowhead",
-    "arrowsize",
-    "arrowtail",
-    "color",
-    "colorscheme",
-    "comment",
-    "constraint",
-    "decorate",
-    "dir",
-    "edgeURL",
-    "edgehref",
-    "edgetarget",
-    "edgetooltip",
-    "fontcolor",
-    "fontname",
-    "fontsize",
-    "headURL",
-    "headclip",
-    "headhref",
-    "headlabel",
-    "headport",
-    "headtarget",
-    "headtooltip",
-    "href",
-    "label",
-    "labelURL",
-    "labelangle",
-    "labeldistance",
-    "labelfloat",
-    "labelfontcolor",
-    "labelfontname",
-    "labelfontsize",
-    "labelhref",
-    "labeltarget",
-    "labeltooltip",
-    "layer",
-    "len",
-    "lhead",
-    "lp",
-    "ltail",
-    "minlen",
-    "nojustify",
-    "pos",
-    "samehead",
-    "sametail",
-    "showboxes",
-    "style",
-    "tailURL",
-    "tailclip",
-    "tailhref",
-    "taillabel",
-    "tailport",
-    "tailtarget",
-    "tailtooltip",
-    "target",
-    "tooltip",
-    "weight"
-  ]
+  EDGESATTRS = Constants::getAttrsFor( :E )
 end

data/lib/graphviz/node.rb

@@ -62,7 +62,11 @@ class GraphViz
     # Create an edge between the current node and the node +oNode+
     # 
     def <<( oNode )
-      return @oGParrent.add_edge( self, oNode )
+      return GraphViz::commonGraph( oNode, self ).add_edge( self, oNode )
+    end
+    
+    def pg #:nodoc:
+      @oGParrent
     end
     
     def output #:nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-graphviz
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.3
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -9,14 +9,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-06 00:00:00 +02:00
+date: 2008-05-16 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
 description: Ruby/Graphviz provides an interface to layout and generate images of directed graphs in a variety of formats (PostScript, PNG, etc.) using GraphViz.
 email: gregoire.lejeune@free.fr
-executables: []
-
+executables: 
+- ruby2gv
 extensions: []
 
 extra_rdoc_files: 
@@ -30,11 +30,16 @@ files:
 - README
 - AUTHORS
 - setup.rb
-- bin/ruby2gv.rb
+- bin/ruby2gv
 - examples/arrowhead.rb
 - 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
@@ -46,6 +51,8 @@ files:
 - examples/sample10.rb
 - examples/sample11.rb
 - examples/sample12.rb
+- examples/sample13.rb
+- examples/sample14.rb
 - examples/shapes.rb
 - examples/test.xml
 - examples/testorder.rb
@@ -83,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-asp
-rubygems_version: 1.1.0
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Interface to the GraphViz graphing tool