ruby-graphviz 0.9.7 → 0.9.8

data/lib/graphviz/edge.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2006, 2007, 2008 Gregoire Lejeune <gregoire.lejeune@free.fr>
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 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
@@ -124,7 +124,7 @@ class GraphViz
       xAttr = ""
       xSeparator = ""
       @oAttrEdge.data.each do |k, v|
-        xAttr << xSeparator + k + " = " + GraphViz.escape(v, true)
+        xAttr << xSeparator + k + " = " + v.to_gv
         xSeparator = ", "
       end
       if xAttr.length > 0

data/lib/graphviz/node.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2006, 2007, 2008 Gregoire Lejeune <gregoire.lejeune@free.fr>
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 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
@@ -56,7 +56,13 @@ class GraphViz
     # Get the value of the node attribut +xAttrName+
     # 
     def []( xAttrName )
-      @oAttrNode[xAttrName.to_s].clone
+      if Hash === xAttrName
+        xAttrName.each do |key, value|
+          self[key] = value
+        end
+      else
+        @oAttrNode[xAttrName.to_s].clone
+      end
     end
 
     # 
@@ -112,9 +118,9 @@ class GraphViz
       xSeparator = ""
       @oAttrNode.data.each do |k, v|
 	      if k == "html"
-		      xAttr << xSeparator + "label = <" + v + ">"
+		      xAttr << xSeparator + "label = " + v.to_gv
 		    else
-          xAttr << xSeparator + k + " = " + GraphViz.escape(v, true)
+          xAttr << xSeparator + k + " = " + v.to_gv
 		    end
         xSeparator = ", "
       end

data/lib/graphviz/parser.rb

@@ -1,3 +1,18 @@
+# Copyright (C) 2009 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'
 

data/lib/graphviz/types.rb

@@ -0,0 +1,21 @@
+class GraphViz
+  class Types
+    class Common
+      def initialize( data )
+        @data = check(data)
+      end
+      
+      def output
+        return @data
+      end
+    end
+    
+    Dir.glob( File.dirname( File.expand_path(__FILE__) )+"/types/*" ).each do |f|
+      autoload File.basename(f).gsub(File.extname(f), "").split( "_" ).map{|n| n.capitalize }.join.to_sym, f
+    end
+  end
+end
+
+#x = :EscString
+#GraphViz::Types.const_get(x).new( "toto" )
+

data/lib/graphviz/types/esc_string.rb

@@ -0,0 +1,29 @@
+# >> x = "hello\n\t\\l\"world\""
+# => "hello\n\t\\l\"world\""
+# >> puts x.inspect.gsub( "\\\\", "\\" )
+# "hello\n\t\l\"world\""
+#
+# OR
+# 
+# >> x = 'hello\n\t\l"world"'
+# => "hello\\n\\t\\l\"world\""
+# >> puts x.inspect.gsub( "\\\\", "\\" )
+# "hello\n\t\l\"world\""
+
+
+class GraphViz
+  class Types
+    class EscString < Common
+      def check(data)
+        return data
+      end
+      
+      def output
+        return @data.to_s.inspect.gsub( "\\\\", "\\" )
+      end
+      
+      alias :to_gv :output
+      alias :to_s :output
+    end
+  end
+end

data/lib/graphviz/types/html_string.rb

@@ -0,0 +1,16 @@
+class GraphViz
+  class Types
+    class HtmlString < Common
+      def check(data)
+        return data
+      end
+      
+      def output
+        return "<"+@data+">"
+      end
+      
+      alias :to_gv :output
+      alias :to_s :output
+    end
+  end
+end

data/lib/graphviz/xml.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2006, 2007, 2008 Gregoire Lejeune <gregoire.lejeune@free.fr>
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 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

data/test/test_init.rb

@@ -0,0 +1,46 @@
+require 'test/unit'
+$:.unshift("../lib")
+require 'graphviz'
+
+class GraphVizTest < Test::Unit::TestCase
+  def setup
+    @graph = GraphViz::new( :G )    
+  end
+
+  # def teardown
+  # end
+
+  def test_graph
+    assert(@graph, 'Create graph faild.')
+    
+    assert_block 'Set attribut for graph faild.' do
+      @graph['size'] = "10,10"
+    end
+    
+    assert_equal( "\"10,10\"", @graph['size'].to_s, 'Get attribut for graph faild.' )
+    
+    assert_equal( "G", @graph.name, "Wrong graph name." )
+  end
+
+  def test_node
+    n, m = nil, nil
+    
+    assert_block 'Create node failed.' do
+      n = @graph.add_node( "n1" )
+    end
+
+    assert_block 'Get node failed.' do    
+      m = @graph.get_node( "n1" )
+    end
+
+    assert_equal( m, n, "Node corrupted when get." )
+    
+    assert_equal( @graph.node_count, 1, "Wrong number of nodes" )
+    
+    assert_block 'Set attribut for node faild.' do
+      n['label'] = "Hello\n\"world\"\\l"
+    end
+    
+    assert_equal( "\"Hello\\n\\\"world\\\"\\l\"", n['label'].to_s, 'Get attribut for node faild.' )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-graphviz
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 +01:00
+date: 2010-01-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,6 +26,7 @@ description: Ruby/Graphviz provides an interface to layout and generate images o
 email: gregoire.lejeune@free.fr
 executables: 
 - ruby2gv
+- gem2gv
 extensions: []
 
 extra_rdoc_files: 
@@ -39,6 +40,7 @@ files:
 - README.rdoc
 - AUTHORS
 - setup.rb
+- bin/gem2gv
 - bin/ruby2gv
 - examples/arrowhead.rb
 - examples/dot/cluster.dot
@@ -59,6 +61,7 @@ files:
 - examples/graphviz.org/process.rb
 - examples/graphviz.org/TrafficLights.rb
 - examples/HTML-Labels.rb
+- examples/maketest.bat
 - examples/maketest.sh
 - examples/p2p.rb
 - examples/sample01.rb
@@ -88,6 +91,12 @@ files:
 - examples/sample25.rb
 - examples/sample26.rb
 - examples/sample27.rb
+- examples/sample28.rb
+- examples/sample29.rb
+- examples/sample30.rb
+- examples/sdlshapes/README
+- examples/sdlshapes/sdl.ps
+- examples/sdlshapes/sdlshapes.dot
 - examples/shapes.rb
 - examples/test.xml
 - examples/testorder.rb
@@ -98,8 +107,12 @@ files:
 - lib/graphviz/edge.rb
 - lib/graphviz/node.rb
 - lib/graphviz/parser.rb
+- lib/graphviz/types/esc_string.rb
+- lib/graphviz/types/html_string.rb
+- lib/graphviz/types.rb
 - lib/graphviz/xml.rb
 - lib/graphviz.rb
+- test/test_init.rb
 has_rdoc: true
 homepage: http://raa.ruby-lang.org/project/ruby-graphviz/
 licenses: []