ruby-graphviz 1.0.7 → 1.0.8

data/lib/graphviz/attrs.rb

@@ -1,15 +1,15 @@
 # Copyright (C) 2004 - 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
@@ -44,9 +44,6 @@ class GraphViz
                self[k] = v
             end
          else
-            if @data.key?( key.to_s ) == false
-               nil
-            end
             @data[key.to_s]
          end
       end
@@ -66,12 +63,10 @@ class GraphViz
          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] )
-            end
+         if value
+           @data[key.to_s] = value
+           @graphviz.set_position( @name, key.to_s, @data[key.to_s] ) if @graphviz
          end
       end
    end

data/lib/graphviz/constants.rb

@@ -1,30 +1,30 @@
 # Copyright (C) 2004 - 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
 
 # Constants for ruby-graphviz
-# 
+#
 # Constants::FORMATS: the possible output formats
-#   "bmp", "canon", "dot", "xdot", "cmap", "dia", "eps", 
+#   "bmp", "canon", "dot", "xdot", "cmap", "dia", "eps",
 #   "fig", "gd", "gd2", "gif", "gtk", "hpgl", "ico", "imap",
 #   "cmapx", "imap_np", "cmapx_np", "ismap", "jpeg", "jpg",
 #   "jpe", "mif", "mp", "pcl", "pdf", "pic", "plain",
 #   "plain-ext", "png", "ps", "ps2", "svg", "svgz", "tga",
 #   "tiff", "tif", "vml", "vmlz", "vrml", "vtx", "wbmp",
-#   "xlib", "none" 
-# 
+#   "xlib", "none"
+#
 # Constants::PROGRAMS: The possible programs
 #   "dot", "neato", "twopi", "fdp", "circo"
 #
@@ -33,22 +33,22 @@
 #
 #
 # The single letter codes used in constructors map as follows:
-#   G => The root graph, with GRAPHATTRS 
+#   G => The root graph, with GRAPHATTRS
 #   E => Edge, with EDGESATTRS
 #   N => Node, with NODESATTRS
 #   S => subgraph
 #   C => cluster
 #
 module Constants
-  RGV_VERSION = "1.0.7"
-  
+  RGV_VERSION = "1.0.8"
+
   ## Const: Output formats
   FORMATS = [
     "bmp",
     "canon",
-    "dot", 
+    "dot",
     "xdot",
-    "cmap", 
+    "cmap",
     "dia",
     "eps",
     "fig",
@@ -56,37 +56,37 @@ module Constants
     "gd2",
     "gif",
     "gtk",
-    "hpgl", 
+    "hpgl",
     "ico",
-    "imap", 
+    "imap",
     "cmapx",
-    "imap_np", 
+    "imap_np",
     "cmapx_np",
-    "ismap", 
-    "jpeg", 
-    "jpg", 
-    "jpe", 
-    "mif", 
+    "ismap",
+    "jpeg",
+    "jpg",
+    "jpe",
+    "mif",
     "mp",
-    "pcl", 
+    "pcl",
     "pdf",
-    "pic", 
-    "plain", 
+    "pic",
+    "plain",
     "plain-ext",
-    "png", 
-    "ps", 
+    "png",
+    "ps",
     "ps2",
-    "svg", 
+    "svg",
     "svgz",
     "tga",
     "tiff",
     "tif",
     "vml",
     "vmlz",
-    "vrml", 
-    "vtx", 
-    "wbmp", 
-    "xlib", 
+    "vrml",
+    "vtx",
+    "wbmp",
+    "xlib",
     "none"
   ]
 
@@ -114,7 +114,7 @@ module Constants
     }
     list
   end
-  
+
   # E, N, G, S and C represent edges, nodes, the root graph, subgraphs and cluster subgraphs, respectively
   GENCS_ATTRS = {
     "Damping"             => { :usedBy => "G",    :type => :GvDouble },
@@ -142,8 +142,8 @@ module Constants
     "dimen"               => { :usedBy => "G",    :type => :EscString }, # int
     "dir"                 => { :usedBy => "E",    :type => :EscString }, # dirType
     "diredgeconstraints"  => { :usedBy => "G",    :type => :EscString }, # string, bool
-    "distortion"          => { :usedBy => "N",    :type => :GvDouble },  
-    "dpi"                 => { :usedBy => "G",    :type => :GvDouble },  
+    "distortion"          => { :usedBy => "N",    :type => :GvDouble },
+    "dpi"                 => { :usedBy => "G",    :type => :GvDouble },
     "edgeURL"             => { :usedBy => "E",    :type => :EscString },
     "edgehref"            => { :usedBy => "E",    :type => :EscString },
     "edgetarget"          => { :usedBy => "E",    :type => :EscString },
@@ -161,7 +161,7 @@ module Constants
     "headURL"             => { :usedBy => "E",    :type => :EscString },
     "headclip"            => { :usedBy => "E",    :type => :GvBool }, # bool
     "headhref"            => { :usedBy => "E",    :type => :EscString },
-    "headlabel"           => { :usedBy => "E",    :type => :EscString }, # LblString 
+    "headlabel"           => { :usedBy => "E",    :type => :EscString }, # LblString
     "headport"            => { :usedBy => "E",    :type => :EscString }, # portPos
     "headtarget"          => { :usedBy => "E",    :type => :EscString },
     "headtooltip"         => { :usedBy => "E",    :type => :EscString },
@@ -189,7 +189,7 @@ module Constants
     "layers"              => { :usedBy => "G",    :type => :EscString }, # layerList
     "layersep"            => { :usedBy => "G",    :type => :EscString }, # string
     "layout"              => { :usedBy => "G",    :type => :EscString }, # string
-    "len"                 => { :usedBy => "E",    :type => :GvDouble },  
+    "len"                 => { :usedBy => "E",    :type => :GvDouble },
     "levels"              => { :usedBy => "G",    :type => :EscString }, # int
     "levelsgap"           => { :usedBy => "G",    :type => :GvDouble },
     "lhead"               => { :usedBy => "E",    :type => :EscString }, # string

data/lib/graphviz/core_ext.rb

@@ -37,7 +37,7 @@ class Hash
    #   :png => "file.png",
    #   :svg => "file.svg"
    # }
-   # 
+   #
    # x.each_except( :key => [:none], :value => [/\.png$/] ) do |k, v|
    #   puts "#{k} -> #{v}"
    # end

data/lib/graphviz/dot2ruby.rb

@@ -1,16 +1,16 @@
 #!/usr/bin/env ruby
 # Copyright (C) 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
@@ -20,7 +20,7 @@ require 'graphviz/utils'
 
 class Dot2Ruby #:nodoc:
   include GVUtils
-  
+
   def initialize( xGVPath, xOutFile, xOutFormat = nil ) #:nodoc:
     paths = (xGVPath.nil?) ? [] : [xGVPath]
     @xGvprPath = find_executable( 'gvpr', paths )
@@ -28,7 +28,7 @@ class Dot2Ruby #:nodoc:
     @xOutFormat = xOutFormat || "_"
     @gvprScript = GraphViz::Ext.find( "dot2ruby.g" )
   end
-  
+
   def run( xFile ) #:nodoc:
     xCmd = "#{@xGvprPath} -f #{@gvprScript} -a #{@xOutFormat} #{xFile}"
     xOutput = output_from_command( xCmd )
@@ -38,9 +38,9 @@ class Dot2Ruby #:nodoc:
       File.open( @xOutFile, "w" ) do |io|
         io.print xOutput
       end
-    end 
+    end
   end
-  
+
   def eval( xFile ) #:nodoc:
     xCmd = "#{@xGvprPath} -f #{@gvprScript} -a \"-\" #{xFile}"
     xOutput = output_from_command( xCmd )

data/lib/graphviz/dsl.rb

@@ -39,29 +39,29 @@ class GraphViz::DSL
    end
 
    # Add a subgraph
-   def subgraph(name, &block) 
+   def subgraph(name, &block)
       @graph.add_graph(GraphViz::DSL.new(name, { :parent => @graph, :type => @graph.type }, &block).graph)
    end
    alias :cluster :subgraph
 
    # Generate output
-   def output(options = {}) 
+   def output(options = {})
       @graph.output(options)
    end
 end
 
 # Create a new undirected graph
-def graph(name, options = {}, &block) 
+def graph(name, options = {}, &block)
    GraphViz::DSL.new(name, options.merge( { :type => "graph" } ), &block).graph
 end
 
 # Create a new directed graph
-def digraph(name, options = {}, &block) 
+def digraph(name, options = {}, &block)
    GraphViz::DSL.new(name, options.merge( { :type => "digraph" } ), &block).graph
 end
 
 # Create a new strict directed graph
-def strict(name, options = {}, &block) 
+def strict(name, options = {}, &block)
    GraphViz::DSL.new(name, options.merge( { :type => "strict digraph" } ), &block).graph
 end
 

data/lib/graphviz/edge.rb

@@ -1,15 +1,15 @@
 # Copyright (C) 2004 - 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
@@ -22,11 +22,11 @@ class GraphViz
       include Constants
 
       # Create a new edge
-      # 
+      #
       # In:
       # * vNodeOne : First node (can be a GraphViz::Node or a node ID)
       # * vNodeTwo : Second node (can be a GraphViz::Node or a node ID)
-      # * parent_graph : Graph 
+      # * parent_graph : Graph
       def initialize( vNodeOne, vNodeTwo, parent_graph )
          @node_one_id, @node_one_port = getNodeNameAndPort( vNodeOne )
          @node_two_id, @node_two_port = getNodeNameAndPort( vNodeTwo )
@@ -35,7 +35,7 @@ class GraphViz
          @edge_attributes = GraphViz::Attrs::new( nil, "edge", EDGESATTRS )
          @index = nil
 
-         unless @parent_graph.directed? 
+         unless @parent_graph.directed?
             (@parent_graph.find_node(@node_one_id) || @parent_graph.add_nodes(@node_one_id)).incidents << (@parent_graph.find_node(@node_two_id) || @parent_graph.add_nodes(@node_two_id))
             (@parent_graph.find_node(@node_two_id) || @parent_graph.add_nodes(@node_two_id)).neighbors << (@parent_graph.find_node(@node_one_id) || @parent_graph.add_nodes(@node_one_id))
          end
@@ -45,7 +45,7 @@ class GraphViz
 
       # Return the node one as string (so with port if any)
       def node_one( with_port = true )
-         if @node_one_port.nil? or with_port == false
+         if not (@node_one_port and with_port)
             GraphViz.escape(@node_one_id)
          else
             GraphViz.escape(@node_one_id, :force => true) + ":#{@node_one_port}"
@@ -55,9 +55,9 @@ class GraphViz
 
       # Return the node two as string (so with port if any)
       def node_two( with_port = true )
-         if @node_two_port.nil? or with_port == false
-            GraphViz.escape(@node_two_id) 
-         else 
+         if not (@node_two_port and with_port)
+            GraphViz.escape(@node_two_id)
+         else
             GraphViz.escape(@node_two_id, :force => true) + ":#{@node_two_port}"
          end
       end
@@ -77,7 +77,7 @@ class GraphViz
          @edge_attributes[attribute_name.to_s] = attribute_value
       end
 
-      # Set values for edge attributes or 
+      # 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)
@@ -87,7 +87,7 @@ class GraphViz
             end
          else
             if @edge_attributes[attribute_name.to_s]
-               @edge_attributes[attribute_name.to_s].clone 
+               @edge_attributes[attribute_name.to_s].clone
             else
                nil
             end
@@ -95,7 +95,7 @@ class GraphViz
       end
 
       #
-      # Calls block once for each attribute 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 attributes set globally

data/lib/graphviz/elements.rb

@@ -4,22 +4,22 @@ class GraphViz
       @elements = Array.new
       @elements_hash_by_type = Hash.new
     end
-    
+
     def push( obj )
       @elements.push( obj )
       if @elements_hash_by_type[obj['type']].nil?
         @elements_hash_by_type[obj['type']] = Array.new
       end
-      
+
       @elements_hash_by_type[obj['type']].push( obj )
     end
-    
+
     def each( &b )
       @elements.each do |e|
         yield( e )
       end
     end
-    
+
     def size_of( type )
       if @elements_hash_by_type[type].nil?
         return 0
@@ -27,7 +27,7 @@ class GraphViz
         return @elements_hash_by_type[type].size
       end
     end
-    
+
     def []( index, type = nil )
       if type.nil?
         return @elements[index]

data/lib/graphviz/ext.rb

@@ -10,7 +10,7 @@ class GraphViz
           found = path if File.basename( path ) == ext
         end
       end
-      
+
       File.expand_path( found )
     end
   end

data/lib/graphviz/family_tree.rb

@@ -21,10 +21,10 @@ class GraphViz
       @generation_number = 0
       @generations = []
       @couples = {}
-      
+
       instance_eval(&block) if block
     end
-    
+
     # Add a new generation in the tree
     #
     #   require 'graphviz/family_tree'
@@ -42,47 +42,47 @@ class GraphViz
       @generations << gen
       @generation_number += 1
     end
-    
+
     def persons #:nodoc:
       @persons ||= {}
     end
-    
+
     def add_couple( x, y, node ) #:nodoc:
       @couples[x] = {} if @couples[x].nil?
       @couples[x][y] = GraphViz::FamilyTree::Couple.new( @graph, node, [x, y] )
       @couples[y] = {} if @couples[y].nil?
       @couples[y][x] = @couples[x][y]
     end
-    
+
     # Get a couple (GraphViz::FamilyTree::Couple)
-    def couple( x, y ) 
+    def couple( x, y )
       @couples[x][y]
     end
-    
+
     def method_missing(sym, *args, &block) #:nodoc:
       persons[sym.to_s]
     end
-    
+
     # Family size
     def size
       @persons.size
     end
-    
+
     # Get the graph
     def graph
       maxY = @generations.size
       biggestGen, maxX = biggestGenerationNumberAndSize
-      
+
       puts "#{maxY} generations"
       puts "Plus grosse generation : ##{biggestGen} avec #{maxX} personnes"
-      
+
       puts "traitement des générations..."
-      
+
       puts "  #{biggestGen}:"
       @generations[biggestGen].persons.each do |id, person|
         puts "    - #{id} : #{person.class}"
       end
-      
+
       puts "  Up..."
       (0...biggestGen).reverse_each do |genNumber|
         puts "  #{genNumber}:"
@@ -98,10 +98,10 @@ class GraphViz
           puts "    - #{id} : #{person.class}"
         end
       end
-      
+
       @graph
     end
-    
+
     private
     def biggestGenerationNumberAndSize
       size = 0