ruby-graphviz 0.9.15 → 0.9.16

data/README.rdoc

@@ -12,11 +12,18 @@ Interface to the GraphViz graphing tool
 
 == TODO
 
-* GraphViz::Parser support block
 * New FamilyTree
 
 == CHANGELOG
 
+=== 0.9.16 :
+* Add <tt>xml2gv</tt>
+* Rename <tt>GraphViz.parser2</tt> to <tt>GraphViz.parser</tt> 
+* Remove treetop dependency
+* Ruby 1.9 (and MacRuby) compatibility -- Issue #12: see sample38.rb
+* Add GraphViz::Attrs#each and GraphViz::Attrs#to_h
+* Add GraphViz::Edge#node_one and GraphViz::Edge#node_two
+
 === 0.9.15 :
 * Add <tt>GraphViz.parser2</tt>. <b>WARNING</b> this method will replace <tt>GraphViz.parser</tt>. So please don't use it, or only for testing.
 * Bug correction in <tt>dot2ruby</tt>
@@ -261,6 +268,8 @@ Ruby/GraphViz also include :
 
 * <tt>git2gv</tt>, a tools that's allow you to show your git commits : http://dl.dropbox.com/u/72629/ruby-graphviz-git.svg
 
+* <tt>xml2gv</tt>, a tools that's allow you to show a xml file as graph.
+
 == INSTALLATION
 
   sudo gem install ruby-graphviz

data/bin/xml2gv

@@ -0,0 +1,96 @@
+#!/usr/bin/env ruby
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+
+require 'rubygems'
+require 'getoptlong'
+require 'graphviz/xml'
+
+def usage 
+  puts "usage: xml2gv [-Tformat] [-ofile] [-h] [-V] script"
+  puts "-T, --output-format format    Output format (default: PNG)"
+  puts "-o, --output-file file        Output file (default: STDOUT)"
+  puts "-p, --path                    Graphviz path"
+  puts "-u, --use PROGRAM             Program to use (default: dot)"
+  puts "-V, --version                 Show version"
+  puts "-h, --help                    Show this usage message"
+end
+
+def version
+  puts "XML2GraphViz v#{Constants::RGV_VERSION}, (c)2010 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"
+  puts "the Free Software Foundation; either version 2 of the License, or"
+  puts "(at your option) any later version."
+  puts ""
+  puts "This program is distributed in the hope that it will be useful,"
+  puts "but WITHOUT ANY WARRANTY; without even the implied warranty of"
+  puts "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the"
+  puts "GNU General Public License for more details."
+  puts ""
+  puts "You should have received a copy of the GNU General Public License"
+  puts "along with this program; if not, write to the Free Software"
+  puts "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA"
+end
+
+xOutFormat = "png"
+xOutFile = nil
+xGVPath = ""
+xUse = "dot"
+
+oOpt = GetoptLong.new(
+  ['--output-format', '-T', GetoptLong::REQUIRED_ARGUMENT],
+  ['--output-file',   '-o', GetoptLong::REQUIRED_ARGUMENT],
+  ['--path',          '-p', GetoptLong::REQUIRED_ARGUMENT],
+  ['--use',           '-u', GetoptLong::REQUIRED_ARGUMENT],
+  ['--help',          '-h', GetoptLong::NO_ARGUMENT],
+  ['--version',       '-V', GetoptLong::NO_ARGUMENT]
+)
+
+begin
+  oOpt.each_option do |xOpt, xValue|
+    case xOpt
+      when '--output-format'
+        xOutFormat = xValue
+      when '--output-file'
+        xOutFile = xValue
+      when '--path'
+        xGVPath = xValue
+      when '--use'
+        xUse = xValue
+      when '--help'
+        usage( )
+        exit
+      when '--version'
+        version( )
+        exit
+    end
+  end
+rescue GetoptLong::InvalidOption => e
+  usage( )
+  exit
+end
+
+xFile = ARGV[0]
+
+if xFile.nil? == true
+  usage( )
+  exit
+end
+
+gvxml = GraphViz::XML::new( xFile, :text => true, :attrs => true )
+gvxml.output( xOutFormat => xOutFile, :path => xGVPath )

data/examples/dot/cluster.dot

@@ -1,5 +1,4 @@
 digraph G {
-
 	subgraph cluster_0 {
 		style=filled;
 		color=lightgrey;

data/examples/dot/hello_test.rb

@@ -3,12 +3,31 @@
 $:.unshift( "../../lib" );
 require "graphviz"
 
-GraphViz.parse2( "hello.dot", :path => "/usr/local/bin" ) { |g|
+g = GraphViz.parse( "hello.dot", :path => "/usr/local/bin" ) { |g|
+  g.graph[:color] = "blue"
+  g.node[:color] = "red"
+  g.edge[:color] = "yellow"
   g.get_node("Hello") { |n|
     n.label = "Bonjour"
   }
   g.get_node("World") { |n|
     n.label = "Le Monde"
   }
-}.output(:png => "#{$0}.png")
+}
+
+g.graph.each do |k, v|
+  puts "graph : #{k} => #{v}"
+end
+
+g.node.each do |k, v|
+  puts "node : #{k} => #{v}"
+end
+
+g.edge.each do |k, v|
+  puts "edge : #{k} => #{v}"
+end
+
+puts "-----------"
+
+puts g.output(:none => String)
 

data/examples/dot/test_parse.rb

@@ -6,7 +6,7 @@ require "graphviz"
 Dir.glob( "*.dot" ) { |f|
   print "#{f} : "
   begin
-    puts GraphViz.parse2(f)
+    puts GraphViz.parse(f)
   rescue SyntaxError => e
     puts "Error #{e.message}"
   end

data/examples/sample38.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 $:.unshift( "../lib" )
 require "graphviz"
 

data/lib/ext/gvpr/dot2ruby.g

@@ -114,7 +114,7 @@ N {
   while( attr != "" ) {
     attrv = aget( $, attr );
     if( attrv != "" ) {
-      printf( ", :%s => '%s'", attr, attrv );
+      printf( ", :%s => '%s'", attr, gsub( attrv, "'", "\\'" ) );
     } else {
       printf( ", :%s => ''", attr );
     }
@@ -143,7 +143,7 @@ E {
   while( attr != "" ) {
     attrv = aget( $, attr );
     if( attrv != "" ) {
-      printf( ", :%s => '%s'", attr, attrv );
+      printf( ", :%s => '%s'", attr, gsub( attrv, "'", "\\'" ) );
     } else {
       printf( ", :%s => ''", attr );
     }

data/lib/graphviz.rb

@@ -26,14 +26,13 @@ require 'graphviz/edge'
 require 'graphviz/attrs'
 require 'graphviz/constants'
 
-# --> WILL BE REMOVED
-require 'graphviz/parser'
-
 require 'graphviz/dot2ruby'
 require 'graphviz/types'
 require 'graphviz/core_ext'
 
-$KCODE = "UTF8"
+if /^1.8/.match RUBY_VERSION
+  $KCODE = "UTF8"
+end
 
 class GraphViz 
   include Constants
@@ -71,12 +70,15 @@ class GraphViz
 
   # This accessor allow you to set global graph attributs
   attr_accessor :graph
+  alias_method :graph_attrs, :graph
   
   # This accessor allow you to set global nodes attributs
   attr_accessor :node
+  alias_method :node_attrs, :node
 
   # This accessor allow you to set global edges attributs
   attr_accessor :edge
+  alias_method :edge_attrs, :edge
 
   @elements_order
   
@@ -440,7 +442,7 @@ class GraphViz
       
       @output = hOutput if hOutput.size > 0
   
-      xDOTScript = ("#{@oGraphType} #{GraphViz.escape(@name)} {\n" << xDOTScript).gsub( /\0/, "" )
+      xDOTScript = ("#{@oGraphType} #{GraphViz.escape(@name)} {\n" << xDOTScript).gsub( "\0", "" )
 
       xOutputString = (@filename == String ||
         @output.any? {|format, file| file == String })
@@ -611,29 +613,6 @@ class GraphViz
   
 ## ----------------------------------------------------------------------------
 
-  # 
-  # Create a new graph from a GraphViz File
-  # 
-  # Options :
-  # * :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 (default : none)
-  # * :type : Graph type (Constants::GRAPHTYPE) (default : digraph)
-  # 
-  def self.parse( xFile, hOpts = {}, &block )
-    # This method will be replaced by parser2.
-    # When it's time, remove 
-    #   graphviz/parser.rb
-    #   graphviz/dot.treetop
-    # and remove line
-    #   s.add_dependency('treetop')
-    # in Rakefile
-    g = GraphViz::Parser.parse( xFile, hOpts, &block )
-    return g
-  end
-
   # 
   # Create a new graph from a GraphViz File
   # 
@@ -643,9 +622,7 @@ class GraphViz
   # * :use : Program to use (Constants::PROGRAMS) (default : dot)
   # * :path : Program PATH
   #
-  # <b>WARNING</b> : This method will replace GraphViz.parser. So please use it only for testing...
-  #   
-  def self.parse2( xFile, hOpts = {}, &block ) 
+  def self.parse( xFile, hOpts = {}, &block ) 
     graph = Dot2Ruby::new( hOpts[:path], nil, nil ).eval( xFile )
     yield( graph ) if( block and graph.nil? == false )
     return graph

data/lib/graphviz/attrs.rb

@@ -30,6 +30,16 @@ class GraphViz
 	    @graphviz  = gviz
     end
 
+    def each
+      @data.each do |k, v|
+        yield(k, v)
+      end
+    end
+    
+    def to_h
+      @data.clone
+    end
+
     def []( xKey )
       if xKey.class == Hash
         xKey.each do |k, v|

data/lib/graphviz/constants.rb

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

data/lib/graphviz/edge.rb

@@ -54,6 +54,24 @@ class GraphViz
       @oAttrEdge = GraphViz::Attrs::new( nil, "edge", EDGESATTRS )
     end
 
+    # Return the node one as string (so with port if any)
+    def node_one
+      if @xNodeOnePort.nil?
+	      GraphViz.escape(@xNodeOne)
+      else
+        GraphViz.escape(@xNodeOne, true) + ":#{@xNodeOnePort}"
+      end
+    end
+
+    # Return the node two as string (so with port if any)
+    def node_two
+      if @xNodeTwoPort.nil?
+	      GraphViz.escape(@xNodeTwo) 
+	    else 
+	      GraphViz.escape(@xNodeTwo, true) + ":#{@xNodeTwoPort}"
+      end
+    end
+    
     # 
     # Set value +xAttrValue+ to the edge attribut +xAttrName+
     # 
@@ -115,19 +133,7 @@ class GraphViz
 	      xLink = " -- "
 	    end
 	  
-	    xNodeNameOne = if @xNodeOnePort.nil?
-	      GraphViz.escape(@xNodeOne)
-      else
-        GraphViz.escape(@xNodeOne, true) + ":#{@xNodeOnePort}"
-      end
-	    
-	    xNodeNameTwo = if @xNodeTwoPort.nil?
-	      GraphViz.escape(@xNodeTwo) 
-	    else 
-	      GraphViz.escape(@xNodeTwo, true) + ":#{@xNodeTwoPort}"
-      end
-      
-      xOut = xNodeNameOne + xLink + xNodeNameTwo
+      xOut = self.node_one + xLink + self.node_two
       xAttr = ""
       xSeparator = ""
       @oAttrEdge.data.each do |k, v|

data/lib/src/html_string_parser.gv

@@ -0,0 +1,43 @@
+digraph html_string_lexer {
+	rankdir=LR;
+	node [ shape = point ];
+	ENTRY;
+	en_22;
+	node [ shape = circle, height = 0.2 ];
+	node [ fixedsize = true, height = 0.65, shape = doublecircle ];
+	22;
+	node [ shape = circle ];
+	1 -> 2 [ label = "'/'" ];
+	1 -> 10 [ label = "'B'" ];
+	1 -> 13 [ label = "'F'" ];
+	1 -> 18 [ label = "'b'" ];
+	1 -> 19 [ label = "'f'" ];
+	2 -> 3 [ label = "'F'" ];
+	2 -> 7 [ label = "'f'" ];
+	3 -> 4 [ label = "'O'" ];
+	4 -> 5 [ label = "'N'" ];
+	5 -> 6 [ label = "'T'" ];
+	6 -> 22 [ label = "'>' / last3, initts" ];
+	7 -> 8 [ label = "'o'" ];
+	8 -> 9 [ label = "'n'" ];
+	9 -> 6 [ label = "'t'" ];
+	10 -> 11 [ label = "'R'" ];
+	11 -> 12 [ label = "'\\t'..'\\r', SP" ];
+	11 -> 22 [ label = "'>' / last1, initts" ];
+	12 -> 22 [ label = "'>' / last1, initts" ];
+	12 -> 12 [ label = "DEF" ];
+	13 -> 14 [ label = "'O'" ];
+	14 -> 15 [ label = "'N'" ];
+	15 -> 16 [ label = "'T'" ];
+	16 -> 17 [ label = "'\\t'..'\\r', SP" ];
+	16 -> 22 [ label = "'>' / last2, initts" ];
+	17 -> 22 [ label = "'>' / last2, initts" ];
+	17 -> 17 [ label = "DEF" ];
+	18 -> 11 [ label = "'r'" ];
+	19 -> 20 [ label = "'o'" ];
+	20 -> 21 [ label = "'n'" ];
+	21 -> 16 [ label = "'t'" ];
+	22 -> 1 [ label = "'<' / ts" ];
+	ENTRY -> 22 [ label = "IN" ];
+	en_22 -> 22 [ label = "main" ];
+}

data/lib/src/html_string_parser.rb

@@ -0,0 +1,422 @@
+
+# line 1 "html_string_parser.rl"
+
+# line 20 "html_string_parser.rl"
+
+
+
+# line 9 "html_string_parser.rb"
+class << self
+	attr_accessor :_html_string_lexer_actions
+	private :_html_string_lexer_actions, :_html_string_lexer_actions=
+end
+self._html_string_lexer_actions = [
+	0, 1, 0, 1, 1, 1, 8, 1, 
+	9, 2, 2, 3, 2, 2, 4, 2, 
+	2, 5, 2, 2, 6, 2, 2, 7
+]
+
+class << self
+	attr_accessor :_html_string_lexer_key_offsets
+	private :_html_string_lexer_key_offsets, :_html_string_lexer_key_offsets=
+end
+self._html_string_lexer_key_offsets = [
+	0, 1, 1, 6, 8, 9, 10, 11, 
+	12, 13, 14, 15, 16, 20, 21, 22, 
+	23, 24, 27, 28, 39, 51, 64, 76, 
+	88, 100, 112, 113, 114, 115, 116, 117, 
+	118, 119
+]
+
+class << self
+	attr_accessor :_html_string_lexer_trans_keys
+	private :_html_string_lexer_trans_keys, :_html_string_lexer_trans_keys=
+end
+self._html_string_lexer_trans_keys = [
+	60, 47, 66, 70, 98, 102, 70, 102, 
+	79, 78, 84, 62, 111, 110, 116, 82, 
+	32, 62, 9, 13, 62, 79, 78, 84, 
+	32, 9, 13, 62, 60, 95, 97, 99, 
+	108, 101, 103, 110, 111, 115, 116, 47, 
+	60, 95, 97, 99, 108, 101, 103, 110, 
+	111, 115, 116, 60, 70, 95, 97, 99, 
+	102, 108, 101, 103, 110, 111, 115, 116, 
+	60, 79, 95, 97, 99, 108, 101, 103, 
+	110, 111, 115, 116, 60, 78, 95, 97, 
+	99, 108, 101, 103, 110, 111, 115, 116, 
+	60, 84, 95, 97, 99, 108, 101, 103, 
+	110, 111, 115, 116, 60, 62, 95, 97, 
+	99, 108, 101, 103, 110, 111, 115, 116, 
+	111, 110, 116, 62, 114, 111, 110, 116, 
+	0
+]
+
+class << self
+	attr_accessor :_html_string_lexer_single_lengths
+	private :_html_string_lexer_single_lengths, :_html_string_lexer_single_lengths=
+end
+self._html_string_lexer_single_lengths = [
+	1, 0, 5, 2, 1, 1, 1, 1, 
+	1, 1, 1, 1, 2, 1, 1, 1, 
+	1, 1, 1, 5, 6, 7, 6, 6, 
+	6, 6, 1, 1, 1, 1, 1, 1, 
+	1, 1
+]
+
+class << self
+	attr_accessor :_html_string_lexer_range_lengths
+	private :_html_string_lexer_range_lengths, :_html_string_lexer_range_lengths=
+end
+self._html_string_lexer_range_lengths = [
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 1, 0, 0, 0, 
+	0, 1, 0, 3, 3, 3, 3, 3, 
+	3, 3, 0, 0, 0, 0, 0, 0, 
+	0, 0
+]
+
+class << self
+	attr_accessor :_html_string_lexer_index_offsets
+	private :_html_string_lexer_index_offsets, :_html_string_lexer_index_offsets=
+end
+self._html_string_lexer_index_offsets = [
+	0, 2, 3, 9, 12, 14, 16, 18, 
+	20, 22, 24, 26, 28, 32, 34, 36, 
+	38, 40, 43, 45, 54, 64, 75, 85, 
+	95, 105, 115, 117, 119, 121, 123, 125, 
+	127, 129
+]
+
+class << self
+	attr_accessor :_html_string_lexer_indicies
+	private :_html_string_lexer_indicies, :_html_string_lexer_indicies=
+end
+self._html_string_lexer_indicies = [
+	1, 0, 0, 4, 5, 6, 7, 8, 
+	0, 9, 10, 0, 11, 0, 12, 0, 
+	13, 0, 14, 0, 15, 0, 16, 0, 
+	13, 0, 17, 0, 18, 19, 18, 0, 
+	19, 18, 20, 0, 21, 0, 22, 0, 
+	23, 23, 0, 24, 23, 26, 0, 0, 
+	0, 0, 0, 0, 0, 25, 27, 26, 
+	0, 0, 0, 0, 0, 0, 0, 25, 
+	26, 28, 0, 0, 0, 29, 0, 0, 
+	0, 0, 25, 26, 30, 0, 0, 0, 
+	0, 0, 0, 0, 25, 26, 31, 0, 
+	0, 0, 0, 0, 0, 0, 25, 26, 
+	32, 0, 0, 0, 0, 0, 0, 0, 
+	25, 26, 33, 0, 0, 0, 0, 0, 
+	0, 0, 25, 34, 0, 35, 0, 36, 
+	0, 37, 0, 17, 0, 38, 0, 39, 
+	0, 22, 0, 0
+]
+
+class << self
+	attr_accessor :_html_string_lexer_trans_targs
+	private :_html_string_lexer_trans_targs, :_html_string_lexer_trans_targs=
+end
+self._html_string_lexer_trans_targs = [
+	1, 2, 0, 0, 3, 11, 14, 30, 
+	31, 4, 8, 5, 6, 7, 1, 9, 
+	10, 12, 13, 1, 15, 16, 17, 18, 
+	19, 19, 20, 21, 22, 26, 23, 24, 
+	25, 19, 27, 28, 29, 1, 32, 33
+]
+
+class << self
+	attr_accessor :_html_string_lexer_trans_actions
+	private :_html_string_lexer_trans_actions, :_html_string_lexer_trans_actions=
+end
+self._html_string_lexer_trans_actions = [
+	21, 0, 7, 5, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 18, 0, 
+	0, 0, 0, 9, 0, 0, 0, 0, 
+	15, 21, 0, 0, 0, 0, 0, 0, 
+	0, 12, 0, 0, 0, 12, 0, 0
+]
+
+class << self
+	attr_accessor :_html_string_lexer_to_state_actions
+	private :_html_string_lexer_to_state_actions, :_html_string_lexer_to_state_actions=
+end
+self._html_string_lexer_to_state_actions = [
+	1, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0
+]
+
+class << self
+	attr_accessor :_html_string_lexer_from_state_actions
+	private :_html_string_lexer_from_state_actions, :_html_string_lexer_from_state_actions=
+end
+self._html_string_lexer_from_state_actions = [
+	3, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0
+]
+
+class << self
+	attr_accessor :_html_string_lexer_eof_trans
+	private :_html_string_lexer_eof_trans, :_html_string_lexer_eof_trans=
+end
+self._html_string_lexer_eof_trans = [
+	0, 3, 4, 4, 4, 4, 4, 4, 
+	4, 4, 4, 4, 4, 4, 4, 4, 
+	4, 4, 4, 3, 4, 4, 4, 4, 
+	4, 4, 4, 4, 4, 4, 4, 4, 
+	4, 4
+]
+
+class << self
+	attr_accessor :html_string_lexer_start
+end
+self.html_string_lexer_start = 0;
+class << self
+	attr_accessor :html_string_lexer_first_final
+end
+self.html_string_lexer_first_final = 0;
+class << self
+	attr_accessor :html_string_lexer_error
+end
+self.html_string_lexer_error = -1;
+
+class << self
+	attr_accessor :html_string_lexer_en_main
+end
+self.html_string_lexer_en_main = 0;
+
+
+# line 23 "html_string_parser.rl"
+
+# ---------- %
+
+def test( data )
+	puts "Check : #{data}"
+	data = data.unpack("c*") if(data.is_a?(String))
+	eof = data.length
+
+	
+# line 204 "html_string_parser.rb"
+begin
+	p ||= 0
+	pe ||= data.length
+	cs = html_string_lexer_start
+	ts = nil
+	te = nil
+	act = 0
+end
+
+# line 32 "html_string_parser.rl"
+	
+# line 216 "html_string_parser.rb"
+begin
+	_klen, _trans, _keys, _acts, _nacts = nil
+	_goto_level = 0
+	_resume = 10
+	_eof_trans = 15
+	_again = 20
+	_test_eof = 30
+	_out = 40
+	while true
+	_trigger_goto = false
+	if _goto_level <= 0
+	if p == pe
+		_goto_level = _test_eof
+		next
+	end
+	end
+	if _goto_level <= _resume
+	_acts = _html_string_lexer_from_state_actions[cs]
+	_nacts = _html_string_lexer_actions[_acts]
+	_acts += 1
+	while _nacts > 0
+		_nacts -= 1
+		_acts += 1
+		case _html_string_lexer_actions[_acts - 1]
+			when 1 then
+# line 1 "NONE"
+		begin
+ts = p
+		end
+# line 246 "html_string_parser.rb"
+		end # from state action switch
+	end
+	if _trigger_goto
+		next
+	end
+	_keys = _html_string_lexer_key_offsets[cs]
+	_trans = _html_string_lexer_index_offsets[cs]
+	_klen = _html_string_lexer_single_lengths[cs]
+	_break_match = false
+	
+	begin
+	  if _klen > 0
+	     _lower = _keys
+	     _upper = _keys + _klen - 1
+
+	     loop do
+	        break if _upper < _lower
+	        _mid = _lower + ( (_upper - _lower) >> 1 )
+
+	        if data[p] < _html_string_lexer_trans_keys[_mid]
+	           _upper = _mid - 1
+	        elsif data[p] > _html_string_lexer_trans_keys[_mid]
+	           _lower = _mid + 1
+	        else
+	           _trans += (_mid - _keys)
+	           _break_match = true
+	           break
+	        end
+	     end # loop
+	     break if _break_match
+	     _keys += _klen
+	     _trans += _klen
+	  end
+	  _klen = _html_string_lexer_range_lengths[cs]
+	  if _klen > 0
+	     _lower = _keys
+	     _upper = _keys + (_klen << 1) - 2
+	     loop do
+	        break if _upper < _lower
+	        _mid = _lower + (((_upper-_lower) >> 1) & ~1)
+	        if data[p] < _html_string_lexer_trans_keys[_mid]
+	          _upper = _mid - 2
+	        elsif data[p] > _html_string_lexer_trans_keys[_mid+1]
+	          _lower = _mid + 2
+	        else
+	          _trans += ((_mid - _keys) >> 1)
+	          _break_match = true
+	          break
+	        end
+	     end # loop
+	     break if _break_match
+	     _trans += _klen
+	  end
+	end while false
+	_trans = _html_string_lexer_indicies[_trans]
+	end
+	if _goto_level <= _eof_trans
+	cs = _html_string_lexer_trans_targs[_trans]
+	if _html_string_lexer_trans_actions[_trans] != 0
+		_acts = _html_string_lexer_trans_actions[_trans]
+		_nacts = _html_string_lexer_actions[_acts]
+		_acts += 1
+		while _nacts > 0
+			_nacts -= 1
+			_acts += 1
+			case _html_string_lexer_actions[_acts - 1]
+when 2 then
+# line 1 "NONE"
+		begin
+te = p+1
+		end
+when 3 then
+# line 12 "html_string_parser.rl"
+		begin
+act = 1;		end
+when 4 then
+# line 13 "html_string_parser.rl"
+		begin
+act = 2;		end
+when 5 then
+# line 14 "html_string_parser.rl"
+		begin
+act = 3;		end
+when 6 then
+# line 15 "html_string_parser.rl"
+		begin
+act = 4;		end
+when 7 then
+# line 16 "html_string_parser.rl"
+		begin
+act = 5;		end
+when 8 then
+# line 16 "html_string_parser.rl"
+		begin
+te = p
+p = p - 1; begin  puts "\t =>string"  end
+		end
+when 9 then
+# line 1 "NONE"
+		begin
+	case act
+	when 1 then
+	begin begin p = ((te))-1; end
+ puts "\t =><BR>" end
+	when 2 then
+	begin begin p = ((te))-1; end
+ puts "\t =><FONT>...</FONT>"end
+	when 3 then
+	begin begin p = ((te))-1; end
+ puts "\t =><FONT>"end
+	when 4 then
+	begin begin p = ((te))-1; end
+ puts "\t =></FONT>"end
+	when 5 then
+	begin begin p = ((te))-1; end
+ puts "\t =>string" end
+end 
+			end
+# line 365 "html_string_parser.rb"
+			end # action switch
+		end
+	end
+	if _trigger_goto
+		next
+	end
+	end
+	if _goto_level <= _again
+	_acts = _html_string_lexer_to_state_actions[cs]
+	_nacts = _html_string_lexer_actions[_acts]
+	_acts += 1
+	while _nacts > 0
+		_nacts -= 1
+		_acts += 1
+		case _html_string_lexer_actions[_acts - 1]
+when 0 then
+# line 1 "NONE"
+		begin
+ts = nil;		end
+# line 385 "html_string_parser.rb"
+		end # to state action switch
+	end
+	if _trigger_goto
+		next
+	end
+	p += 1
+	if p != pe
+		_goto_level = _resume
+		next
+	end
+	end
+	if _goto_level <= _test_eof
+	if p == eof
+	if _html_string_lexer_eof_trans[cs] > 0
+		_trans = _html_string_lexer_eof_trans[cs] - 1;
+		_goto_level = _eof_trans
+		next;
+	end
+end
+	end
+	if _goto_level <= _out
+		break
+	end
+	end
+	end
+
+# line 33 "html_string_parser.rl"
+end
+
+# ----------
+
+test "<BRRR ALIGN=\"LEFT\">"
+test "<BR ALIGN=\"LEFT\">"
+test "\\<BR ALIGN=\"LEFT\"\\>"
+test "simple test"
+test "<FONT COLOR=\"blue\">"
+test "</FONT>"
+test "<font>simple test</font>"

data/lib/src/html_string_parser.rl

@@ -0,0 +1,43 @@
+%%{
+
+  machine html_string_lexer;
+  
+  br_tag = '<'('br'|'BR')(space{1,}[^>]*)*'>';
+  font_open_tag = '<'('font'|'FONT')(space{1,}[^>]*)'>';
+  font_close_tag = '</font>'|'</FONT>';
+  font_tag = font_open_tag [^font_close_tag]* font_close_tag;
+  string = any*;
+  
+  main := |*
+    br_tag => { puts "\t =><BR>" };
+    font_tag => { puts "\t =><FONT>...</FONT>"};
+    font_open_tag => { puts "\t =><FONT>"};
+    font_close_tag => { puts "\t =></FONT>"};
+    string => { puts "\t =>string" };
+    space;
+  *|;  
+  
+}%%
+
+%% write data;
+
+# ---------- %
+
+def test( data )
+	puts "Check : #{data}"
+	data = data.unpack("c*") if(data.is_a?(String))
+	eof = data.length
+
+	%% write init;
+	%% write exec;
+end
+
+# ----------
+
+test "<BRRR ALIGN=\"LEFT\">"
+test "<BR ALIGN=\"LEFT\">"
+test "\\<BR ALIGN=\"LEFT\"\\>"
+test "simple test"
+test "<FONT COLOR=\"blue\">"
+test "</FONT>"
+test "<font>simple test</font>"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-graphviz
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 9
-  - 15
-  version: 0.9.15
+  - 16
+  version: 0.9.16
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -15,23 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 +02:00
+date: 2010-08-02 00:00:00 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: treetop
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
+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: 
@@ -39,6 +26,7 @@ executables:
 - gem2gv
 - dot2ruby
 - git2gv
+- xml2gv
 extensions: []
 
 extra_rdoc_files: 
@@ -54,6 +42,7 @@ files:
 - bin/gem2gv
 - bin/git2gv
 - bin/ruby2gv
+- bin/xml2gv
 - examples/dot/balanced.dot
 - examples/dot/cluster.dot
 - examples/dot/dotgraph.dot
@@ -140,7 +129,6 @@ files:
 - lib/graphviz/attrs.rb
 - lib/graphviz/constants.rb
 - lib/graphviz/core_ext.rb
-- lib/graphviz/dot.treetop
 - lib/graphviz/dot2ruby.rb
 - lib/graphviz/edge.rb
 - lib/graphviz/ext.rb
@@ -152,7 +140,6 @@ files:
 - lib/graphviz/node.rb
 - lib/graphviz/nothugly/nothugly.xsl
 - lib/graphviz/nothugly.rb
-- lib/graphviz/parser.rb
 - lib/graphviz/types/esc_string.rb
 - lib/graphviz/types/html_string.rb
 - lib/graphviz/types/lbl_string.rb
@@ -160,6 +147,9 @@ files:
 - lib/graphviz/utils.rb
 - lib/graphviz/xml.rb
 - lib/graphviz.rb
+- lib/src/html_string_parser.gv
+- lib/src/html_string_parser.rb
+- lib/src/html_string_parser.rl
 - test/support.rb
 - test/test_examples.rb
 - test/test_init.rb

data/lib/graphviz/dot.treetop

@@ -1,101 +0,0 @@
-grammar Dot
-	rule graph
-		space type:("graph" / "digraph") blank name:string space cluster:cluster space <GraphViz::Parser::Graph>
-	end
-	
-	rule cluster
-		"{" content:(preference / node / edge / subgraph)* "}" <GraphViz::Parser::Cluster>
-	end
-	
-	rule preference
-		graph_preference / named_graph_preference / node_preference / edge_preference
-	end
-	
-	rule graph_preference
-		space key:name blank "=" blank value:string separator <GraphViz::Parser::GraphPreference>
-	end
-	
-	rule named_graph_preference
-		space "graph" blank options:options? separator  <GraphViz::Parser::NamedGraphPreference>
-	end
-	
-	rule node_preference
-		space "node" blank options:options? separator <GraphViz::Parser::NodePreference>
-	end
-	
-	rule edge_preference
-		space "edge" blank options:options? separator <GraphViz::Parser::EdgePreference>
-	end
-	
-	rule node
-		space name:string blank options:options? separator <GraphViz::Parser::Node>
-	end
-	
-	rule edge
-		direct_edge / undirect_edge
-	end
-	
-	rule direct_edge
-		space node_one:string blank "->" blank node_two:string blank other_nodes:("->" blank next_node:string blank)* options:options? separator <GraphViz::Parser::Edge>
-	end
-	
-	rule undirect_edge
-		space node_one:string blank "--" blank node_two:string blank other_nodes:("--" blank next_node:string blank)* options:options? separator <GraphViz::Parser::Edge>
-	end
-	
-	rule subgraph
-		named_subgraph / anonymous_subgraph
-	end
-	
-	rule named_subgraph
-	  space "subgraph" blank name:string space cluster:cluster space <GraphViz::Parser::Subgraph>
-	end
-	
-	rule anonymous_subgraph
-	  space "subgraph" space cluster:cluster space <GraphViz::Parser::AnonymousSubgraph>
-	end
-	
-	rule options
-		"[" space (name blank "=" blank string comma space)* name blank "=" blank string space "]" <GraphViz::Parser::Options>
-	end
-	
-	rule string
-		name / quoted_string
-	end
-	
-	rule comma
-		space ","
-	end
-	
-	rule separator
-		blank ";" space
-	end
-	
-	rule quoted_string
-		'"' [^"]* '"'
-	end
-	
-	rule name
-		[a-zA-Z0-9_\.]+
-	end
-	
-	rule blank
-		[\ \t]*
-	end
-	
-	rule space
-    [\s\n\r\t]*
-  end
-
-	rule newline
-		CR LF
-	end
-	
-	rule CR
-    [\r]?
-	end
-	
-	rule LF
-		[\n]?
-	end
-end

data/lib/graphviz/parser.rb

@@ -1,288 +0,0 @@
-# Copyright (C) 2009, 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-require 'rubygems'
-require 'treetop'
-
-Treetop.load File.dirname(__FILE__) + '/dot.treetop'
-
-class GraphViz
-  class Parser
-
-    class Context
-      def initialize
-        @graph = nil
-        @nodes = {}
-        @edges = []
-        @options = {
-          :node => {},
-          :edge => {}
-        }
-      end
-      
-      def graph
-        @graph
-      end
-      
-      def graph=(g)
-        @graph = g
-      end
-      
-      def nodes
-        @nodes
-      end
-      
-      def edges
-        @edges
-      end
-      
-      def options
-        @options
-      end
-      
-      def options=(o)
-        @options = o
-      end
-    end
-    
-    class Graph < Treetop::Runtime::SyntaxNode
-      def eval( context, hOpts = [] )
-        # puts "GRAPH TYPE = #{type.text_value}"
-        # puts "GRAPH NAME = #{name.text_value}"
-        
-        begin
-          hOpts = hOpts[0].merge( {:type => type.text_value} )
-        rescue
-          hOpts = {:type => type.text_value}
-        end
-        
-        # Create Graph
-        context.graph = GraphViz.new( name.text_value.gsub(/"/, ""), hOpts )
-        
-        # Eval cluster
-        cluster.eval( context )
-        
-        return context.graph
-      end
-    end
-    
-    class Cluster < Treetop::Runtime::SyntaxNode
-      def eval( context )
-        content.elements.each do |e|
-          e.eval( context )
-        end
-      end
-    end
-    
-    class GraphPreference < Treetop::Runtime::SyntaxNode
-      def eval( context )
-        # puts "GRAPH PREFERENCE : "
-        # puts "  #{key.text_value} = #{value.text_value.gsub(/"/, "")}"
-        context.graph[key.text_value] = value.text_value.gsub(/"/, "")
-      end
-    end
-    
-    class NamedGraphPreference < Treetop::Runtime::SyntaxNode
-      def eval( context )
-        # puts "GRAPH PREFERENCES :"
-        options.eval().each do |k,v|
-          context.graph[k] = v
-        end
-      end
-    end
-    
-    class NodePreference < Treetop::Runtime::SyntaxNode
-      def eval( context )
-        # puts "NODE PREFERENCES :"
-        context.options[:node] = context.options[:node].merge( options.eval() )
-      end
-    end
-    
-    class EdgePreference < Treetop::Runtime::SyntaxNode
-      def eval( context )
-        # puts "EDGE PREFERENCES :"
-        context.options[:edge] = context.options[:edge].merge( options.eval() )
-      end
-    end
-    
-    class Node < Treetop::Runtime::SyntaxNode
-      def eval( context )
-        node_name = name.text_value.gsub( /"/, "" )
-        # puts "NODE NAME = #{node_name}"
-        # puts "OPTIONS = "
-        
-        # Create node
-        node = context.nodes[node_name] || context.graph.add_node( node_name )
-    
-        # Add global options
-        context.options[:node].each do |k, v|
-          node[k] = v
-        end
-        
-        # Add custom options
-        unless options.terminal?
-          options.eval().each do |k, v|
-            node[k] = v
-          end
-        end
-        
-        # Save node
-        context.nodes[node_name] = node
-      end
-    end
-    
-    class Edge < Treetop::Runtime::SyntaxNode
-      def create_node( name, context )
-        # puts "  NEED TO CREATE NODE : #{name}"
-        # Create the node
-        node = context.graph.add_node( name )
-        
-        # Add global options
-        context.options[:node].each do |k, v|
-          node[k] = v
-        end
-        
-        # Save node
-        context.nodes[name] = node
-      end
-      
-      def create_edge( one, two, edge_options, context )
-        # Create edge
-        edge = context.graph.add_edge( one, two )
-        
-        # Add global options
-        context.options[:edge].each do |k, v|
-          edge[k] = v
-        end
-        
-        # Add custom options
-        edge_options.each do |k, v|
-          edge[k] = v
-        end
-        
-        # Save edge
-        context.edges << edge
-      end
-      
-      def eval( context )
-        one_name = node_one.text_value.gsub( /"/, "" )
-        two_name = node_two.text_value.gsub( /"/, "" )
-        # puts "EDGE"
-        # puts "NODE ONE = #{one_name}"
-        # puts "NODE TWO = #{two_name}"
-        # puts "OPTIONS = "
-        
-        # Get or create node one
-        one = context.nodes[one_name] || create_node( one_name, context )
-    
-        # Get or create node two
-        two = context.nodes[two_name] || create_node( two_name, context )
-        
-        # Get options 
-        edge_options = {}
-        edge_options = options.eval() unless options.terminal?
-        
-        # Create edge
-        create_edge( one, two, edge_options, context )
-        
-        last_node = two
-        other_nodes.elements.each do |e|
-          new_node_name = e.next_node.text_value.gsub( /"/, "" )
-          # puts "OTHER NODE : #{new_node_name}"
-          
-          new_node = context.nodes[new_node_name] || create_node( new_node_name, context )
-          create_edge( last_node, new_node, edge_options, context )
-          
-          last_node = new_node
-        end
-      end
-    end
-    
-    class Subgraph < Treetop::Runtime::SyntaxNode
-      def eval( context )
-        # puts "CREATE SUBGRAPH : #{name.text_value}"
-        
-        # Save options
-        saved_options = context.options.clone
-        # Save graph 
-        saved_graph = context.graph
-        
-        # Create Graph
-        context.graph = context.graph.add_graph( name.text_value.gsub(/"/, "") )
-        #context.options = {
-        #  :node => {},
-        #  :edge => {}
-        #}
-        
-        # Eval cluster
-        cluster.eval( context )
-        
-        # Reinitialize graph and options
-        context.graph = saved_graph
-        context.options = saved_options
-      end
-    end
-    
-    class AnonymousSubgraph < Treetop::Runtime::SyntaxNode
-      def eval( context )
-        # puts "CREATE ANONYMOUS SUBGRAPH"
-        
-        # Save options
-        saved_options = context.options.clone
-        # Save graph 
-        saved_graph = context.graph
-        
-        # Create Graph
-        context.graph = context.graph.add_graph( )
-        #context.options = {
-        #  :node => {},
-        #  :edge => {}
-        #}
-        
-        # Eval cluster
-        cluster.eval( context )
-        
-        # Reinitialize graph and options
-        context.graph = saved_graph
-        context.options = saved_options
-      end
-    end
-    
-    class Options < Treetop::Runtime::SyntaxNode
-      def eval
-        options = {}
-        elements[2].elements.each do |e|
-          # puts "  #{e.elements[0].text_value} = #{e.elements[4].text_value}"
-          options[e.elements[0].text_value] = e.elements[4].text_value.gsub( /"/, "" )
-        end
-        # puts "  #{elements[3].text_value} = #{elements[7].text_value}"
-        options[elements[3].text_value] = elements[7].text_value.gsub( /"/, "" )
-        
-        return options
-      end
-    end
-
-    def self.parse( file, *hOpts, &block )
-      dot = open(file).read
-      parser = DotParser.new()
-      tree = parser.parse( dot )
-      graph = tree.eval( GraphViz::Parser::Context.new(), hOpts )
-      
-      yield( graph ) if( block and graph.nil? == false )
-      
-      return graph
-    end
-  end
-end