ruby-graphviz 0.9.19 → 0.9.20

data/AUTHORS

@@ -11,6 +11,7 @@ Stefan Huber <http://github.com/MSNexploder>
 Nigel Thorne <http://github.com/NigelThorne>
 Rolf Timmermans <http://github.com/rolftimmermans>
 Jonas Elfström <http://github.com/jonelf>
+oupo <http://github.com/oupo>
 
 Thanks to :
 

data/README.rdoc

@@ -16,6 +16,12 @@ Interface to the GraphViz graphing tool
 
 == CHANGELOG
 
+=== 0.9.20 :
+* Add GraphViz#each_attribut, Node#each_attribut and Edge#each_attribut
+* Bugs corrections in tests (by oupo)
+* Major bug correction in GraphViz#output for subgraphs
+* Update GraphViz.escape
+
 === 0.9.19 :
 * Add strict digraph support (by Jonas Elfström) (see sample58.rb)
     g = GraphViz.new(:G, :type => "strict digraph")

data/examples/dot/so-sample001.gv

@@ -0,0 +1,30 @@
+digraph G {
+    layout="neato"
+    // scale things down for example
+    size="5,5" 
+    rankdir=TD
+    ranksep=1
+    nodesep=1
+
+    node [shape=box]
+
+    top[pos="5,10!", width=5, height=2]
+
+    left1[pos="3.5,7!", width=2, height=2]
+    left2[pos="3.5,4!", width=2, height=2]
+    
+    right[pos="6.5,5.5!", width=2, height=5]
+
+    bottom[pos="5,1!", width=5, height=2]
+
+
+    top->left1
+    top->right
+
+    left1->left2
+    left1->right
+    left2->right
+
+    left2->bottom
+    right->bottom
+}

data/examples/dot/so-sample002.gv

@@ -0,0 +1,33 @@
+
+//{:category1 => 
+// {:subcategory1 => 
+//  [ 
+//   {:article => "some article", :date => "2010-04-04"},
+//   ...
+//  ],
+//  :subc2 => [...] 
+// },
+// :category2 => {...},
+// ...
+//}
+
+graph G {
+  rankdir=LR
+  category1
+  
+  subgraph clusterC {
+    node[shape="box"]
+    subcategory1
+    subc2
+  
+    subgraph clusterS {
+      article -- "somme article"
+      date -- "2010-04-04"
+    }
+  
+    subcategory1 -- clusterS
+    subc2 -- "..."
+  }
+  
+  category1 -- clusterC
+}

data/examples/dot/so-sample003.gv

@@ -0,0 +1,45 @@
+
+//{:category1 => 
+// {:subcategory1 => 
+//  [ 
+//   {:article => "some article", :date => "2010-04-04"},
+//   ...
+//  ],
+//  :subc2 => [...] 
+// },
+// :category2 => {...},
+// ...
+//}
+
+graph G {
+  layout="fdp"
+
+  category1[label=":category1", shape="box"]
+  
+  subgraph cluster_category1 {
+    subcategory1[label=":subcategory1", shape="box"]
+    subc2[label=":subc2", shape="box"]
+  
+    subgraph cluster_subcategory1 {
+      subgraph cluster_subcategory1_Array0 {
+        article0[label=":article", shape="box"]
+        date0[label=":date", shape="box"]
+      
+        article0 -- "somme article"
+        date0 -- "2010-04-04"
+      }
+      subgraph cluster_subcategory1_Array1 {
+        article1[label=":article", shape="box"]
+        date1[label=":date", shape="box"]
+      
+        article1 -- "an other article"
+        date1 -- "2010-09-09"
+      }
+    }
+  
+    subcategory1 -- cluster_subcategory1
+    subc2 -- "..."
+  }
+  
+  category1 -- cluster_category1  
+}

data/examples/graphml/cluster.graphml

@@ -15,19 +15,19 @@ xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://graphml.graphdr
 				<data key="label">process #1</data>
 				<node id="a0">
 					<data key="style">filled</data>
-					<data key="style">white</data>
+					<data key="color">white</data>
 				</node>
 				<node id="a1">
 					<data key="style">filled</data>
-					<data key="style">white</data>
+					<data key="color">white</data>
 				</node>
 				<node id="a2">
 					<data key="style">filled</data>
-					<data key="style">white</data>
+					<data key="color">white</data>
 				</node>
 				<node id="a3">
 					<data key="style">filled</data>
-					<data key="style">white</data>
+					<data key="color">white</data>
 				</node>
 				<edge id="e0" source="a0" target="a1"/>
 				<edge id="e1" source="a1" target="a2"/>

data/examples/sample35.rb

@@ -40,4 +40,4 @@ GraphViz.digraph( :G ) { |g|
   (c2.mysite << c2.dotgraph)[:color => "blue"]
   (c1.image << c2.dotgraph)[:color => "red"]
   (c2.mysite << g.cluster_0.zeimage)[:color => "red"]
-}.output( :png => "#{$0}.png" )
+}.output( :png => "#{$0}.png", :none => "#{$0}.gv" )

data/examples/sample57.rb

@@ -2,6 +2,7 @@ $:.unshift( "../lib" )
 
 require 'graphviz/graphml'
 
-graphml = File.join( File.dirname( File.expand_path( __FILE__ ) ), "graphml", "cluster.graphml" )
+graphml = File.join( File.dirname( File.expand_path( __FILE__ ) ), "graphml", "port.graphml" )
 g = GraphViz::GraphML.new( graphml )
 g.graph.output( :png => "#{$0}.png" )
+puts g.graph.output( :none => String )

data/lib/graphviz/attrs.rb

@@ -52,7 +52,7 @@ class GraphViz
         @data[xKey.to_s]
       end
     end
-
+    
     def []=( xKey, xValue )
       unless @attributs.keys.include?( xKey.to_s )
         raise ArgumentError, "#{@name} attribut '#{xKey.to_s}' invalid"

data/lib/graphviz/constants.rb

@@ -40,7 +40,7 @@
 #   C => cluster
 #
 module Constants
-  RGV_VERSION = "0.9.19"
+  RGV_VERSION = "0.9.20"
   
   ## Const: Output formats
   FORMATS = [

data/lib/graphviz/edge.rb

@@ -61,7 +61,7 @@ class GraphViz
       if @xNodeOnePort.nil? or with_port == false
 	      GraphViz.escape(@xNodeOne)
       else
-        GraphViz.escape(@xNodeOne, true) + ":#{@xNodeOnePort}"
+        GraphViz.escape(@xNodeOne, :force => true) + ":#{@xNodeOnePort}"
       end
     end
     alias :tail_node :node_one
@@ -71,7 +71,7 @@ class GraphViz
       if @xNodeTwoPort.nil? or with_port == false
 	      GraphViz.escape(@xNodeTwo) 
 	    else 
-	      GraphViz.escape(@xNodeTwo, true) + ":#{@xNodeTwoPort}"
+	      GraphViz.escape(@xNodeTwo, :force => true) + ":#{@xNodeTwoPort}"
       end
     end
     alias :head_node :node_two
@@ -112,6 +112,22 @@ class GraphViz
       end
     end
     
+    #
+    # Calls block once for each attribut of the edge, passing the name and value to the 
+    # block as a two-element array.
+    #
+    # If global is set to false, the block does not receive the attributs set globally
+    #
+    def each_attribut(global = true, &b)
+      attrs = @oAttrEdge.to_h
+      if global
+        attrs = pg.edge.to_h.merge attrs
+      end
+      attrs.each do |k,v|
+        yield(k,v)
+      end
+    end
+    
     def <<( oNode ) #:nodoc:
       n = @oGParrent.get_node(@xNodeTwo)
       

data/lib/graphviz/family_tree.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'rubygems'
 require 'graphviz'
 require 'graphviz/family_tree/generation'

data/lib/graphviz/node.rb

@@ -91,6 +91,22 @@ class GraphViz
       end
     end
 
+    #
+    # Calls block once for each attribut of the node, passing the name and value to the 
+    # block as a two-element array.
+    #
+    # If global is set to false, the block does not receive the attributs set globally
+    #
+    def each_attribut(global = true, &b)
+      attrs = @oAttrNode.to_h
+      if global
+        attrs = pg.node.to_h.merge attrs
+      end
+      attrs.each do |k,v|
+        yield(k,v)
+      end
+    end
+    
     # 
     # Create an edge between the current node and the node +oNode+
     # 

data/lib/graphviz.rb

@@ -230,7 +230,7 @@ class GraphViz
       hOpts = xGraphName
       xGraphName = nil
     end
-    
+
     if xGraphName.nil?
       xGraphID = String.random(11)
       xGraphName = ""
@@ -337,6 +337,16 @@ class GraphViz
     end
   end
   
+  #
+  # Calls block once for each attribut of the graph, passing the name and value to the 
+  # block as a two-element array.
+  #
+  def each_attribut(&b)
+    @graph.each do |k,v|
+      yield(k,v)
+    end
+  end
+  
   # 
   # Generate the graph
   # 
@@ -432,7 +442,7 @@ class GraphViz
     xDOTScript << "}"
 
     if @oParentGraph.nil? == false
-      xDOTScript = "subgraph #{GraphViz.escape(@name)} {\n" << xDOTScript
+      xDOTScript = "subgraph #{GraphViz.escape(@name, :unquote_empty => true)} {\n" << xDOTScript
 
       return( xDOTScript )
     else
@@ -480,7 +490,7 @@ class GraphViz
       @output = hOutput if hOutput.size > 0
   
       xStict = ((@strict && @oGraphType == "digraph") ? "strict " : "")
-      xDOTScript = ("#{xStict}#{@oGraphType} #{GraphViz.escape(@name)} {\n" << xDOTScript).gsub( "\0", "" )
+      xDOTScript = ("#{xStict}#{@oGraphType} #{GraphViz.escape(@name, :unquote_empty => true)} {\n" << xDOTScript).gsub( "\0", "" )
 
       xOutputString = (@filename == String ||
         @output.any? {|format, file| file == String })
@@ -797,8 +807,13 @@ class GraphViz
   #
   # Escape a string to be acceptable as a node name in a graphviz input file
   #
-  def self.escape(str, force = false ) #:nodoc:
-    if force or str.match( /\A[a-zA-Z_]+[a-zA-Z0-9_]*\Z/ ).nil?
+  def self.escape(str, opts = {} ) #:nodoc:
+    options = {
+      :force => false,
+      :unquote_empty => false,
+    }.merge(opts)
+    
+    if (options[:force] or str.match( /\A[a-zA-Z_]+[a-zA-Z0-9_]*\Z/ ).nil?) and options[:unquote_empty] == false
       '"' + str.gsub('"', '\\"').gsub("\n", '\\\\n').gsub(".","\\.") + '"' 
       ## MAYBE WE NEED TO USE THIS ONE ## str.inspect.gsub(".","\\.").gsub( "\\\\", "\\" )
     else
@@ -806,4 +821,13 @@ class GraphViz
     end
   end
   
+  #def self.escape(str, force = false ) #:nodoc:
+  #  if force or str.match( /\A[a-zA-Z_]+[a-zA-Z0-9_]*\Z/ ).nil?
+  #    '"' + str.gsub('"', '\\"').gsub("\n", '\\\\n').gsub(".","\\.") + '"' 
+  #    ## MAYBE WE NEED TO USE THIS ONE ## str.inspect.gsub(".","\\.").gsub( "\\\\", "\\" )
+  #  else
+  #    str
+  #  end
+  #end
+  
 end

data/test/output/sample21.rb.html

@@ -0,0 +1,3 @@
+base referer
+poly http://www.research.att.com/base.html 133,29 130,22 121,15 107,10 89,7 69,5 50,7 32,10 17,15 8,22 5,29 8,37 17,43 32,49 50,52 69,53 89,52 107,49 121,43 130,37
+poly colors.html 114,125 112,118 106,111 96,106 83,103 69,101 55,103 43,106 33,111 26,118 24,125 26,133 33,139 43,145 55,148 69,149 83,148 96,145 106,139 112,133

data/test/output/sample22.rb.html

@@ -0,0 +1,5 @@
+<map id="mainmap" name="mainmap">
+<area shape="poly" id="node1" href="http://www.research.att.com/command.html" title="command" alt="" coords="133,29 130,22 121,15 107,10 89,7 69,5 50,7 32,10 17,15 8,22 5,29 8,37 17,43 32,49 50,52 69,53 89,52 107,49 121,43 130,37"/>
+<area shape="poly" id="edge2" href="colors.html" alt="" coords="72,54 72,87 67,87 67,54"/>
+<area shape="rect" id="graph1" href="http://www.research.att.com/base.html" alt="" coords="0,0,139,155"/>
+</map>

data/test/output/sample29.rb.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 2.27.20100802.0445 (20100802.0445)
+ -->
+<!-- Title: G Pages: 1 -->
+<svg width="150pt" height="62pt"
+ viewBox="0.00 0.00 150.00 62.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph1" class="graph" transform="scale(1 1) rotate(0) translate(4 58)">
+<title>G</title>
+<polygon fill="white" stroke="white" points="-4,5 -4,-58 147,-58 147,5 -4,5"/>
+<!-- &quot;Hello\.&quot;\nHow are you ? -->
+<g id="node1" class="node"><title>&quot;Hello\.&quot;\nHow are you ?</title>
+<a xlink:href="http://www.website.com" xlink:title="&quot;Hello.&quot;\nHow are you ?">
+<ellipse fill="none" stroke="#ff0000" cx="71" cy="-27" rx="70.9184" ry="26.8701"/>
+<text text-anchor="middle" x="71" y="-29.4" font-family="Times,serif" font-size="14.00">&quot;Hello.&quot;</text>
+<text text-anchor="middle" x="71" y="-14.4" font-family="Times,serif" font-size="14.00">How are you ?</text>
+</a>
+</g>
+</g>
+</svg>