ruby-graphviz 1.0.5 → 1.0.6

data/examples/rgv/test_rgv.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../../lib" );
+require "graphviz"
+
+GraphViz.new(:g){ |g|
+  g[:center] = true
+  a = g.add_nodes("A", :shape => "rgv_box", :peripheries => 0)
+  b = g.add_nodes("Bonjour le monde\nComment va tu ?", :shape => "rgv_cloud", :peripheries => 0)
+  c = g.add_nodes("C", :shape => "rgv_flower", :peripheries => 0)
+  a << b << c
+}.save( :ps => "#{$0}.ps", :extlib => "rgv.ps" )

data/examples/sample43.rb

@@ -23,4 +23,4 @@ g.add_edges( {"struct1" => :f2}, {"struct3" => :here} )
 
 g.add_edges( "HTML", "struct1" )
 
-g.output( :path => '/usr/local/bin/', :png => "#{$0}.png" )
+g.output( :path => ARGV[0], :png => "#{$0}.png" )

data/lib/ext/gvpr/dot2ruby.g

@@ -26,27 +26,29 @@ BEGIN {
   graph_t subgraph; graph_t pgraph;
   graph_t ofgraph;
 
-	string xOut;
-	if( ARGC == 0 ) {
-		xOut = "_";
-	} else {
-		xOut = tolower(ARGV[0]);
-	}
+  string xOut;
+  if( ARGC == 0 ) {
+    xOut = "_";
+  } else {
+    xOut = tolower(ARGV[0]);
+  }
   
   printf( "# This code was generated by dot2ruby.g\n\n" );
 
   string rubyfy( string s ) {
     string out;
     out = tolower( s );
-    out = gsub( out, " ", "__" ); 
-    out = gsub( out, "'", "" ); 
-    out = gsub( out, "-", "_" ); 
-    out = gsub( out, ".", "" ); 
-		out = gsub( out, "%", "u" ); 
-		out = gsub( out, "+", "" ); 
-		out = gsub( out, "/", "_" ); 
+    out = gsub( out, "[!a-zA-Z0-9_]", "_" );
     return( out );
   }
+
+  string stringify( string s ) {
+    string sout;
+    sout = gsub(s, "\"", "\\\"");
+    sout = gsub(sout, "@", "\\@");
+    sout = gsub(sout, "$", "\\$");
+    return( sout );
+  }
 }
 
 BEG_G {
@@ -54,9 +56,9 @@ BEG_G {
   // Directed 
   g_direct = isDirect($);
   if( g_direct == 0 ) {
-    printf( "graph_%s = GraphViz.graph( \"%s\"", rubyfy($.name), rubyfy($.name) );
+    printf( "graph_%s = GraphViz.graph( \"%s\"", rubyfy($.name), stringify($.name) );
   } else {
-    printf( "graph_%s = GraphViz.digraph( \"%s\"", rubyfy($.name), rubyfy($.name) );
+    printf( "graph_%s = GraphViz.digraph( \"%s\"", rubyfy($.name), stringify($.name) );
   }
   // Strict
   g_strict = isStrict($);
@@ -107,7 +109,7 @@ N {
     subgraph = nxtsubg( subgraph );
   }
   
-  printf( "  node_%s = graph_%s.add_nodes( \"%s\"", rubyfy($.name), rubyfy(ofgraph.name), $.name );
+  printf( "  node_%s = graph_%s.add_nodes( \"%s\"", rubyfy($.name), rubyfy(ofgraph.name), stringify($.name) );
 
   // Attributs of N
   attr = fstAttr($G, "N");
@@ -136,7 +138,7 @@ E {
     subgraph = nxtsubg( subgraph );
   }
 
-  printf( "  graph_%s.add_edges( \"%s\", \"%s\"", rubyfy(ofgraph.name), $.tail.name, $.head.name );
+  printf( "  graph_%s.add_edges( \"%s\", \"%s\"", rubyfy(ofgraph.name), stringify($.tail.name), stringify($.head.name) );
   
   // Attributs of E
   attr = fstAttr($G, "E");
@@ -155,11 +157,11 @@ E {
 
 END_G {
   printf( "}\n" );
-	if( xOut != "_" ) {
-		if( xOut == "-" ) {
-			printf( "@_graph_eval = graph_%s\n", rubyfy($.name) );
-		} else {
-  		printf( "graph_%s.output( :%s => \"%s.%s\" )\n", rubyfy($.name), xOut, gsub($F, ".*/", ""), xOut );
-		}
-	}
+  if( xOut != "_" ) {
+    if( xOut == "-" ) {
+      printf( "@_graph_eval = graph_%s\n", rubyfy($.name) );
+    } else {
+      printf( "graph_%s.output( :%s => \"%s.%s\" )\n", rubyfy($.name), xOut, gsub($F, ".*/", ""), xOut );
+    }
+  }
 }

data/lib/graphviz/constants.rb

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

data/lib/graphviz/graphml.rb

@@ -19,6 +19,9 @@ require 'graphviz'
 require 'rexml/document'
 
 class GraphViz
+  class GraphMLError < RuntimeError
+  end
+
   class GraphML
     attr_reader :attributes
     def attributs
@@ -30,10 +33,14 @@ class GraphViz
     attr_accessor :graph
   
     DEST = {
-      'node'  => [:nodes],
-      'edge'  => [:edges],
-      'graph' => [:graphs],
-      'all'   => [:nodes, :edges, :graphs]
+      'node'      => [:nodes],
+      'edge'      => [:edges],
+      'graph'     => [:graphs],
+      'graphml'   => [:graphml],
+      'hyperedge' => [:hyperedge],
+      'port'      => [:port],
+      'endpoint'  => [:endpoint],
+      'all'       => [:nodes, :edges, :graphs, :graphml, :hyperedge, :port, :endpoint]
     }
     
     GTYPE = {
@@ -48,8 +55,13 @@ class GraphViz
       @attributes = {
         :nodes => {},
         :edges => {},
-        :graphs => {}
+        :graphs => {},
+        :graphml => {},
+        :endpoint => {},
+        :port => {},
+        :hyperedge => {}
       }
+      @ignored_keys = []
       @graph = nil
       @current_attr = nil
       @current_node = nil
@@ -60,22 +72,22 @@ class GraphViz
     end
     
     def parse( node ) #:nodoc:
-      #begin
-        send( node.name.to_sym, node )
-      #rescue NoMethodError => e
-      #  raise "ERROR node #{node.name} can be root"
-      #end
+      send( node.name.to_sym, node )
     end
     
     def graphml( node ) #:nodoc:
       node.each_element( ) do |child|
-        #begin
+        begin
           send( "graphml_#{child.name}".to_sym, child )
-        #rescue NoMethodError => e
-        #  raise "ERROR node #{child.name} can be child of graphml"
-        #end
+        rescue NoMethodError => e
+          raise GraphMLError, "node #{child.name} can be child of graphml"
+        end
       end
     end
+
+    def graphml_data(node) 
+       warn "graphml/data not supported!"
+    end
     
     def graphml_key( node ) #:nodoc:
       id = node.attributes['id']
@@ -83,15 +95,19 @@ class GraphViz
         :name => node.attributes['attr.name'],
         :type => node.attributes['attr.type']
       }    
-      DEST[node.attributes['for']].each do |d|
-        @attributes[d][id] = @current_attr
-      end
-      
-      node.each_element( ) do |child|
-        begin
-          send( "graphml_key_#{child.name}".to_sym, child )
-        rescue NoMethodError => e
-          raise "ERROR node #{child.name} can be child of graphml"
+      if @current_attr[:name].nil?
+        @ignored_keys << id
+      else
+        DEST[node.attributes['for']].each do |d|
+          @attributes[d][id] = @current_attr
+        end
+        
+        node.each_element( ) do |child|
+          begin
+            send( "graphml_key_#{child.name}".to_sym, child )
+          rescue NoMethodError => e
+            raise GraphMLError, "node #{child.name} can be child of key"
+          end
         end
       end
       
@@ -99,7 +115,7 @@ class GraphViz
     end
     
     def graphml_key_default( node ) #:nodoc:
-      @current_attr[:default] = node.texts().to_s
+      @current_attr[:default] = node.texts().join('\n')
     end
     
     def graphml_graph( node ) #:nodoc:
@@ -115,28 +131,40 @@ class GraphViz
       end
       
       @attributes[:graphs].each do |id, data|
-        @current_graph.graph[data[:name]] = data[:default] if data.has_key?(:default)
+        begin
+          @current_graph.graph[data[:name]] = data[:default] if data.has_key?(:default)
+        rescue ArgumentError => e
+          warn e
+        end
       end
       @attributes[:nodes].each do |id, data|
-        @current_graph.node[data[:name]] = data[:default] if data.has_key?(:default)
+        begin
+          @current_graph.node[data[:name]] = data[:default] if data.has_key?(:default)
+        rescue ArgumentError => e
+          warn e
+        end
       end
       @attributes[:edges].each do |id, data|
-        @current_graph.edge[data[:name]] = data[:default] if data.has_key?(:default)
+        begin
+          @current_graph.edge[data[:name]] = data[:default] if data.has_key?(:default)
+        rescue ArgumentError => e
+          warn e
+        end
       end
           
       node.each_element( ) do |child|
-        #begin
-          send( "graphml_graph_#{child.name}".to_sym, child )
-        #rescue NoMethodError => e
-        #  raise "ERROR node #{child.name} can be child of graphml"
-        #end
+        send( "graphml_graph_#{child.name}".to_sym, child )
       end
       
       @current_graph = previous_graph
     end
     
     def graphml_graph_data( node ) #:nodoc:
-      @current_graph[@attributes[:graphs][node.attributes['key']][:name]] = node.texts().to_s
+      begin
+        @current_graph[@attributes[:graphs][node.attributes['key']][:name]] = node.texts().join('\n')
+      rescue ArgumentError => e
+        warn e
+      end
     end
     
     def graphml_graph_node( node ) #:nodoc:
@@ -150,7 +178,7 @@ class GraphViz
           begin
             send( "graphml_graph_node_#{child.name}".to_sym, child )
           rescue NoMethodError => e
-            raise "ERROR node #{child.name} can be child of graphml"
+            raise GraphMLError, "node #{child.name} can be child of node"
           end
         end
       end
@@ -158,7 +186,11 @@ class GraphViz
       unless @current_node.nil?
         node = @current_graph.add_nodes( node.attributes['id'] )
         @current_node.each do |k, v|
-          node[k] = v
+          begin
+            node[k] = v
+          rescue ArgumentError => e
+            warn e
+          end
         end
       end
       
@@ -166,8 +198,12 @@ class GraphViz
     end
     
     def graphml_graph_node_data( node ) #:nodoc:
-      #@current_node[@attributes[:nodes][node.attributes['key']][:name]] = node.texts().to_s
-      @current_node[@attributes[:nodes][node.attributes['key']][:name]] = node.texts().join(sep='\n',)
+      return if @ignored_keys.include?(node.attributes['key'])
+      begin
+        @current_node[@attributes[:nodes][node.attributes['key']][:name]] = node.texts().join('\n')
+      rescue ArgumentError => e
+        warn e
+      end
     end
     
     def graphml_graph_node_port( node ) #:nodoc:
@@ -190,18 +226,23 @@ class GraphViz
       @current_edge = @current_graph.add_edges( source, target )
   
       node.each_element( ) do |child|
-        #begin
+        begin
           send( "graphml_graph_edge_#{child.name}".to_sym, child )
-        #rescue NoMethodError => e
-        #  raise "ERROR node #{child.name} can be child of graphml"
-        #end
+        rescue NoMethodError => e
+          raise GraphMLError, "node #{child.name} can be child of edge"
+        end
       end
       
       @current_edge = nil
     end
   
     def graphml_graph_edge_data( node ) #:nodoc:
-      @current_edge[@attributes[:edges][node.attributes['key']][:name]] = node.texts().to_s
+      return if @ignored_keys.include?(node.attributes['key'])
+      begin
+        @current_edge[@attributes[:edges][node.attributes['key']][:name]] = node.texts().join('\n')
+      rescue ArgumentError => e
+        warn e
+      end
     end
     
     def graphml_graph_hyperedge( node ) #:nodoc:

data/lib/graphviz/nothugly.rb

@@ -8,7 +8,14 @@
 # testing, lots of gradients)
 
 require 'rubygems'
-require 'xml/xslt'
+begin
+   require 'xml/xslt'
+   XSLT_METHOD = :xml_xslt_transform
+rescue LoadError => e
+   require 'libxml'
+   require 'libxslt'
+   XSLT_METHOD = :libxslt_transform
+end
 
 class GraphViz
   # Transform to pretty up the SVG output
@@ -24,11 +31,8 @@ class GraphViz
   #
   #   GraphViz.nothugly( "myGraph.svg" )
   def self.nothugly( file, save = true )
-    xslt = XML::XSLT.new()
-    xslt.xml = file
-    xslt.xsl = File.join( File.dirname(File.expand_path(__FILE__)), "nothugly", "nothugly.xsl" )
-
-    out = xslt.serve()
+    xsl = File.join( File.dirname(File.expand_path(__FILE__)), "nothugly", "nothugly.xsl" )
+    out = self.send(XSLT_METHOD, file, xsl)
   
     if save
       fname = File.join( File.dirname(File.expand_path(file)), File.basename(file))
@@ -39,4 +43,21 @@ class GraphViz
       return out
     end
   end
-end
+
+  def self.xml_xslt_transform(xml, xsl)
+    xslt = XML::XSLT.new()
+    xslt.xml = xml
+    xslt.xsl = xsl
+    xslt.serve()
+  end
+
+  def self.libxslt_transform(xml, xsl)
+     LibXML::XML.default_load_external_dtd = false
+     LibXML::XML.default_substitute_entities = false
+
+     stylesheet_doc = LibXML::XML::Document.file(xsl)
+     stylesheet = LibXSLT::XSLT::Stylesheet.new(stylesheet_doc)
+     xml_doc = LibXML::XML::Document.file(xml)
+     stylesheet.apply(xml_doc).to_s
+  end
+end

data/lib/graphviz/utils/colors.rb

@@ -24,21 +24,21 @@ class GraphViz
             if g.is_a?(Fixnum)
                g = g.to_s.convert_base(10, 16)
             end
-            unless g.is_a?(String) and HEX_FOR_COLOR.match(r)
+            unless g.is_a?(String) and HEX_FOR_COLOR.match(g)
                raise ColorException, "Bad green value"
             end
             
             if b.is_a?(Fixnum)
                b = b.to_s.convert_base(10, 16)
             end
-            unless b.is_a?(String) and HEX_FOR_COLOR.match(r)
+            unless b.is_a?(String) and HEX_FOR_COLOR.match(b)
                raise ColorException, "Bad blue value"
             end
       
             if a.is_a?(Fixnum)
                a = a.to_s.convert_base(10, 16)
             end
-            unless a.nil? or (a.is_a?(String) and HEX_FOR_COLOR.match(r))
+            unless a.nil? or (a.is_a?(String) and HEX_FOR_COLOR.match(a))
                raise ColorException, "Bad alpha value"
             end
       

data/lib/graphviz.rb

@@ -550,7 +550,7 @@ class GraphViz
               require 'graphviz/nothugly'
               @nothugly = true
             rescue LoadError => e
-              warn "You must install ruby-xslt to use nothugly option!"
+              warn "You must install ruby-xslt or libxslt-ruby to use nothugly option!"
               @nothugly = false
             end
           else
@@ -975,7 +975,7 @@ class GraphViz
     
     if (options[:force] or str.match( /\A[a-zA-Z_]+[a-zA-Z0-9_]*\Z/ ).nil?) 
       unless options[:unquote_empty] == true and str.size == 0
-        '"' + str.gsub('"', '\\"').gsub("\n", '\\\\n').gsub(".","\\.") + '"' 
+        '"' + str.gsub('"', '\\"').gsub("\n", '\\\\n') + '"' 
       end
     else
       str

data/lib/ruby-graphviz.rb

@@ -0,0 +1 @@
+require 'graphviz'

metadata

@@ -1,80 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-graphviz
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 1.0.6
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 5
-  version: 1.0.5
 platform: ruby
-authors: 
+authors:
 - Gregoire Lejeune
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: gems
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gems
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: Ruby/Graphviz provides an interface to layout and generate images of directed graphs in a variety of formats (PostScript, PNG, etc.) using GraphViz.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+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:
 - dot2ruby
 - gem2gv
 - git2gv
 - ruby2gv
 - xml2gv
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - COPYING.rdoc
 - AUTHORS.rdoc
 - CHANGELOG.rdoc
-files: 
+files:
 - .gemrc
 - .gitignore
 - .travis.yml
@@ -113,11 +113,14 @@ files:
 - examples/graphml/attributes.ext.graphml
 - examples/graphml/attributes.graphml
 - examples/graphml/cluster.graphml
+- examples/graphml/failed_graph.graphml
 - examples/graphml/hyper.graphml
 - examples/graphml/nested.graphml
 - examples/graphml/port.graphml
 - examples/graphml/simple.graphml
 - examples/hello.png
+- examples/rgv/rgv.ps
+- examples/rgv/test_rgv.rb
 - examples/sample01.rb
 - examples/sample02.rb
 - examples/sample03.rb
@@ -229,6 +232,7 @@ files:
 - lib/graphviz/utils.rb
 - lib/graphviz/utils/colors.rb
 - lib/graphviz/xml.rb
+- lib/ruby-graphviz.rb
 - ruby-graphviz.gemspec
 - setup.rb
 - test/support.rb
@@ -240,54 +244,42 @@ files:
 - test/test_utils_colors.rb
 homepage: http://github.com/glejeune/Ruby-Graphviz
 licenses: []
-
-post_install_message: "\n\
-  Since version 0.9.2, Ruby/GraphViz can use Open3.popen3 (or not)\n\
-  On Windows, you can install 'win32-open3'\n\n\
-  You need to install GraphViz (http://graphviz.org/) to use this Gem.\n\n\
-  For more information about Ruby-Graphviz :\n\
-  * Doc : http://rdoc.info/projects/glejeune/Ruby-Graphviz\n\
-  * Sources : http://github.com/glejeune/Ruby-Graphviz\n\
-  * NEW - Mailing List : http://groups.google.com/group/ruby-graphviz\n\n\
-  Last (important) changes :\n\
-  * GraphViz#add_edge is deprecated, use GraphViz#add_edges\n\
-  * GraphViz#add_node is deprecated, use GraphViz#add_nodes\n\
-  * GraphViz::Edge#each_attribut is deprecated, use GraphViz::Edge#each_attribute\n\
-  * GraphViz::GraphML#attributs is deprecated, use GraphViz::GraphML#attributes\n\
-  * GraphViz::Node#each_attribut is deprecated, use GraphViz::Node#each_attribute\n  "
-rdoc_options: 
+post_install_message: ! "\nSince version 0.9.2, Ruby/GraphViz can use Open3.popen3
+  (or not)\nOn Windows, you can install 'win32-open3'\n\nYou need to install GraphViz
+  (http://graphviz.org/) to use this Gem.\n\nFor more information about Ruby-Graphviz
+  :\n* Doc : http://rdoc.info/projects/glejeune/Ruby-Graphviz\n* Sources : http://github.com/glejeune/Ruby-Graphviz\n*
+  NEW - Mailing List : http://groups.google.com/group/ruby-graphviz\n\nLast (important)
+  changes :\n* GraphViz#add_edge is deprecated, use GraphViz#add_edges\n* GraphViz#add_node
+  is deprecated, use GraphViz#add_nodes\n* GraphViz::Edge#each_attribut is deprecated,
+  use GraphViz::Edge#each_attribute\n* GraphViz::GraphML#attributs is deprecated,
+  use GraphViz::GraphML#attributes\n* GraphViz::Node#each_attribut is deprecated,
+  use GraphViz::Node#each_attribute\n  "
+rdoc_options:
 - --title
 - Ruby/GraphViz
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ruby-asp
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Interface to the GraphViz graphing tool
-test_files: 
+test_files:
 - test/support.rb
 - test/test_examples.rb
 - test/test_graph.rb