ruby-graphviz 0.9.21 → 1.0.0

data/README.rdoc

@@ -1,6 +1,6 @@
 = Ruby/GraphViz
 
-Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Gregoire Lejeune
+Copyright (C) 2004-2011 Gregoire Lejeune
 
 * Doc : http://rdoc.info/projects/glejeune/Ruby-Graphviz
 * Sources : http://github.com/glejeune/Ruby-Graphviz
@@ -19,12 +19,23 @@ Interface to the GraphViz graphing tool
 <b>We are close to the 1.0 version... So if you use one of the following method or attribut, please update your code because they will be remove.</b>
 
 * GraphViz::Node#name must be replaced by GraphViz::Node#id
-* A html attribut must be replaced by a label attribut (<tt>:label => '<<html/>>'</tt>)
+* The html attribut must be replaced by a label attribut (<tt>:label => '<<html/>>'</tt>)
 * :output option must be replaced by :<format> => :<file>
 * :file option must be replaced by :<format> => :<file>
 
 == CHANGELOG
 
+=== 1.0.0 : 
+* \o/
+* GraphViz::Node#name has been removed - use GraphViz::Node#id
+* The html attribut 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 attributs "label_scheme" and "rotation"
 * Add missing options :

data/bin/xml2gv

@@ -93,4 +93,4 @@ if xFile.nil? == true
 end
 
 gvxml = GraphViz::XML::new( xFile, :text => true, :attrs => true )
-gvxml.output( xOutFormat => xOutFile, :path => xGVPath )
+gvxml.graph.output( xOutFormat => xOutFile, :path => xGVPath )

data/examples/dot/JSP.dot

@@ -0,0 +1,52 @@
+digraph fig7 {
+  node [shape=rect]
+  edge [dir=none]
+
+  subgraph compound1 {
+  a [label="LFILE"]
+    b [label="*\rLREC"]
+    c [label="o\rMATCHED LREC"]
+    d [label="o\rUNMATCHED LREC"]
+
+    a -> {b}
+    b -> {c d}
+  }
+
+  subgraph compound2 {
+    e [label="RFILE"]
+    f [label="*\rRREC"]
+    g [label="o\rMATCHED RREC"]
+    h [label="o\rUNMATCHED RREC"]
+
+    e -> {f}
+    f -> {g h}
+  }
+
+  subgraph compound3 {
+    i [label="REPORT"]
+    j [label="*\rLINE"]
+    k [label="o\rTYPE 1"]
+    l [label="o\rTYPE 2"]
+    m [label="o\rTYPE 3"]
+    n [label="o\rTYPE 4"]
+
+    i -> {j}
+    j -> {k l m n}
+  }
+
+  {rank=same a e i}
+  {rank=same b f j}
+  {rank=same c d  g h  k l m n}
+
+  subgraph correspondences {
+    edge [dir=both]
+
+    a -> e
+    e -> i
+
+    c -> g:s
+    d -> l:s
+    g -> k:s
+    h -> m:s
+  }
+}

data/examples/sample47.rb

@@ -4,4 +4,4 @@ $:.unshift( "../lib" )
 require 'graphviz/xml'
 
 gvxml = GraphViz::XML::new( File.join( File.dirname(__FILE__), "test.xml" ), :text => true, :attrs => true )
-gvxml.output( :png => "#{$0}.png", :use => "dot" )
+gvxml.graph.output( :png => "#{$0}.png", :use => "dot" )

data/examples/sample59.rb

@@ -0,0 +1,14 @@
+$:.unshift( "../lib" )
+require "graphviz"
+
+graph = {
+  "a" => {
+    "b" => "d",
+    "c" => ["e", "f", "a"]
+  },
+  "g" => "e",
+}
+
+g = GraphViz::new( "G" )
+g.add(graph)
+g.output( :png => "#{$0}.png" )

data/examples/sample60.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../lib" );
+require "graphviz"
+
+asm = GraphViz::new( "My ASM" ) 
+
+my = asm.add_node("My")
+asmn = asm.add_node("ASM")
+asm.add_edge(my, asmn) 
+
+asm.output( :png => "#{$0}.png" )

data/examples/sample61.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../lib" );
+require "graphviz"
+
+asm = GraphViz::new( "" ) 
+
+my = asm.add_node("My")
+asmn = asm.add_node("ASM")
+asm.add_edge(my, asmn) 
+
+asm.output( :png => "#{$0}.png" )

data/lib/graphviz.rb

@@ -93,24 +93,26 @@ class GraphViz
   # Return the GraphViz::Node object created
   #
   def add_node( xNodeName, hOpts = {} )
-    @hoNodes[xNodeName] = GraphViz::Node::new( xNodeName, self )
-    @hoNodes[xNodeName].index = @elements_order.size_of( "node" )
+    return @hoNodes[xNodeName] || Proc.new {
+      @hoNodes[xNodeName] = GraphViz::Node::new( xNodeName, self )
+      @hoNodes[xNodeName].index = @elements_order.size_of( "node" )
     
-    unless hOpts.keys.include?(:label) or hOpts.keys.include?("label")
-      hOpts[:label] = xNodeName
-    end
+      unless hOpts.keys.include?(:label) or hOpts.keys.include?("label")
+        hOpts[:label] = xNodeName
+      end
       
-    hOpts.each do |xKey, xValue|
-      @hoNodes[xNodeName][xKey.to_s] = xValue
-    end
+      hOpts.each do |xKey, xValue|
+        @hoNodes[xNodeName][xKey.to_s] = xValue
+      end
     
-    @elements_order.push( { 
-      "type" => "node", 
-      "name" => xNodeName,
-      "value" => @hoNodes[xNodeName] 
-    } )
+      @elements_order.push( { 
+        "type" => "node", 
+        "name" => xNodeName,
+        "value" => @hoNodes[xNodeName] 
+      } )
     
-    return( @hoNodes[xNodeName] )
+      return( @hoNodes[xNodeName] )
+    }.call
   end
 
   #
@@ -277,8 +279,20 @@ class GraphViz
     end
   end
   
+  #
+  # Add nodes and edges defined by a Hash
+  #
+  def add(h)
+    if h.kind_of? Hash
+      h.each do |node, data|
+        add_hash_edge(node, data)
+      end
+    end 
+  end
+    
   #
   # Return the graph type (graph digraph)
+  #
   def type
     @oGraphType
   end
@@ -451,15 +465,6 @@ class GraphViz
       hOpts.each do |xKey, xValue|
         xValue = xValue.to_s unless xValue.nil? or [Class, TrueClass, FalseClass].include?(xValue.class)
         case xKey.to_s
-          when "output"
-            warn ":output option is deprecated, please use :<format> => :<file> -- BE CAREFUL, it will be removed in the 1.0 version!"
-            if FORMATS.index( xValue ).nil? == true
-              raise ArgumentError, "output format '#{xValue}' invalid"
-            end
-            @format = xValue
-          when "file"
-            warn ":file option is deprecated, please use :<format> => :<file> -- BE CAREFUL, it will be removed in the 1.0 version!"
-            @filename = xValue
           when "use"
             if PROGRAMS.index( xValue ).nil? == true
               raise ArgumentError, "can't use '#{xValue}'"
@@ -625,6 +630,10 @@ class GraphViz
   
   alias :save :output
   
+  def to_s
+    self.output(:none => String)
+  end
+  
   # 
   # Get the graph name
   #
@@ -698,9 +707,6 @@ class GraphViz
           @@errors = v
         when "extlibs"
           @@extlibs = v.split( "," ).map{ |x| x.strip }
-        when "output"
-          warn ":output option is deprecated!"
-          @@format = v
         else
           warn "Invalide option #{k}!"
       end
@@ -796,20 +802,11 @@ class GraphViz
 
     hOpts.each do |xKey, xValue|
       case xKey.to_s
-        when "output"
-          warn ":output option is deprecated, please use :<format> => :<file>"
-          if FORMATS.index( xValue.to_s ).nil? == true
-            raise ArgumentError, "output format '#{xValue}' invalid"
-          end
-          @format = xValue.to_s
         when "use"
           if PROGRAMS.index( xValue.to_s ).nil? == true
             raise ArgumentError, "can't use '#{xValue}'"
           end
           @prog = xValue.to_s
-        when "file"
-          warn ":file option is deprecated, please use :<format> => :<file>"
-          @filename = xValue.to_s
         when "parent"
           @oParentGraph = xValue
         when "type"
@@ -833,6 +830,19 @@ class GraphViz
     yield( self ) if( block )
   end
   
+  # Edge between a node and a Hash
+  # Used by GraphViz#add
+  def add_hash_edge(node, hash)
+    if hash.kind_of? Hash
+      hash.each do |nt, data|
+        add_edge(node, nt)
+        add_hash_edge(nt, data)
+      end
+    else
+      add_edge(node, hash)
+    end
+  end
+  
   #
   # Create a new undirected graph
   #
@@ -869,21 +879,12 @@ class GraphViz
       :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( "\\\\", "\\" )
+    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(".","\\.") + '"' 
+      end
     else
       str
     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  
 end

data/lib/graphviz/constants.rb

@@ -40,7 +40,7 @@
 #   C => cluster
 #
 module Constants
-  RGV_VERSION = "0.9.21"
+  RGV_VERSION = "1.0.0"
   
   ## Const: Output formats
   FORMATS = [
@@ -166,7 +166,6 @@ module Constants
     "headtooltip"         => { :usedBy => "E",    :type => :EscString },
     "height"              => { :usedBy => "N",    :type => :GvDouble },
     "href"                => { :usedBy => "NE",   :type => :EscString },
-    "html"                => { :usedBy => "N",    :type => :HtmlString }, # API extension -- Deprecated
     "id"                  => { :usedBy => "ENG",  :type => :EscString },
     "image"               => { :usedBy => "N",    :type => :EscString },
     "imagescale"          => { :usedBy => "N",    :type => :EscString },

data/lib/graphviz/graphml.rb

@@ -21,6 +21,8 @@ require 'rexml/document'
 class GraphViz
   class GraphML
     attr_reader :attributs
+    
+    # The GraphViz object
     attr_accessor :graph
   
     DEST = {
@@ -35,6 +37,9 @@ class GraphViz
       'undirected' => :graph
     }
     
+    #
+    # Create a new GraphViz object from a GraphML file of string
+    #
     def initialize( file_or_str )
       data = ((File.file?( file_or_str )) ? File::new(file_or_str) : file_or_str) 
       @xmlDoc = REXML::Document::new( data )
@@ -52,7 +57,7 @@ class GraphViz
       parse( @xmlDoc.root )
     end
     
-    def parse( node )
+    def parse( node ) #:nodoc:
       #begin
         send( node.name.to_sym, node )
       #rescue NoMethodError => e
@@ -60,7 +65,7 @@ class GraphViz
       #end
     end
     
-    def graphml( node )
+    def graphml( node ) #:nodoc:
       node.each_element( ) do |child|
         #begin
           send( "graphml_#{child.name}".to_sym, child )
@@ -70,7 +75,7 @@ class GraphViz
       end
     end
     
-    def graphml_key( node )
+    def graphml_key( node ) #:nodoc:
       id = node.attributes['id']
       @current_attr = {
         :name => node.attributes['attr.name'],
@@ -91,11 +96,11 @@ class GraphViz
       @current_attr = nil
     end
     
-    def graphml_key_default( node )
+    def graphml_key_default( node ) #:nodoc:
       @current_attr[:default] = node.texts().to_s
     end
     
-    def graphml_graph( node )
+    def graphml_graph( node ) #:nodoc:
       @current_node = nil
       
       if @current_graph.nil?
@@ -128,11 +133,11 @@ class GraphViz
       @current_graph = previous_graph
     end
     
-    def graphml_graph_data( node )
+    def graphml_graph_data( node ) #:nodoc:
       @current_graph[@attributs[:graphs][node.attributes['key']][:name]] = node.texts().to_s
     end
     
-    def graphml_graph_node( node )
+    def graphml_graph_node( node ) #:nodoc:
       @current_node = {}
   
       node.each_element( ) do |child|
@@ -158,11 +163,11 @@ class GraphViz
       @current_node = nil
     end
     
-    def graphml_graph_node_data( node )
+    def graphml_graph_node_data( node ) #:nodoc:
       @current_node[@attributs[:nodes][node.attributes['key']][:name]] = node.texts().to_s
     end
     
-    def graphml_graph_node_port( node )
+    def graphml_graph_node_port( node ) #:nodoc:
       @current_node[:shape] = :record
       port = node.attributes['name']
       if @current_node[:label]
@@ -173,7 +178,7 @@ class GraphViz
       end
     end
     
-    def graphml_graph_edge( node )
+    def graphml_graph_edge( node ) #:nodoc:
       source = node.attributes['source']
       source = {source => node.attributes['sourceport']} if node.attributes['sourceport']
       target = node.attributes['target']
@@ -192,11 +197,11 @@ class GraphViz
       @current_edge = nil
     end
   
-    def graphml_graph_edge_data( node )
+    def graphml_graph_edge_data( node ) #:nodoc:
       @current_edge[@attributs[:edges][node.attributes['key']][:name]] = node.texts().to_s
     end
     
-    def graphml_graph_hyperedge( node )
+    def graphml_graph_hyperedge( node ) #:nodoc:
       list = []
       
       node.each_element( ) do |child|

data/lib/graphviz/node.rb

@@ -38,15 +38,6 @@ class GraphViz
       @index = nil
     end
 
-    # 
-    # Get the node ID
-    # 
-    def name
-      # TODO : Remove in v1.0
-	    warn "GraphViz::Node#name is deprecated, please use GraphViz::Node#id! -- BE CAREFUL, it will be removed in the 1.0 version!"
-	    return self.id
-	  end
-
     # 
     # Get the node ID
     # 
@@ -164,12 +155,7 @@ class GraphViz
         @oAttrNode.data.delete("label")
       end
       @oAttrNode.data.each do |k, v|
-	      if k == "html"
-	        warn "html attribut is deprecated, please use label : :label => '<<html />>' -- BE CAREFUL, it will be removed in the 1.0 version!"
-		      xAttr << xSeparator + "label = " + v.to_gv
-		    else
-          xAttr << xSeparator + k + " = " + v.to_gv
-		    end
+        xAttr << xSeparator + k + " = " + v.to_gv
         xSeparator = ", "
       end
       if xAttr.length > 0

data/lib/graphviz/xml.rb

@@ -20,31 +20,17 @@ require 'rexml/document'
 class GraphViz
   class XML
     
-    @oReXML
-    @oGraph 
-    @xNodeName
-	  @bShowText
-	  @bShowAttrs
+    # The GraphViz object
+    attr_accessor :graph
     
     # 
     # Generate the graph
     # 
-    # Options :
-    # * :output : Output format (Constants::FORMATS)
-    # * :file : Output file name
-    # * :use : Program to use (Constants::PROGRAMS)
-    # * :path : Program PATH
-    # * :<format> => <file> : <file> can be
-    #   * a file name
-    #   * nil, then the output will be printed to STDOUT
-    #   * String, then the output will be returned as a String
-    # * :errors : DOT error level (default 1)
-    #   * 0 = Error + Warning
-    #   * 1 = Error
-    #   * 2 = none
+    # THIS METHOD IS DEPRECATED, PLEASE USE GraphViz::XML.graph.output
     # 
     def output( *hOpt )
-      @oGraph.output( *hOpt )
+      warn "GraphViz::XML.output is deprecated, use GraphViz::XML.graph.output"
+      @graph.output( *hOpt )
     end
     
     private
@@ -54,7 +40,9 @@ class GraphViz
     # 
     # In:
     # * xFile : XML File
-    # * *hOpt : Graph options
+    # * *hOpt : Graph options:
+    #   * :text : show text nodes (default true)
+    #   * :attrs : show XML attributs (default true)
     # 
     def initialize( xFile, *hOpt )
       @xNodeName = "00000"
@@ -75,7 +63,7 @@ class GraphViz
       end
 
       @oReXML = REXML::Document::new( File::new( xFile ) )
-      @oGraph = GraphViz::new( "XML", *hOpt ) 
+      @graph = GraphViz::new( "XML", *hOpt ) 
       _init( @oReXML.root() )
     end
     
@@ -93,7 +81,7 @@ class GraphViz
 		
 		    label << "}"
 	    end
-      @oGraph.add_node( xLocalNodeName, "label" => label, "color" => "blue", "shape" => "record" )
+      @graph.add_node( xLocalNodeName, "label" => label, "color" => "blue", "shape" => "record" )
 
       ## Act: Search and add Text nodes
       if oXMLNode.has_text? == true and @bShowText == true
@@ -111,8 +99,8 @@ class GraphViz
         end
 
         if xText.length > 0
-          @oGraph.add_node( xTextNodeName, "label" => xText, "color" => "black", "shape" => "ellipse" )
-          @oGraph.add_edge( xLocalNodeName, xTextNodeName )
+          @graph.add_node( xTextNodeName, "label" => xText, "color" => "black", "shape" => "ellipse" )
+          @graph.add_edge( xLocalNodeName, xTextNodeName )
         end
       end
 
@@ -121,7 +109,7 @@ class GraphViz
 
       oXMLNode.each_element( ) do |oXMLChild|
         xChildNodeName = _init( oXMLChild )
-        @oGraph.add_edge( xLocalNodeName, xChildNodeName )
+        @graph.add_edge( xLocalNodeName, xChildNodeName )
       end
 
       return( xLocalNodeName )

data/test/output/sample35.rb.gv

@@ -14,7 +14,7 @@ subgraph  {
   mysite -> dotgraph [color = "blue"]
 }
 subgraph cluster_0 {
-  color = "black"; label = "my_page.html"; fontname = "Courier"; fontsize = "10";
+  label = "my_page.html"; fontname = "Courier"; fontsize = "10"; color = "black";
   zeimage [label = "", shape = "note", image = "./hello.png"];
 }
   mygraph -> mysite [color = "blue"]

data/test/output/sample37.rb.dot

@@ -1,50 +1,50 @@
 digraph Solarsys {
-  Sun [label = "Sun\n", fillcolor = "orange", penwidth = "2", shape = "circle", fontsize = "12", style = "filled"];
+  Sun [label = "Sun\n", penwidth = "2", fillcolor = "orange", shape = "circle", fontsize = "12", style = "filled"];
 subgraph  {
   rank = "same";
-  Moon [label = "Moon\n", fillcolor = "red", penwidth = "2", shape = "circle", fontsize = "12", style = "filled"];
-  Earth [label = "Earth\n", fillcolor = "blue", penwidth = "2", shape = "circle", fontsize = "12", style = "filled"];
+  Moon [label = "Moon\n", penwidth = "2", fillcolor = "red", shape = "circle", fontsize = "12", style = "filled"];
+  Earth [label = "Earth\n", penwidth = "2", fillcolor = "blue", shape = "circle", fontsize = "12", style = "filled"];
   Moon -> Earth [penwidth = "2", color = "black", labeltooltip = "distance"]
 }
   Sun -> Earth [penwidth = "2", color = "black", labeltooltip = "distance"]
 subgraph  {
   rank = "same";
-  Mercury [label = "Mercury\n", fillcolor = "green", penwidth = "2", shape = "circle", fontsize = "12", style = "filled"];
+  Mercury [label = "Mercury\n", penwidth = "2", fillcolor = "green", shape = "circle", fontsize = "12", style = "filled"];
   Sun -> Mercury [label = "distance", penwidth = "2", color = "black"]
 }
 subgraph  {
   rank = "same";
-  Venus [label = "Venus\n", fillcolor = "green", penwidth = "2", shape = "circle", fontsize = "12", style = "filled"];
+  Venus [label = "Venus\n", penwidth = "2", fillcolor = "green", shape = "circle", fontsize = "12", style = "filled"];
   Sun -> Venus [label = "distance", penwidth = "2", color = "black"]
 }
 subgraph  {
   rank = "same";
-  Mars [label = "Mars\n", fillcolor = "green", penwidth = "2", shape = "circle", fontsize = "12", style = "filled"];
+  Mars [label = "Mars\n", penwidth = "2", fillcolor = "green", shape = "circle", fontsize = "12", style = "filled"];
   Sun -> Mars [label = "distance", penwidth = "2", color = "black"]
 }
 subgraph  {
   rank = "same";
-  Jupiter [label = "Jupiter\n", fillcolor = "green", penwidth = "2", shape = "circle", fontsize = "12", style = "filled"];
+  Jupiter [label = "Jupiter\n", penwidth = "2", fillcolor = "green", shape = "circle", fontsize = "12", style = "filled"];
   Sun -> Jupiter [label = "distance", penwidth = "2", color = "black"]
 }
 subgraph  {
   rank = "same";
-  Saturn [label = "Saturn\n", fillcolor = "green", penwidth = "2", shape = "circle", fontsize = "12", style = "filled"];
+  Saturn [label = "Saturn\n", penwidth = "2", fillcolor = "green", shape = "circle", fontsize = "12", style = "filled"];
   Sun -> Saturn [label = "distance", penwidth = "2", color = "black"]
 }
 subgraph  {
   rank = "same";
-  Uranus [label = "Uranus\n", fillcolor = "green", penwidth = "2", shape = "circle", fontsize = "12", style = "filled"];
+  Uranus [label = "Uranus\n", penwidth = "2", fillcolor = "green", shape = "circle", fontsize = "12", style = "filled"];
   Sun -> Uranus [label = "distance", penwidth = "2", color = "black"]
 }
 subgraph  {
   rank = "same";
-  Neptune [label = "Neptune\n", fillcolor = "green", penwidth = "2", shape = "circle", fontsize = "12", style = "filled"];
+  Neptune [label = "Neptune\n", penwidth = "2", fillcolor = "green", shape = "circle", fontsize = "12", style = "filled"];
   Sun -> Neptune [label = "distance", penwidth = "2", color = "black"]
 }
 subgraph  {
   rank = "same";
-  Pluto [label = "Pluto\n", fillcolor = "green", penwidth = "2", shape = "circle", fontsize = "12", style = "filled"];
+  Pluto [label = "Pluto\n", penwidth = "2", fillcolor = "green", shape = "circle", fontsize = "12", style = "filled"];
   Sun -> Pluto [label = "distance", penwidth = "2", color = "black"]
 }
 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-graphviz
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
-  - 9
-  - 21
-  version: 0.9.21
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 00:00:00 +01:00
+date: 2011-05-02 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -50,6 +50,7 @@ files:
 - examples/dot/genetic.dot
 - examples/dot/hello.dot
 - examples/dot/hello_test.rb
+- examples/dot/JSP.dot
 - examples/dot/lion_share.dot
 - examples/dot/prof.dot
 - examples/dot/psg.dot
@@ -132,6 +133,9 @@ files:
 - examples/sample56.rb
 - examples/sample57.rb
 - examples/sample58.rb
+- examples/sample59.rb
+- examples/sample60.rb
+- examples/sample61.rb
 - examples/sample99.rb
 - examples/sdlshapes/README
 - examples/sdlshapes/sdl.ps
@@ -224,6 +228,9 @@ files:
 - test/output/sample55.rb.png
 - test/output/sample56.rb.svg
 - test/output/sample58.rb.png
+- test/output/sample59.rb.png
+- test/output/sample60.rb.png
+- test/output/sample61.rb.png
 - test/output/sample99.rb.png
 - test/support.rb
 - test/test_examples.rb
@@ -248,11 +255,11 @@ post_install_message: |
   For more information, see http://github.com/glejeune/Ruby-Graphviz/issues/#issue/13
   So if you use node ports, maybe you need to change your code.
   
-  /!\ GraphViz::Node#name is deprecated and will be removed in version 1.0.0
+  /!\ GraphViz::Node#name has been removed!
   
-  /!\ :output and :file options are deprecated and will be removed in version 1.0.0
+  /!\ :output and :file options have been removed!
   
-  /!\ The html attribut is deprecated and will be removed in version 1.0.0
+  /!\ The html attribut has been removed!
   You can use the label attribut, as dot do it : :label => '<<html/>>'
   
   /!\ Version 0.9.17 introduce GraphML (http://graphml.graphdrawing.org/) support and