ruby-graphviz 1.0.7 → 1.0.8

data/examples/sample45.rb

@@ -12,10 +12,10 @@ end
 
 g.node["shape"] = "ellipse"
 
-[ "box", "polygon", "ellipse", "circle", "point", 
-  "egg", "triangle", "plaintext", "diamond", "trapezium", 
-  "parallelogram", "house", "pentagon", "hexagon", "septagon", "octagon", "doublecircle", 
-  "doubleoctagon", "tripleoctagon", "invtriangle", "invtrapezium", "invhouse", 
+[ "box", "polygon", "ellipse", "circle", "point",
+  "egg", "triangle", "plaintext", "diamond", "trapezium",
+  "parallelogram", "house", "pentagon", "hexagon", "septagon", "octagon", "doublecircle",
+  "doubleoctagon", "tripleoctagon", "invtriangle", "invtrapezium", "invhouse",
   "Mdiamond", "Msquare", "Mcircle", "rect", "rectangle", "none", "note", "tab", "folder",
   "box3d", "component" ].each { |s|
   g.add_nodes( s, "shape" => s )

data/examples/sample48.rb

@@ -1,7 +1,7 @@
 # http://www.graphviz.org/Gallery/directed/cluster.html
-# 
+#
 # digraph G {
-# 
+#
 # 	subgraph cluster_0 {
 # 		style=filled;
 # 		color=lightgrey;
@@ -9,7 +9,7 @@
 # 		a0 -> a1 -> a2 -> a3;
 # 		label = "process #1";
 # 	}
-# 
+#
 # 	subgraph cluster_1 {
 # 		node [style=filled];
 # 		b0 -> b1 -> b2 -> b3;
@@ -23,7 +23,7 @@
 # 	a3 -> a0;
 # 	a3 -> end;
 # 	b3 -> end;
-# 
+#
 # 	start [shape=Mdiamond];
 # 	end [shape=Msquare];
 # }
@@ -40,14 +40,14 @@ GraphViz.new( :G, :type => :digraph ) { |g|
     c.a0 << c.a1 << c.a2 << c.a3
     c[:label] = "process #1"
   }
-  
+
   g.cluster_1 { |c|
      c.node[:style] = :filled
      c.b0 << c.b1 << c.b2 << c.b3
      c[:label] = "process #1"
      c[:color] = :blue
   }
-    
+
   g.start << g.cluster_0.a0
   g.start << g.cluster_1.b0
   g.cluster_0.a1 << g.cluster_1.b3
@@ -55,7 +55,7 @@ GraphViz.new( :G, :type => :digraph ) { |g|
   g.cluster_0.a3 << g.cluster_0.a0
   g.cluster_0.a3 << g._end
   g.cluster_1.b3 << g._end
-  
+
   g.start[:shape] = :Mdiamond
   g._end[:label] = "end"
   g._end[:shape] = :Mdiamond

data/examples/sample50.rb

@@ -5,7 +5,7 @@
 # ratio = "auto" ;
 # mincross = 2.0 ;
 # label = "Pedigree Lion_Share" ;
-# 
+#
 # "001" [shape=box     , regular=1,style=filled,fillcolor=white   ] ;
 # "002" [shape=box     , regular=1,style=filled,fillcolor=white   ] ;
 # "003" [shape=circle  , regular=1,style=filled,fillcolor=white   ] ;

data/examples/sample52.rb

@@ -19,7 +19,7 @@
 #   green1->gy1;
 #   yellow1->yr1;
 #   red1->rg1;
-#   
+#
 #   overlap=false
 #   label="PetriNet Model TrafficLights\nExtracted from ConceptBase and layed out by Graphviz"
 #   fontsize=12;
@@ -38,7 +38,7 @@ GraphViz::new( "TrafficLights", :type => :digraph ) { |g|
   g.green1.set { |n| n[:shape] = :circle; n[:fixedsize] = :true; n[:width] = 0.9 }
   g.yellow1.set { |n| n[:shape] = :circle; n[:fixedsize] = :true; n[:width] = 0.9 }
   g.red1.set { |n| n[:shape] = :circle; n[:fixedsize] = :true; n[:width] = 0.9 }
-  
+
   g.gy2 << g.yellow2
   g.rg2 << g.green2
   g.yr2 << g.safe1

data/examples/sample53.rb

@@ -5,7 +5,7 @@ tree = GraphViz::FamilyTree.new do
   generation do
     benoist.is_a_man( "Benoist" )
     nathalie.is_a_woman( "Nathalie" )
-    
+
     benoist.is_maried_with nathalie
   end
 
@@ -14,7 +14,7 @@ tree = GraphViz::FamilyTree.new do
     amelie.is_a_woman( "Amelie" )
     clement.is_a_man( "Clement" )
     gregoire.is_a_man( "Gregoire" )
-    
+
     muriel.is_a_woman( "Muriel" )
 
     gregoire.is_maried_with muriel

data/examples/sample54.rb

@@ -6,10 +6,10 @@ class Array
     ## Solution #1 by greg
     # self.push(r = self.shift)
     # return r
-    
+
     ## Solution #2 by madx
     # shift.tap {|e| push e }
-    
+
     ## Solution #3 by greg
     push(shift)[-1]
   end
@@ -22,5 +22,5 @@ GraphViz.graph( :G, :use => :neato ) { |g|
     (1..5).each do |y|
       g.add_nodes( "n#{x}x#{y}", :pos => "#{x},#{y}!", :shape => type.rotate )
     end
-  end  
+  end
 }.output( :png => "#{$0}.png" )

data/examples/sample60.rb

@@ -3,10 +3,10 @@
 $:.unshift( "../lib" );
 require "graphviz"
 
-asm = GraphViz::new( "My ASM" ) 
+asm = GraphViz::new( "My ASM" )
 
 my = asm.add_nodes("My")
 asmn = asm.add_nodes("ASM")
-asm.add_edges(my, asmn) 
+asm.add_edges(my, asmn)
 
 asm.output( :png => "#{$0}.png" )

data/examples/sample61.rb

@@ -3,10 +3,10 @@
 $:.unshift( "../lib" );
 require "graphviz"
 
-asm = GraphViz::new( "" ) 
+asm = GraphViz::new( "" )
 
 my = asm.add_nodes("My")
 asmn = asm.add_nodes("ASM")
-asm.add_edges(my, asmn) 
+asm.add_edges(my, asmn)
 
 asm.output( :png => "#{$0}.png" )

data/examples/sample62.rb

@@ -3,11 +3,11 @@
 $:.unshift( "../lib" );
 require "graphviz"
 
-hello_world = GraphViz::new( "" ) 
+hello_world = GraphViz::new( "" )
 
 hello = hello_world.add_nodes("Hello")
 world = hello_world.add_nodes("World")
-hello_world.add_edges(hello, world) 
+hello_world.add_edges(hello, world)
 
 # final_graph = GraphViz.parse_string( hello_world.output( :dot => String ) )
 # final_graph.each_node do |_, node|

data/examples/sample99.rb

@@ -5,53 +5,53 @@ tree = GraphViz::FamilyTree.new do
   generation do
     chantale.is_a_woman( "Chantale" )
     jacques.is_a_man( "Jacques" )
-    
+
     jacques.is_dead
     jacques.is_maried_with chantale
-    
+
     rose.is_a_woman( "Rose Marie" )
     andre.is_a_man( "Andre" )
-    
+
     andre.is_maried_with rose
     andre.is_dead
   end
-   
+
   generation do
     benoist.is_a_man( "Benoist" )
     nathalie.is_a_woman( "Nathalie" )
-    
+
     benoist.is_maried_with nathalie
-    
+
     michel.is_a_man( "Michel" )
     brigitte.is_a_woman( "Brigitte" )
-    
+
     michel.is_maried_with brigitte
   end
-  
+
   couple( chantale, jacques ).kids( nathalie )
   couple( rose, andre ).kids( benoist )
-  
+
   generation do
     charlotte.is_a_woman( "Charlotte" )
     amelie.is_a_woman( "Amelie" )
     clement.is_a_man( "Clement" )
     gregoire.is_a_man( "Gregoire" )
-    
+
     muriel.is_a_woman( "Muriel" )
     gilles.is_a_man( "Gilles" )
-    
+
     morgane.is_a_woman( "Morgane" )
     gregoire.is_divorced_with morgane
 
     pascal.is_a_man( "Pascal" )
     muriel.is_divorced_with pascal
 
-    gregoire.is_maried_with muriel    
+    gregoire.is_maried_with muriel
   end
-  
+
   couple( michel, brigitte ).kids( muriel, gilles )
   couple( benoist, nathalie ).kids( charlotte, amelie, clement, gregoire )
-  
+
   generation do
     arthur.is_a_boy( "Arthur" )
     colyne.is_a_girl( "Colyne" )
@@ -60,7 +60,7 @@ tree = GraphViz::FamilyTree.new do
     enaitz.is_a_boy( "Enaitz" )
     milo.is_a_boy( "Milo" )
   end
-  
+
   couple( gregoire, morgane ).kids( arthur, colyne, benedict )
   couple( gregoire, muriel ).kids( maia )
   couple( muriel, pascal ).kids( milo )

data/examples/theory/pert.rb

@@ -4,7 +4,7 @@ require 'graphviz/theory'
 
 g = GraphViz.digraph( "G", :path => "/usr/local/bin", :use => "fdp" ) do |g|
   g.node[:shape => "record"]
-  
+
   g.start[:label => "Start"]
   g.task_1[:label => "Task #1 - Duration : 4d"]
   g.task_2[:label => "Task #2 - Duration : 5.25d"]
@@ -14,7 +14,7 @@ g = GraphViz.digraph( "G", :path => "/usr/local/bin", :use => "fdp" ) do |g|
   g.task_6[:label => "Task #6 - Duration : 4.5d"]
   g.task_7[:label => "Task #7 - Duration : 5.17d"]
   g.finish[:label => "End"]
-  
+
   (g.start << g.task_1)[:weight => 0.0]
   (g.start << g.task_2)[:weight => 0.0]
   (g.task_1 << g.task_3)[:weight => 4.0]

data/examples/theory/tests.rb

@@ -9,7 +9,7 @@ g = GraphViz.digraph( "G", :path => "/usr/local/bin" ) do |g|
   g.d[:label => "4"]
   g.e[:label => "5"]
   g.f[:label => "6"]
-  
+
 #   g.a << g.a
   g.a << g.b
   g.a << g.d
@@ -82,6 +82,6 @@ rrr = t.critical_path
 print "\tPath "; p rrr[:path]
 puts "\tDistance : #{rrr[:distance]}"
 
-t.pagerank.each { |node, rank| 
+t.pagerank.each { |node, rank|
    puts "Pagerank for node #{node.id} = #{rank}"
 }

data/lib/graphviz.rb

@@ -1,15 +1,15 @@
 # Copyright (C) 2003 - 2012 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
@@ -35,7 +35,7 @@ if /^1.8/.match RUBY_VERSION
   $KCODE = "UTF8"
 end
 
-class GraphViz 
+class GraphViz
   include Constants
   include GVUtils
 
@@ -60,7 +60,7 @@ class GraphViz
   ## Var: External libraries
   @@extlibs = []
   @extlibs
-  
+
   ## Var: Graph name
   @name
 
@@ -72,7 +72,7 @@ class GraphViz
   # This accessor allow you to set global graph attributes
   attr_accessor :graph
   alias_method :graph_attrs, :graph
-  
+
   # This accessor allow you to set global nodes attributes
   attr_accessor :node
   alias_method :node_attrs, :node
@@ -82,7 +82,7 @@ class GraphViz
   alias_method :edge_attrs, :edge
 
   @elements_order
-  
+
   #<b>DEPRECATED</b> please use GraphViz#add_nodes
   def add_node( xNodeName, hOpts = {} )
      warn "GraphViz#add_node is deprecated, please use GraphViz#add_nodes"
@@ -94,7 +94,7 @@ class GraphViz
   # In:
   # * xNodeName : Name of the new node
   # * hOpts : Node attributes
-  # 
+  #
   # Return the GraphViz::Node object created
   def add_nodes(node_name, options = {})
      if node_name.kind_of? Array
@@ -110,10 +110,10 @@ class GraphViz
               options[:label] = node_name
            end
 
-           @elements_order.push( { 
-              "type" => "node", 
+           @elements_order.push( {
+              "type" => "node",
               "name" => node_name,
-              "value" => @hoNodes[node_name] 
+              "value" => @hoNodes[node_name]
            } )
 
            node = @hoNodes[node_name]
@@ -130,14 +130,14 @@ class GraphViz
   # Return the node object for the given name (or nil) in the current graph
   def get_node( xNodeName, &block )
     node = @hoNodes[xNodeName] || nil
-    
-    yield( node ) if( block and node.nil? == false )
-    
+
+    yield( node ) if( block and node )
+
     return node
   end
 
   # Returns the first node found in the entire graph, starting from the root graph
-  def find_node(name) 
+  def find_node(name)
      root = root_graph
      return root.search_node(name)
   end
@@ -152,7 +152,7 @@ class GraphViz
      }
      return nil
   end
-  
+
   #
   # Return the node object for the given index
   #
@@ -160,7 +160,7 @@ class GraphViz
     element = @elements_order[index, "node"]
     (element.nil?) ? nil : element["value"]
   end
-  
+
   #
   # Allow you to traverse nodes
   #
@@ -173,12 +173,12 @@ class GraphViz
       return( @hoNodes )
     end
   end
-  
+
   # Get the number of nodes
   def node_count
     @hoNodes.size
   end
-  
+
   #<b>DEPRECATED</b> please use GraphViz#add_edges
   def add_edge( oNodeOne, oNodeTwo, hOpts = {} )
      warn "GraphViz#add_edge is deprecated, please use GraphViz#add_edges"
@@ -186,14 +186,14 @@ class GraphViz
   end
 
   # Create a new edge
-  # 
+  #
   # In:
   # * node_one : First node (or node list)
   # * node_two : Second Node (or node list)
   # * options : Edge attributes
   def add_edges( node_one, node_two, options = {} )
-    
-    if( node_one.class == Array ) 
+
+    if( node_one.class == Array )
       node_one.each do |no|
         add_edges( no, node_two, options )
       end
@@ -205,17 +205,17 @@ class GraphViz
       else
         edge = GraphViz::Edge::new( node_one, node_two, self )
         edge.index = @elements_order.size_of( "edge" )
-        
+
         options.each do |xKey, xValue|
           edge[xKey.to_s] = xValue
         end
-        
-        @elements_order.push( { 
-          "type" => "edge", 
+
+        @elements_order.push( {
+          "type" => "edge",
           "value" => edge
         } )
         @loEdges.push( edge )
-        
+
         return( edge )
       end
     end
@@ -233,14 +233,14 @@ class GraphViz
       return @loEdges
     end
   end
-  
+
   #
   # Get the number of edges
   #
   def edge_count
     @loEdges.size
   end
-  
+
   #
   # Return the edge object for the given index
   #
@@ -248,21 +248,21 @@ class GraphViz
     element = @elements_order[index, "edge"]
     (element.nil?) ? nil : element["value"]
   end
-  
-  # 
+
+  #
   # Create a new graph
-  # 
+  #
   # In:
   # * xGraphName : Graph name
   # * hOpts : Graph attributes
   #
   def add_graph( xGraphName = nil, hOpts = {}, &block )
-     if xGraphName.kind_of?(GraphViz) 
+     if xGraphName.kind_of?(GraphViz)
         xGraphID = xGraphName.id
         @hoGraphs[xGraphID] = xGraphName.clone
         @hoGraphs[xGraphID].type = @oGraphType
         @hoGraphs[xGraphID].pg = self
-        xGraphName = xGraphID 
+        xGraphName = xGraphID
      else
         if xGraphName.kind_of?(Hash)
            hOpts = xGraphName
@@ -283,10 +283,10 @@ class GraphViz
         end
      end
 
-     @elements_order.push( { 
-        "type" => "graph", 
+     @elements_order.push( {
+        "type" => "graph",
         "name" => xGraphName,
-        "value" => @hoGraphs[xGraphID] 
+        "value" => @hoGraphs[xGraphID]
      } )
 
      return( @hoGraphs[xGraphID] )
@@ -297,12 +297,12 @@ class GraphViz
   #
   def get_graph( xGraphName, &block )
     graph = @hoGraphs[xGraphName] || nil
-    
-    yield( graph ) if( block and graph.nil? == false )
-    
+
+    yield( graph ) if( block and graph )
+
     return graph
   end
-  
+
   #
   # Allow you to traverse graphs
   #
@@ -315,7 +315,7 @@ class GraphViz
       return @hoGraphs
     end
   end
-  
+
   #
   # Add nodes and edges defined by a Hash
   #
@@ -324,9 +324,9 @@ class GraphViz
       h.each do |node, data|
         add_hash_edge(node, data)
       end
-    end 
+    end
   end
-    
+
   #
   # Return the graph type (graph digraph)
   #
@@ -336,51 +336,51 @@ class GraphViz
   def type=(x) #:nodoc:
     @oGraphType = x
   end
-  
+
   #
   # Get the number of graphs
   #
   def graph_count
     @hoGraphs.size
   end
-  
+
   def method_missing( idName, *args, &block ) #:nodoc:
     xName = idName.id2name
-  
+
     rCod = nil
-    
+
     if block
       # Creating a cluster named '#{xName}'
       rCod = add_graph( xName, args[0]||{} )
       yield( rCod )
     else
-      # Create a node named '#{xName}' or search for a node, edge or cluster      
+      # Create a node named '#{xName}' or search for a node, edge or cluster
       if @hoNodes.keys.include?( xName )
         if( args[0] )
           return { xName => args[0] }
         else
-          return( @hoNodes[xName] ) 
+          return( @hoNodes[xName] )
         end
       end
       return( @hoGraphs[xName] ) if @hoGraphs.keys.include?( xName )
-            
+
       rCod = add_nodes( xName, args[0]||{} )
     end
 
     return rCod
   end
-  
-  # 
+
+  #
   # Set value +xValue+ to the graph attribute +xAttrName+
-  # 
+  #
   def []=( xAttrName, xValue )
     xValue = xValue.to_s if xValue.class == Symbol
     @graph[xAttrName] = xValue
   end
 
-  # 
+  #
   # Get the value of the graph attribute +xAttrName+
-  # 
+  #
   def []( xAttrName )
     if Hash === xAttrName
       xAttrName.each do |key, value|
@@ -390,9 +390,9 @@ class GraphViz
       return( @graph[xAttrName].clone )
     end
   end
-  
+
   #
-  # Calls block once for each attribute of the graph, passing the name and value to the 
+  # Calls block once for each attribute of the graph, passing the name and value to the
   # block as a two-element array.
   #
   def each_attribute(&b)
@@ -404,10 +404,10 @@ class GraphViz
      warn "`GraphViz#each_attribut` is deprecated, please use `GraphViz#each_attribute`"
      each_attribute(&b)
   end
-  
-  # 
+
+  #
   # Generate the graph
-  # 
+  #
   # Options :
   # * :output : Output format (Constants::FORMATS)
   # * :file : Output file name
@@ -421,7 +421,7 @@ class GraphViz
   #   * 0 = Error + Warning
   #   * 1 = Error
   #   * 2 = none
-  # 
+  #
   def output( hOpts = {} )
     xDOTScript = ""
     xLastType = nil
@@ -430,21 +430,21 @@ class GraphViz
     lNotHugly = []
 
     @elements_order.each { |kElement|
-      if xLastType.nil? == true or xLastType != kElement["type"]
-        
-        if xData.length > 0 
+      if xLastType.nil? or xLastType != kElement["type"]
+
+        if xData.length > 0
           case xLastType
             when "graph_attr"
               xDOTScript << "  " + xData + ";\n"
-  
+
             when "node_attr"
               xDOTScript << "  node [" + xData + "];\n"
-            
+
             when "edge_attr"
               xDOTScript << "  edge [" + xData + "];\n"
           end
         end
-        
+
         xSeparator = ""
         xData = ""
       end
@@ -452,7 +452,7 @@ class GraphViz
       xLastType = kElement["type"]
 
       #Modified by
-      #Brandon Coleman 
+      #Brandon Coleman
       #verify value is NOT NULL
       if kElement["value"] == nil then
         raise ArgumentError, "#{kElement["name"]} has a nil value!"
@@ -484,33 +484,33 @@ class GraphViz
           raise ArgumentError, "Don't know what to do with element type '#{kElement['type']}'"
       end
     }
-    
-    if xData.length > 0 
+
+    if xData.length > 0
       case xLastType
         when "graph_attr"
           xDOTScript << "  " + xData + ";\n"
 
         when "node_attr"
           xDOTScript << "  node [" + xData + "];\n"
-        
+
         when "edge_attr"
           xDOTScript << "  edge [" + xData + "];\n"
       end
     end
     xDOTScript << "}"
 
-    if @oParentGraph.nil? == false
+    if @oParentGraph
       xDOTScript = "subgraph #{GraphViz.escape(@name, :unquote_empty => true)} {\n" << xDOTScript
 
       return( xDOTScript )
     else
       hOutput = {}
-      
+
       hOpts.each do |xKey, xValue|
         xValue = xValue.to_s unless xValue.nil? or [Class, TrueClass, FalseClass].include?(xValue.class)
         case xKey.to_s
           when "use"
-            if PROGRAMS.index( xValue ).nil? == true
+            if PROGRAMS.index( xValue ).nil?
               raise ArgumentError, "can't use '#{xValue}'"
             end
             @prog = xValue
@@ -559,21 +559,21 @@ class GraphViz
               @nothugly = false
             end
           else
-            if FORMATS.index( xKey.to_s ).nil? == true
+            if FORMATS.index( xKey.to_s ).nil?
               raise ArgumentError, "output format '#{xValue}' invalid"
             end
             hOutput[xKey.to_s] = xValue
         end
       end
-      
+
       @output = hOutput if hOutput.size > 0
-  
+
       xStict = ((@strict && @oGraphType == "digraph") ? "strict " : "")
       xDOTScript = ("#{xStict}#{@oGraphType} #{GraphViz.escape(@name, :unquote_empty => true)} {\n" << xDOTScript).gsub( "\0", "" )
 
       xOutputString = (@filename == String ||
         @output.any? {|format, file| file == String })
-        
+
       xOutput = ""
       if @format.to_s == "none" or @output.any? {|fmt, fn| fmt.to_s == "none"}
         if xOutputString
@@ -585,13 +585,13 @@ class GraphViz
           end
         end
       end
-      
+
       if (@format.to_s != "none" and not @format.nil?) or (@output.any? {|format, file| format != "none" } and @output.size > 0)
         ## Act: Save script and send it to dot
         t = Tempfile::open( File.basename(__FILE__) )
         t.print( xDOTScript )
         t.close
-        
+
         cmd = find_executable( @prog, @path )
         if cmd == nil
           raise StandardError, "GraphViz not installed or #{@prog} not in PATH. Install GraphViz or use the 'path' option"
@@ -617,27 +617,27 @@ class GraphViz
             xOutputWithFile << "-T#{format} -o#{file} "
           end
         end
-        
+
         xExternalLibraries = ""
         @extlibs.each do |lib|
           xExternalLibraries << "-l#{lib} "
         end
-        
-        xOtherOptions = ""        
+
+        xOtherOptions = ""
         xOtherOptions += " -s#{@scale}" unless @scale.nil?
-        xOtherOptions += " -y" if @inverty == true
+        xOtherOptions += " -y" if @inverty
         unless @no_layout.nil?
           xOtherOptions += " -n"
           xOtherOptions += "2" if @no_layout.to_i == 2
         end
-        xOtherOptions += " -x" if @reduce_graph == true
-        xOtherOptions += " -Lg" if @Lg == true
-        xOtherOptions += " -LO" if @LO == true
+        xOtherOptions += " -x" if @reduce_graph
+        xOtherOptions += " -Lg" if @Lg
+        xOtherOptions += " -LO" if @LO
         xOtherOptions += " -Ln#{@Ln}" unless @LN.nil?
         xOtherOptions += " -LU#{@LU}" unless @LU.nil?
         xOtherOptions += " -LC#{@LC}" unless @LC.nil?
         xOtherOptions += " -LT#{@LT}" unless @LT.nil?
-        
+
         if IS_JRUBY
           xCmd = "#{cmd} -q#{@errors} #{xExternalLibraries} #{xOtherOptions} #{xOutputWithFile} #{xOutputWithoutFile} #{t.path}"
         elsif IS_CYGWIN
@@ -654,7 +654,7 @@ class GraphViz
 
         xOutput << output_from_command( xCmd )
       end
-      
+
       # Not Hugly
       lNotHugly.each do |f|
         if f.nil? or f == String
@@ -663,7 +663,7 @@ class GraphViz
           GraphViz.nothugly( f, true )
         end
       end
-      
+
       if xOutputString
         xOutput
       else
@@ -671,28 +671,28 @@ class GraphViz
       end
     end
   end
-  
+
   alias :save :output
-  
+
   def to_s
     self.output(:none => String)
   end
-  
-  # 
+
+  #
   # Get the graph name
   #
-  def name 
+  def name
     @name.clone
   end
   alias :id :name
-  
-  # 
+
+  #
   # Create an edge between the current cluster and the node or cluster +oNode+
-  # 
+  #
   def <<( oNode )
     raise( ArgumentError, "Edge between root graph and node or cluster not allowed!" ) if self.pg.nil?
 
-    if( oNode.class == Array ) 
+    if( oNode.class == Array )
       oNode.each do |no|
         self << no
       end
@@ -703,46 +703,46 @@ class GraphViz
   alias :> :<<
   alias :- :<<
   alias :>> :<<
-  
+
   def pg #:nodoc:
     @oParentGraph
   end
   def pg=(x) #:nodoc:
     @oParentGraph = x
   end
-  
+
   #
   # Return the root graph
   #
   def root_graph
     return( (self.pg.nil?) ? self : self.pg.root_graph )
   end
-  
+
   def self.commonGraph( o1, o2 ) #:nodoc:
     g1 = o1.pg
     g2 = o2.pg
 
     return o1 if g1.nil?
     return o2 if g2.nil?
-    
+
     return g1 if g1.object_id == g2.object_id
-    
+
     return GraphViz::commonGraph( g1, g2 )
   end
-  
+
   def set_position( xType, xKey, xValue ) #:nodoc:
-    @elements_order.push( { 
-      "type" => "#{xType}_attr", 
+    @elements_order.push( {
+      "type" => "#{xType}_attr",
       "name" => xKey,
-      "value" => xValue 
+      "value" => xValue
     } )
   end
-  
+
 ## ----------------------------------------------------------------------------
 
   #
   # Change default options (:use, :path, :errors and :output)
-  # 
+  #
   def self.default( hOpts )
     hOpts.each do |k, v|
       case k.to_s
@@ -759,29 +759,29 @@ class GraphViz
       end
     end
   end
-  
+
   def self.options( hOpts )
     GraphViz::default( hOpts )
   end
-  
+
 ## ----------------------------------------------------------------------------
 
   # 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
   #
-  def self.parse( 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 )
+    yield( graph ) if( block and graph )
     return graph
   end
 
   # Create a new graph from a GraphViz File
-  # 
+  #
   # Options :
   # * :output : Output format (Constants::FORMATS) (default : dot)
   # * :file : Output file name (default : none)
@@ -790,11 +790,11 @@ class GraphViz
   #
   def self.parse_string( str, hOpts = {}, &block )
     graph = Dot2Ruby::new( hOpts[:path], nil, nil ).eval_string( str )
-    yield( graph ) if( block and graph.nil? == false )
+    yield( graph ) if( block and graph )
     return graph
   end
 
-  # Return a new completed graph 
+  # Return a new completed graph
   def complete
     GraphViz.parse_string( root_graph.output( :dot => String ) )
   end
@@ -811,7 +811,7 @@ class GraphViz
   end
 ## ----------------------------------------------------------------------------
 
-  private 
+  private
 
   ## Var: Nodes, Edges and Graphs tables
   @hoNodes
@@ -823,10 +823,10 @@ class GraphViz
 
   ## Var: Type de graphe (orienté ou non)
   @oGraphType
-  
-  # 
+
+  #
   # Create a new graph object
-  # 
+  #
   # Options :
   # * :output : Output format (Constants::FORMATS) (default : dot)
   # * :file : Output file name (default : nil)
@@ -838,7 +838,7 @@ class GraphViz
   #   * 0 = Error + Warning
   #   * 1 = Error
   #   * 2 = none
-  # 
+  #
   def initialize( xGraphName, hOpts = {}, &block )
     @filename = nil
     @name     = xGraphName.to_s
@@ -850,7 +850,7 @@ class GraphViz
     @output   = {}
     @nothugly = false
     @strict   = false
-    
+
     @scale        = nil
     @inverty      = nil
     @no_layout    = nil
@@ -861,16 +861,16 @@ class GraphViz
     @LU           = nil
     @LC           = nil
     @LT           = nil
-    
+
     @elements_order = GraphViz::Elements::new()
 
     @oParentGraph = nil
     @oGraphType   = "digraph"
-    
+
     @hoNodes  = Hash::new()
     @loEdges  = Array::new()
     @hoGraphs = Hash::new()
-    
+
     @node  = GraphViz::Attrs::new( self, "node",  NODESATTRS  )
     @edge  = GraphViz::Attrs::new( self, "edge",  EDGESATTRS  )
     @graph = GraphViz::Attrs::new( self, "graph", GRAPHSATTRS )
@@ -878,14 +878,14 @@ class GraphViz
     hOpts.each do |xKey, xValue|
       case xKey.to_s
         when "use"
-          if PROGRAMS.index( xValue.to_s ).nil? == true
+          if PROGRAMS.index( xValue.to_s ).nil?
             raise ArgumentError, "can't use '#{xValue}'"
           end
           @prog = xValue.to_s
         when "parent"
           @oParentGraph = xValue
         when "type"
-          if GRAPHTYPE.index( xValue.to_s ).nil? == true
+          if GRAPHTYPE.index( xValue.to_s ).nil?
             raise ArgumentError, "graph type '#{xValue}' unknow"
           end
           @oGraphType = xValue.to_s
@@ -901,10 +901,10 @@ class GraphViz
           self[xKey.to_s] = xValue.to_s
       end
     end
-  
+
     yield( self ) if( block )
   end
-  
+
   # Edge between a node and a Hash
   # Used by GraphViz#add
   def add_hash_edge(node, hash)
@@ -917,7 +917,7 @@ class GraphViz
       add_edges(node, hash)
     end
   end
-  
+
   #
   # Create a new undirected graph
   #
@@ -935,14 +935,14 @@ class GraphViz
   def self.digraph( xGraphName, hOpts = {}, &block )
     new( xGraphName, hOpts.symbolize_keys.merge( {:type => "digraph"} ), &block )
   end
-  
+
   # Create a new strict directed graph
   #
   # See also GraphViz::new
   def self.strict_digraph( xGraphName, hOpts = {}, &block )
     new( xGraphName, hOpts.symbolize_keys.merge( {:type => "digraph", :strict => true} ), &block )
   end
-  
+
   # Create a random graph.
   def self.generate(num_nodes, num_edges, directed = false, weight_range = (1..1))
      g = nil
@@ -980,13 +980,13 @@ class GraphViz
       :force => false,
       :unquote_empty => false,
     }.merge(opts)
-    
-    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') + '"' 
+
+    if (options[:force] or str.match( /\A[a-zA-Z_]+[a-zA-Z0-9_]*\Z/ ).nil?)
+      unless options[:unquote_empty] and str.size == 0
+        '"' + str.gsub('"', '\\"').gsub("\n", '\\\\n') + '"'
       end
     else
       str
     end
-  end  
+  end
 end