ruby-graphviz 1.0.3 → 1.0.4

data/README.rdoc

@@ -14,241 +14,6 @@ Interface to the GraphViz graphing tool
 
 * New FamilyTree
 
-== CHANGELOG
-
-=== 1.0.3 :
-* The GraphViz::Theory#moore_dijkstra return a path which contains GraphViz::Node instead of GraphViz::Node#id
-* Add Breadth First Search algorithm (GraphViz::Theory#bfs)
-* Add Depth First Search algorithm (GraphViz::Theory#dfs)
-* Add GraphViz#add_edges (GraphViz#add_edge is deprecated)
-* Add GraphViz#add_nodes (GraphViz#add_node is deprecated)
-* Add GraphViz::generate 
-* Remove definition of Array#all?
-
-=== 1.0.2 :
-* Add PageRank algorithm
-* Major bug corrections
-* Fix utils/colors.rb's case syntax
-* Modify deprecated method: Hash#index to Hash#key
-
-=== 1.0.1 : 
-* Add GraphViz::DSL
-* Change project to use Bundler gem tools
-* Fix a few typos in the README
-* Change Config to RbConfig
-* Add possibility to get the x,y coordinates of each of the nodes
-
-=== 1.0.0 : 
-* \o/
-* GraphViz::Node#name has been removed - use GraphViz::Node#id
-* The html attribute has been removed - use a label attribut (<tt>:label => '<<html/>>'</tt>)
-* :output option has been removed - use :<format> => :<file>
-* :file option has been removed - use :<format> => :<file>
-* Add GraphViz#to_s
-* Add GraphViz#add (see sample59.rb)
-* GraphViz::XML.output is deprecated, use GraphViz::XML.graph.output
-* Issue #22 : Error when generating a graph with an ID containing a space.
-
-=== 0.9.21 :
-* Add attributes "label_scheme" and "rotation"
-* Add missing options :
-  * <tt>:scale => v</tt> : Scale input by 'v' (=72)
-  * <tt>:inverty => [true|false]</tt> : Invert y coordinate in output
-  * <tt>:no_layout => v</tt> : No layout mode 'v' (=1) -- neato only
-  * <tt>:reduce => [true|false]</tt> : Reduce graph -- neato only
-  * <tt>:Lg => [true|false]</tt> : Don't use grid -- fdp only
-  * <tt>:LO => [true|false]</tt> : Use old attractive force -- fdp only
-  * <tt>:Ln => i</tt> : Set number of iterations to i -- fdp only
-  * <tt>:LU => i</tt> : Set unscaled factor to i -- fdp only
-  * <tt>:LC => v</tt> : Set overlap expansion factor to v -- fdp only
-  * <tt>:LT => [*]v</tt> : Set temperature (temperature factor) to v -- fdp only
-
-=== 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")
-    # or 
-    g = GraphViz.new(:G, :type => "digraph", :strict => true)
-    # or 
-    g = GraphViz.digraph(:G, :strict => true)
-    # or 
-    g = GraphViz.strict_digraph(:G)
-* Add GraphViz#root_graph, Node#root_graph, Edge#root_graph
-* The GraphML parser now accept a graphml file or string
-
-=== 0.9.18 :
-* JRuby bug correction (by Nigel Thorne)
-* Fix autoload problem for Rubinius (by Rolf Timmermans)
-* Bugs corrections
-
-=== 0.9.17 :
-* GraphViz::Edge#node_one and GraphViz::Edge#node_one now have un optional parameter to indicate if you want to (or not) get the port in the name (default: true)
-* GraphViz#each_node now returns the Hash of nodes if there is no block given.
-* GraphViz#each_edge now returns the list of edges if there is no block given.
-* GraphViz#each_graph now returns the Hash of graphs if there is no block given.
-* Add GraphViz::Node#index : return the node index
-* Add GraphViz::Edge#index : return the edge index
-* Add GraphViz#type : return the graph type (graph or digraph)
-* Add GraphViz#get_edge_at_index and GraphViz#get_node_at_index
-* Add GvDouble 
-* Add GraphViz::Theory (see examples/theory/tests.rb)
-* Add GraphML[http://graphml.graphdrawing.org/] support (see sample57.rb)
-* fixed "edge attribut 'to_ary' invalid" on mri 1.9.2 (by Stefan Huber)
-
-=== 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>
-* Add <tt>--output-format</tt> option to <tt>dot2ruby</tt>
-* Add <tt>git2gv</tt>
-* Issue #16 : escape graph ID
-
-=== 0.9.14 :
-* Add dot2ruby script
-* Remove NULL character in the DOT script
-* <b>WARNING</b> : FamilyTree is (still) broken in this version !
-
-=== 0.9.13 :
-* Add dot2ruby.g
-* Bug correction with HTML label
-* The html attribut is deprecated. You can use the label attribut, as dot do it : <tt>:label => '<<html/>>'</tt>
-* Issue #15 : Thin server
-* <b>WARNING</b> : FamilyTree is (still) broken in this version !
-
-=== 0.9.12 :
-* GraphViz::Node#name is deprecated, you must use GraphViz::Node#id (issue #14)
-* Add :nothugly option to GraphViz#output (see sample41.rb and http://www.hokstad.com/making-graphviz-output-pretty-with-xsl.html)
-* Issue #13 : you must now specify a port in GraphViz::Edge.new with a syntax like this : 
-    GraphViz::Edge.new( {nodeOne => :port}, {nodeTwo => :other} )
-* Issue #12 : UTF8 support (see sample38.rb)
-* Move and rename examples + remove maketest.[sh|bat]
-* <b>WARNING</b> : FamilyTree is broken in this version !
-
-=== 0.9.11 :
-* Issue #11 : Cygwin PATH
-* Major bugs correction in output
-* Bug correction in find_executable
-* Add tests (by Chip Malice : http://github.com/hipe)
-
-=== 0.9.10 :
-* Move ChangeLog in README
-* Add GraphViz::FamilyTree (alpha). See examples/sample33.rb
-* Major bugs corrections in GraphViz::Parser
-* Issue #10 : Anonymous graph (see Subgraphs and Clusters at http://www.graphviz.org/doc/info/lang.html). See examples/sample34.rb
-* GraphViz#add_graph can now take a block parameter. See example/sample34.rb
-* Add GraphViz.digraph and GraphViz.graph (same as GraphViz.new( ..., :type => "digraph" ) and GraphViz.new( ..., :type => "graph" )). See examples/sample35.rb
-* Add GraphViz#subgraph. See examples/sample35.rb
-* GraphViz::Parser support anonymous graph
-* Add lage node example. See examples/sample36.rb
-
-=== 0.9.9 :
-* Add graph as an accessor to allow you to set global graph attributs (like edge and node)
-* Add each_node, each_edge, each_graph (thanks to @metellius) and graph_count
-* Issue #9 (partial) - Solution : by default, a node will have his label set with the node ID)
-
-=== 0.9.8 :
-* Update graph and node posibility to set properties (see sample28.rb)
-* Issue #7: Path option is never being used to find the executable
-* Adding classes to check if the attributes are in the correct type
-* Issue #8: dots in href are escaped with backslash, which corrupts the URL (see sample29.rb)
-* Add posibility to use external libraries (see sample30.rb)
-* Add options -u and -s to ruby2gv
-* Add gem2gv
-
-=== 0.9.7 :
-* Issue #2: Small bug correction in escape_path_containing_blanks (by Andreas Ronge)
-* Issue #4: New find_executable (by reactive)
-* Issue #3: Tempfiles created in current working directory only in Windows
-* Issue #6: Respect "none" format in output options hash and respect String output-filename when the "none" format is selected. See examples/sample27.rb (by Dave Burt)
-
-=== 0.9.6 :
-* jRuby support (by obruening)
-* Issue #1 : STDOUT in binmode
-
-=== 0.9.5 :
-* Remove 'mkmf' dependency
-* GraphViz::Edge#[] modification
-* Small correction to escape the dot ('.') character (by Miguel Cabrera)
-
-=== 0.9.4 :
-* Escape nodes and edges attributs
-* GraphViz::escape corrections (by Dave Burt)
-* Add :errors option to set level of message suppression (default : suppress warning messages)
-
-=== 0.9.3 :
-* Minor bug correction for Windows
-* Use Open3.popen3 if installed, else use IO.popen (by Dave Burt)
-* Add '-', '>' and '>>' has aliases of '<<' to create an edge.
-
-=== 0.9.2 :
-* Escape nodes (by Dave Burt)
-* Handle errors from graphviz command (by Dave Burt)
-* Output as string (if String class is passed as file i.e. output(:pdf => String)) (by Dave Burt)
-
-=== 0.9.1 :
-* Bugs corrections
-* Add the ability to create edge like that : node1 << node2 << node3 ...
-* Complete README
-* Add a DOT parser. This parser has a lot of limitations. So don't use it in a production context !
-* :output and :file options are deprecated, please use :<format> => :<file>
-* You can now specify multiple outputs via :<format> => :<file> (see sample 22).
-
-=== 0.9.0 :
-* Add fdp example (sample 15)
-* Add edge between cluster and node and cluster and cluster support
-* GraphViz.add_node now support array (sample 16)
-* Bug correction in GraphViz.output (sample 19)
-* Add GraphViz#default to set default options (:use, :path and :output)
-* Add possibility to set node or edge attribut via :
-    node.<attribut>=<value> or node.<attribut>( <value> )
-    edge.<attribut>=<value> or edge.<attribut>( <value> )
-* Add GraphViz::Edge.set and GraphViz::Node.set
-* Add sample 20
-* Add GraphViz.node_count and GraphViz.edge_count by Daniel Cadenas Nión
-
-=== 0.8.2 : 
-* Update Node, Edge and Graph Attributes (see http://www.graphviz.org/doc/info/attrs.html)
-* Bugs corrections
-
-=== 0.8.1 :
-* Documentation
-
-=== 0.8.0 :
-* Add all the features of the current graphviz version
-
-=== 0.7.0 :
-* Add option "path" to output
-
-=== 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
-
 == SYNOPSIS
 
 A basic example
@@ -259,11 +24,11 @@ A basic example
   g = GraphViz.new( :G, :type => :digraph )
 
   # Create two nodes
-  hello = g.add_node( "Hello" )
-  world = g.add_node( "World" )
+  hello = g.add_nodes( "Hello" )
+  world = g.add_nodes( "World" )
 
   # Create an edge between the two nodes
-  g.add_edge( hello, world )
+  g.add_edges( hello, world )
 
   # Generate output image
   g.output( :png => "hello_world.png" )
@@ -333,9 +98,9 @@ Ruby/GraphViz also includes :
     require 'graphviz'
     graph_g = GraphViz.digraph( "G" ) { |graph_g|
       graph_g[:bb] = '0,0,70,108'
-      node_hello = graph_g.add_node( "Hello", :height => '0.5', :label => '\N', :pos => '35,90', :width => '0.88889' )
-      graph_g.add_edge( "Hello", "World", :pos => 'e,35,36.413 35,71.831 35,64.131 35,54.974 35,46.417' )
-      node_world = graph_g.add_node( "World", :height => '0.5', :label => '\N', :pos => '35,18', :width => '0.97222' )
+      node_hello = graph_g.add_nodes( "Hello", :height => '0.5', :label => '\N', :pos => '35,90', :width => '0.88889' )
+      graph_g.add_edges( "Hello", "World", :pos => 'e,35,36.413 35,71.831 35,64.131 35,54.974 35,46.417' )
+      node_world = graph_g.add_nodes( "World", :height => '0.5', :label => '\N', :pos => '35,18', :width => '0.97222' )
     }
     puts graph_g.output( :canon => String )
 

data/Rakefile

@@ -27,7 +27,7 @@ RDoc::Task.new do |rdoc|
     rdoc.options += RDOC_OPTS
     rdoc.main = "README.rdoc"
     rdoc.title = "Ruby/GraphViz, the Documentation"
-    rdoc.rdoc_files.add ['README.rdoc', 'AUTHORS', 'COPYING',
+    rdoc.rdoc_files.add ['README.rdoc', 'CHANGELOG.rdoc', 'AUTHORS.rdoc', 'COPYING.rdoc',
       'lib/graphviz.rb', 
       'lib/graphviz/node.rb',
       'lib/graphviz/edge.rb',

data/examples/dot/test_parse.rb

@@ -4,7 +4,7 @@ $:.unshift( "../../lib" );
 require "graphviz"
 
 Dir.glob( "*.dot" ) { |f|
-  print "#{f} : "
+  puts "#{f} : "
   begin
     puts GraphViz.parse(f)
   rescue SyntaxError => e

data/examples/sample15.rb

@@ -6,7 +6,7 @@
 $:.unshift( "../lib" );
 require "graphviz"
 
-GraphViz::new( "G", :type => "graph", :use => "fdp" ) { |graph|
+g = GraphViz::new( "G", :type => "graph", :use => "fdp" ) { |graph|
   graph.e
   graph.clusterA { |cA|
     cA.a << cA.b
@@ -20,4 +20,6 @@ GraphViz::new( "G", :type => "graph", :use => "fdp" ) { |graph|
   graph.clusterB.d << graph.clusterA.clusterC._d
   graph.e << graph.clusterB
   graph.clusterA.clusterC << graph.clusterB
-}.output( :path => '/usr/local/bin/', :png => "#{$0}.png" )
+}
+
+g.output( :path => '/usr/local/bin/', :png => "#{$0}.png" )

data/examples/sample69.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../lib" );
+require "graphviz"
+
+g = GraphViz::new( "G", :type => "graph" )
+g[:compound] = true
+g[:rankdir] = "LR"
+
+c0 = g.add_graph( "cluster0", "label" => "cluster #1"  )
+a0 = c0.add_nodes( "a0" )
+
+c1 = g.add_graph( "cluster1", "label" => "cluster #2" )
+b0 = c1.add_nodes( "b0" )
+
+e1 = g.add_edges(a0,b0)
+e1[:lhead] = c1.id
+e1[:ltail] = c0.id
+
+e2 = g.add_edges(a0,b0)
+e2[:lhead] = c1.id
+
+g.output( :png => "#{$0}.png" )

data/lib/graphviz/attrs.rb

@@ -14,15 +14,18 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
+class AttributeException < RuntimeError
+end
+
 class GraphViz
    class Attrs
       attr_accessor :data
 
-      def initialize( gviz, name, attributs )
-         @name      = name
-         @attributs = attributs
-         @data      = Hash::new( )
-         @graphviz  = gviz
+      def initialize( gviz, name, attributes )
+         @name       = name
+         @attributes = attributes
+         @data       = Hash::new( )
+         @graphviz   = gviz
       end
 
       def each
@@ -49,14 +52,21 @@ class GraphViz
       end
 
       def []=( key, value )
-         unless @attributs.keys.include?( key.to_s )
-            raise ArgumentError, "#{@name} attribut '#{key.to_s}' invalid"
+         unless @attributes.keys.include?( key.to_s )
+            raise ArgumentError, "#{@name} attribute '#{key.to_s}' invalid"
          end
 
-         @data[key.to_s] = GraphViz::Types.const_get(@attributs[key.to_s]).new( value )
+         begin
+            value = GraphViz::Types.const_get(@attributes[key.to_s]).new( value )
+         rescue => e
+            raise AttributeException, "Invalide value `#{value}` for attribute `#{key}` : #{e}"
+         end
+         unless value.nil?
+            @data[key.to_s] = value
 
-         if @graphviz.nil? == false
-            @graphviz.set_position( @name, key.to_s, @data[key.to_s] )
+            if @graphviz.nil? == false
+               @graphviz.set_position( @name, key.to_s, @data[key.to_s] )
+            end
          end
       end
    end

data/lib/graphviz/constants.rb

@@ -40,7 +40,7 @@
 #   C => cluster
 #
 module Constants
-  RGV_VERSION = "1.0.3"
+  RGV_VERSION = "1.0.4"
   
   ## Const: Output formats
   FORMATS = [
@@ -276,12 +276,12 @@ module Constants
     "z"                   => { :usedBy => "N",    :type => :GvDouble }
   }
 
-  ## Const: Graph attributs
+  ## Const: Graph attributes
   GRAPHSATTRS = Constants::getAttrsFor( /G|S|C/ )
 
-  ## Const: Node attributs
+  ## Const: Node attributes
   NODESATTRS = Constants::getAttrsFor( /N/ )
 
-  ## Const: Edge attributs
+  ## Const: Edge attributes
   EDGESATTRS = Constants::getAttrsFor( /E/ )
 end

data/lib/graphviz/edge.rb

@@ -32,7 +32,7 @@ class GraphViz
          @node_two_id, @node_two_port = getNodeNameAndPort( vNodeTwo )
 
          @parent_graph = parent_graph
-         @edge_attributs = GraphViz::Attrs::new( nil, "edge", EDGESATTRS )
+         @edge_attributes = GraphViz::Attrs::new( nil, "edge", EDGESATTRS )
          @index = nil
 
          unless @parent_graph.directed? 
@@ -71,23 +71,23 @@ class GraphViz
          @index = i if @index == nil
       end
 
-      # Set value +attribut_value+ to the edge attribut +attribut_name+
-      def []=( attribut_name, attribut_value )
-         attribut_value = attribut_value.to_s if attribut_value.class == Symbol
-         @edge_attributs[attribut_name.to_s] = attribut_value
+      # Set value +attribute_value+ to the edge attribute +attribute_name+
+      def []=( attribute_name, attribute_value )
+         attribute_value = attribute_value.to_s if attribute_value.class == Symbol
+         @edge_attributes[attribute_name.to_s] = attribute_value
       end
 
-      # Set values for edge attributs or 
-      # get the value of the given edge attribut +attribut_name+
-      def []( attribut_name )
+      # Set values for edge attributes or 
+      # get the value of the given edge attribute +attribute_name+
+      def []( attribute_name )
          # Modification by axgle (http://github.com/axgle)
-         if Hash === attribut_name
-            attribut_name.each do |key, value|
+         if Hash === attribute_name
+            attribute_name.each do |key, value|
                self[key] = value
             end
          else
-            if @edge_attributs[attribut_name.to_s]
-               @edge_attributs[attribut_name.to_s].clone 
+            if @edge_attributes[attribute_name.to_s]
+               @edge_attributes[attribute_name.to_s].clone 
             else
                nil
             end
@@ -95,13 +95,13 @@ class GraphViz
       end
 
       #
-      # Calls block once for each attribut of the edge, passing the name and value to the 
+      # Calls block once for each attribute 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
+      # If global is set to false, the block does not receive the attributes set globally
       #
-      def each_attribut(global = true, &b)
-         attrs = @edge_attributs.to_h
+      def each_attribute(global = true, &b)
+         attrs = @edge_attributes.to_h
          if global
             attrs = pg.edge.to_h.merge attrs
          end
@@ -109,6 +109,10 @@ class GraphViz
             yield(k,v)
          end
       end
+      def each_attribut(global = true, &b)
+         warn "`GraphViz::Edge#each_attribut` is deprecated, please use `GraphViz::Edge#each_attribute`"
+         each_attribute(global, &b)
+      end
 
       def <<( node ) #:nodoc:
          n = @parent_graph.get_node(@node_two_id)
@@ -130,7 +134,7 @@ class GraphViz
          @parent_graph
       end
 
-      # Set edge attributs
+      # Set edge attributes
       #
       # Example :
       #   e = graph.add_edges( ... )
@@ -161,7 +165,7 @@ class GraphViz
          xOut = self.node_one + xLink + self.node_two
          xAttr = ""
          xSeparator = ""
-         @edge_attributs.data.each do |k, v|
+         @edge_attributes.data.each do |k, v|
             xAttr << xSeparator + k + " = " + v.to_gv
             xSeparator = ", "
          end

data/lib/graphviz/graphml.rb

@@ -20,7 +20,11 @@ require 'rexml/document'
 
 class GraphViz
   class GraphML
-    attr_reader :attributs
+    attr_reader :attributes
+    def attributs
+       warn "`GraphViz::GraphML#attributs` is deprecated, please, use `GraphViz::GraphML#attributes`"
+       return @attributes
+    end
     
     # The GraphViz object
     attr_accessor :graph
@@ -41,7 +45,7 @@ class GraphViz
     def initialize( file_or_str )
       data = ((File.file?( file_or_str )) ? File::new(file_or_str) : file_or_str) 
       @xmlDoc = REXML::Document::new( data )
-      @attributs = {
+      @attributes = {
         :nodes => {},
         :edges => {},
         :graphs => {}
@@ -80,7 +84,7 @@ class GraphViz
         :type => node.attributes['attr.type']
       }    
       DEST[node.attributes['for']].each do |d|
-        @attributs[d][id] = @current_attr
+        @attributes[d][id] = @current_attr
       end
       
       node.each_element( ) do |child|
@@ -110,13 +114,13 @@ class GraphViz
         @current_graph = previous_graph.add_graph( node.attributes['id'] )
       end
       
-      @attributs[:graphs].each do |id, data|
+      @attributes[:graphs].each do |id, data|
         @current_graph.graph[data[:name]] = data[:default] if data.has_key?(:default)
       end
-      @attributs[:nodes].each do |id, data|
+      @attributes[:nodes].each do |id, data|
         @current_graph.node[data[:name]] = data[:default] if data.has_key?(:default)
       end
-      @attributs[:edges].each do |id, data|
+      @attributes[:edges].each do |id, data|
         @current_graph.edge[data[:name]] = data[:default] if data.has_key?(:default)
       end
           
@@ -132,7 +136,7 @@ class GraphViz
     end
     
     def graphml_graph_data( node ) #:nodoc:
-      @current_graph[@attributs[:graphs][node.attributes['key']][:name]] = node.texts().to_s
+      @current_graph[@attributes[:graphs][node.attributes['key']][:name]] = node.texts().to_s
     end
     
     def graphml_graph_node( node ) #:nodoc:
@@ -162,7 +166,8 @@ class GraphViz
     end
     
     def graphml_graph_node_data( node ) #:nodoc:
-      @current_node[@attributs[:nodes][node.attributes['key']][:name]] = node.texts().to_s
+      #@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',)
     end
     
     def graphml_graph_node_port( node ) #:nodoc:
@@ -196,7 +201,7 @@ class GraphViz
     end
   
     def graphml_graph_edge_data( node ) #:nodoc:
-      @current_edge[@attributs[:edges][node.attributes['key']][:name]] = node.texts().to_s
+      @current_edge[@attributes[:edges][node.attributes['key']][:name]] = node.texts().to_s
     end
     
     def graphml_graph_hyperedge( node ) #:nodoc:

data/lib/graphviz/node.rb

@@ -35,7 +35,7 @@ class GraphViz
          @incidents = []
          @node_id = node_id
          @parent_graph = parent_graph
-         @node_attributs = GraphViz::Attrs::new( nil, "node", NODESATTRS )
+         @node_attributes = GraphViz::Attrs::new( nil, "node", NODESATTRS )
          @index = nil
       end
 
@@ -57,30 +57,30 @@ class GraphViz
          return( (self.pg.nil?) ? nil : self.pg.root_graph )
       end
 
-      # Set value +attribut_value+ to the node attribut +attribut_name+
-      def []=( attribut_name, attribut_value )
-         attribut_value = attribut_value.to_s if attribut_value.class == Symbol
-         @node_attributs[attribut_name.to_s] = attribut_value
+      # Set value +attribute_value+ to the node attribute +attribute_name+
+      def []=( attribute_name, attribute_value )
+         attribute_value = attribute_value.to_s if attribute_value.class == Symbol
+         @node_attributes[attribute_name.to_s] = attribute_value
       end
 
-      # Get the value of the node attribut +attribut_name+
-      def []( attribut_name )
-         if Hash === attribut_name
-            attribut_name.each do |key, value|
+      # Get the value of the node attribute +attribute_name+
+      def []( attribute_name )
+         if Hash === attribute_name
+            attribute_name.each do |key, value|
                self[key] = value
             end
             return self
          else
-            (@node_attributs[attribut_name.to_s].nil?)?nil:@node_attributs[attribut_name.to_s].clone
+            (@node_attributes[attribute_name.to_s].nil?)?nil:@node_attributes[attribute_name.to_s].clone
          end
       end
 
-      # Calls block once for each attribut of the node, passing the name and value to the 
+      # Calls block once for each attribute 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 = @node_attributs.to_h
+      # If global is set to false, the block does not receive the attributes set globally
+      def each_attribute(global = true, &b)
+         attrs = @node_attributes.to_h
          if global
             attrs = pg.node.to_h.merge attrs
          end
@@ -88,6 +88,10 @@ class GraphViz
             yield(k,v)
          end
       end
+      def each_attribut(global = true, &b)
+         warn "`GraphViz::Node#each_attribut` is deprecated, please use `GraphViz::Node#each_attribute`"
+         each_attribute(global, &b)
+      end
 
       # Create an edge between the current node and the node +node+
       def <<( node )
@@ -103,7 +107,7 @@ class GraphViz
       alias :- :<<
       alias :>> :<<
 
-      # Set node attributs
+      # Set node attributes
       #
       # Example :
       #   n = graph.add_nodes( ... )
@@ -138,10 +142,10 @@ class GraphViz
          xAttr = ""
          xSeparator = ""
 
-         if @node_attributs.data.has_key?("label") and @node_attributs.data.has_key?("html")
-            @node_attributs.data.delete("label")
+         if @node_attributes.data.has_key?("label") and @node_attributes.data.has_key?("html")
+            @node_attributes.data.delete("label")
          end
-         @node_attributs.data.each do |k, v|
+         @node_attributes.data.each do |k, v|
             xAttr << xSeparator + k + " = " + v.to_gv
             xSeparator = ", "
          end

data/lib/graphviz/types/color.rb

@@ -11,6 +11,8 @@ class GraphViz
 
       def check(data)
         data = data.to_s if data.is_a?(Symbol)
+        return nil if data.empty?
+
         if data[0].chr == "#"
           m = RGBA.match(data)
           if m.nil?

data/lib/graphviz/types/color_list.rb

@@ -3,6 +3,8 @@ class GraphViz
     class ColorList < Common
       def check(data)
         data = data.to_s if data.is_a?(Symbol)
+        return nil if data.empty?
+
         @to_ruby = data.split(/\s*:\s*/).map { |c| GraphViz::Types::Color.new(c).to_ruby }
         return data
       end