ruby-graphviz 1.0.7 → 1.0.8

data/lib/graphviz/node.rb

@@ -1,15 +1,15 @@
 # Copyright (C) 2004 - 2011 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
@@ -27,9 +27,9 @@ class GraphViz
       attr_reader :incidents
 
       # Create a new node
-      # 
+      #
       # * node_id : ID of the node
-      # * parent_graph : Graph 
+      # * parent_graph : Graph
       def initialize( node_id, parent_graph )
          @neighbors = []
          @incidents = []
@@ -75,7 +75,7 @@ class GraphViz
          end
       end
 
-      # Calls block once for each attribute 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 attributes set globally
@@ -95,7 +95,7 @@ class GraphViz
 
       # Create an edge between the current node and the node +node+
       def <<( node )
-         if( node.class == Array ) 
+         if( node.class == Array )
             node.each do |no|
                self << no
             end
@@ -116,7 +116,7 @@ class GraphViz
       #     _n.color = "blue"
       #     _n.fontcolor = "red"
       #   }
-      # 
+      #
       def set( &b )
          yield( self )
       end

data/lib/graphviz/nothugly.rb

@@ -1,8 +1,8 @@
 # This file use notugly.xsl: An XSL transform to pretty up the SVG output from Graphviz
-# 
+#
 # See: http://www.hokstad.com/making-graphviz-output-pretty-with-xsl.html
 # And: http://www.hokstad.com/making-graphviz-output-pretty-with-xsl-updated.html
-# 
+#
 # By Vidar Hokstad and Ryan Shea; Contributions by Jonas Tingborn,
 # Earl Cummings, Michael Kennedy (Graphviz 2.20.2 compatibility, bug fixes,
 # testing, lots of gradients)
@@ -33,7 +33,7 @@ class GraphViz
   def self.nothugly( file, save = true )
     xsl = File.join( File.dirname(File.expand_path(__FILE__)), "nothugly", "nothugly.xsl" )
     out = self.send(XSLT_METHOD, file, xsl)
-  
+
     if save
       fname = File.join( File.dirname(File.expand_path(file)), File.basename(file))
       File.open( fname, "w" ) { |io|

data/lib/graphviz/theory.rb

@@ -42,7 +42,7 @@ class GraphViz
       # Return the degree of the given node
       def degree( node )
          degree = 0
-         name = node 
+         name = node
          if node.kind_of?(GraphViz::Node)
             name = node.id
          end
@@ -59,7 +59,7 @@ class GraphViz
          return degree_matrix - adjancy_matrix
       end
 
-      # Return <tt>true</tt> if the graph if symmetric, <tt>false</tt> otherwise   
+      # Return <tt>true</tt> if the graph if symmetric, <tt>false</tt> otherwise
       def symmetric?
          adjancy_matrix == adjancy_matrix.transpose
       end
@@ -124,7 +124,7 @@ class GraphViz
          if d[arv.index].to_f.infinite?
             return nil
          else
-            return( { 
+            return( {
                :path => ch,
                :distance => d[arv.index]
             } )
@@ -187,7 +187,7 @@ class GraphViz
          return pagerank
       end
 
-      # Return the list of nodes that are directly accessible from given node 
+      # Return the list of nodes that are directly accessible from given node
       def neighbors(node)
          if node.class == String
             @graph.get_node(node).neighbors
@@ -231,9 +231,9 @@ class GraphViz
          recursive_dfs(node, visited_nodes, &b)
       end
 
-      private 
+      private
       def recursive_dfs(node, visited_nodes, &b)
-         node = @graph.get_node(node) if node.kind_of? String 
+         node = @graph.get_node(node) if node.kind_of? String
          b.call(node)
          visited_nodes << node
          neighbors(node).each do |n|
@@ -256,7 +256,7 @@ class GraphViz
          }
 
          return matrix
-      end    
+      end
 
       def degree_matrix
          matrix = GraphViz::Math::Matrix.new( @graph.node_count, @graph.node_count )
@@ -312,7 +312,7 @@ class GraphViz
                   capth = critical_path_recursion( d, a, [cpath], result, level+1 )
                else
                   result << cpath
-               end          
+               end
             end
          end
          return result

data/lib/graphviz/types.rb

@@ -4,16 +4,16 @@ class GraphViz
       def initialize( data )
         @data = check(data)
       end
-      
+
       def output
         return @data
       end
-      
+
       def source
         return @data
       end
     end
-    
+
     Dir.glob( File.dirname( File.expand_path(__FILE__) )+"/types/*.rb" ).each do |f|
       autoload File.basename(f).gsub(File.extname(f), "").split( "_" ).map{|n| n.capitalize }.join.to_sym, f
     end

data/lib/graphviz/types/arrow_type.rb

@@ -4,7 +4,7 @@
 # "hello\n\t\l\"world\""
 #
 # OR
-# 
+#
 # >> x = 'hello\n\t\l"world"'
 # => "hello\\n\\t\\l\"world\""
 # >> puts x.inspect.gsub( "\\\\", "\\" )
@@ -16,11 +16,11 @@ class GraphViz
       def check(data)
         return data
       end
-      
+
       def output
         return @data.to_s.inspect.gsub( "\\\\", "\\" )
       end
-      
+
       alias :to_gv :output
       alias :to_s :output
 

data/lib/graphviz/types/color.rb

@@ -42,11 +42,11 @@ class GraphViz
           return data
         end
       end
-      
+
       def output
         return @data.to_s.inspect.gsub( "\\\\", "\\" )
       end
-      
+
       alias :to_gv :output
       alias :to_s :output
 

data/lib/graphviz/types/color_list.rb

@@ -8,11 +8,11 @@ class GraphViz
         @to_ruby = data.split(/\s*:\s*/).map { |c| GraphViz::Types::Color.new(c).to_ruby }
         return data
       end
-      
+
       def output
         return @data.to_s.inspect.gsub( "\\\\", "\\" )
       end
-      
+
       alias :to_gv :output
       alias :to_s :output
 

data/lib/graphviz/types/esc_string.rb

@@ -4,11 +4,11 @@ class GraphViz
       def check(data)
         return data
       end
-      
+
       def output
         return @data.to_s.inspect.gsub( "\\\\", "\\" )
       end
-      
+
       alias :to_gv :output
       alias :to_s :output
 

data/lib/graphviz/types/gv_bool.rb

@@ -3,11 +3,11 @@ end
 
 # bool
 #
-# For the bool type, 
+# For the bool type,
 # - TRUE values are represented by "true" or "yes" (case-insensitive), true and any non-zero integer
 # - FALSE values by "false", "no" or empty string (case-insensitive), false and zero.
 #
-# Example 
+# Example
 #
 #   graph[:center] = "true"
 # or
@@ -25,7 +25,7 @@ class GraphViz
                @to_ruby = true
                return data
             end
-            
+
             if false == data or (data.is_a?(Integer) and data == 0) or (data.is_a?(String) and BOOL_FALSE.include?(data.downcase))
                @to_ruby = false
                return data

data/lib/graphviz/types/gv_double.rb

@@ -15,15 +15,15 @@ class GraphViz
 
         raise DoubleException, "Invalid double value for `#{data}`"
       end
-      
+
       def output
         return @data.to_s.inspect.gsub( "\\\\", "\\" )
       end
-      
+
       def to_f
         @data.to_f
       end
-      
+
       alias :to_gv :output
       alias :to_s :output
       alias :to_ruby :to_f

data/lib/graphviz/types/html_string.rb

@@ -5,11 +5,11 @@ class GraphViz
       def check(data)
         return data
       end
-      
+
       def output
         return "<"+@data+">"
       end
-      
+
       alias :to_gv :output
       alias :to_s :output
       alias :to_ruby :output

data/lib/graphviz/types/lbl_string.rb

@@ -4,7 +4,7 @@ class GraphViz
       def check(data)
         return data
       end
-      
+
       def output
         html = /^<([<|(^<)*<].*)>$/m.match(@data)
         if html != nil
@@ -13,7 +13,7 @@ class GraphViz
           @data.to_s.inspect.gsub( "\\\\", "\\" )
         end
       end
-      
+
       alias :to_gv :output
       alias :to_s :output
       alias :to_ruby :output

data/lib/graphviz/types/rect.rb

@@ -19,11 +19,11 @@ class GraphViz
 
         raise RectException, "Invalid rect value"
       end
-      
+
       def output
         return @data.to_s.inspect.gsub( "\\\\", "\\" )
       end
-      
+
       alias :to_gv :output
       alias :to_s :output
 

data/lib/graphviz/types/spline_type.rb

@@ -1,7 +1,7 @@
 class SplineTypeException < RuntimeError
 end
 
-# spliteType or point 
+# spliteType or point
 #
 # spline ( ';' spline )*
 # where spline =  (endp)? (startp)? point (triple)+
@@ -9,16 +9,16 @@ end
 # and endp  =  "e,%f,%f"
 # and startp   =  "s,%f,%f"
 #
-# If a spline has points p1 p2 p3 ... pn, (n = 1 (mod 3)), the points correspond 
-# to the control points of a B-spline from p1 to pn. If startp is given, it touches 
-# one node of the edge, and the arrowhead goes from p1 to startp. If startp is not 
-# given, p1 touches a node. Similarly for pn and endp. 
+# If a spline has points p1 p2 p3 ... pn, (n = 1 (mod 3)), the points correspond
+# to the control points of a B-spline from p1 to pn. If startp is given, it touches
+# one node of the edge, and the arrowhead goes from p1 to startp. If startp is not
+# given, p1 touches a node. Similarly for pn and endp.
 class GraphViz
   class Types
     class SplineType < Common
       FLOAT_MASK = /[-+]?(?:[0-9]*\.[0-9]+|[0-9]+)/
       ENDP_MASK = /e\s*,\s*#{FLOAT_MASK}\s*,\s*#{FLOAT_MASK}/
-      STARTP_MASK = /s\s*,\s*#{FLOAT_MASK}\s*,\s*#{FLOAT_MASK}/  
+      STARTP_MASK = /s\s*,\s*#{FLOAT_MASK}\s*,\s*#{FLOAT_MASK}/
       POINT_MASK = /#{FLOAT_MASK}\s*,\s*#{FLOAT_MASK}(?:\s*,\s*#{FLOAT_MASK})?!?/
       TRIPLE_MASK = /#{POINT_MASK}\s+#{POINT_MASK}\s+#{POINT_MASK}/
       SPLINE_MASK = /(?:#{ENDP_MASK}\s+)?(?:#{STARTP_MASK}\s+)?#{POINT_MASK}(?:\s*#{TRIPLE_MASK})+/
@@ -39,11 +39,11 @@ class GraphViz
 
         raise SplineTypeException, "Invalid spline type value"
       end
-      
+
       def output
         return @data.to_s.inspect.gsub( "\\\\", "\\" )
       end
-      
+
       alias :to_gv :output
       alias :to_s :output
 
@@ -64,7 +64,7 @@ class GraphViz
       def triples
       end
 
-      private 
+      private
       def point?
          not @is_spline
       end

data/lib/graphviz/utils.rb

@@ -5,16 +5,16 @@ module GVUtils
   # (http://copiousfreetime.rubyforge.org/launchy/Launchy/Application.html)
   # it follow is licence :
   #
-  # Permission to use, copy, modify, and/or distribute this software for any 
-  # purpose with or without fee is hereby granted, provided that the above 
+  # Permission to use, copy, modify, and/or distribute this software for any
+  # purpose with or without fee is hereby granted, provided that the above
   # copyright notice and this permission notice appear in all copies.
   #
-  # THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES 
-  # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 
-  # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY 
-  # SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
-  # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION 
-  # OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+  # THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+  # SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+  # OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
   # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   def find_executable(bin, custom_paths) #:nodoc:
     system_path = ENV['PATH']
@@ -26,13 +26,13 @@ module GVUtils
       return file_path if File.executable?(file_path) and File.file?(file_path)
 
       if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ # WAS: elsif RUBY_PLATFORM =~ /mswin|mingw/
-        found_ext = (ENV['PATHEXT'] || '.exe;.bat;.com').split(";").find {|ext| File.executable?(file + ext) }
-        return file + found_ext if found_ext
+        found_ext = (ENV['PATHEXT'] || '.exe;.bat;.com').split(";").find {|ext| File.executable?(file_path + ext) }
+        return file_path + found_ext if found_ext
       end
     end
     return nil
   end
-  
+
   def escape_path_containing_blanks(path) #:nodoc:
     path.gsub!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
     path_elements = path.split(File::SEPARATOR)
@@ -45,7 +45,7 @@ module GVUtils
     end
     path_elements.join(File::SEPARATOR)
   end
-  
+
   def output_and_errors_from_command(cmd) #:nodoc:
    unless defined? Open3
      begin
@@ -76,5 +76,5 @@ module GVUtils
      raise "Error from #{cmd}:\n#{errors}"
    end
   end
-  
+
 end

data/lib/graphviz/utils/colors.rb

@@ -2,17 +2,17 @@ require 'graphviz/core_ext'
 
 class GraphViz
    class Utils
-      class Colors 
+      class Colors
          HEX_FOR_COLOR = /[0-9a-fA-F]{2}/
          RGBA = /^(#{HEX_FOR_COLOR})(#{HEX_FOR_COLOR})(#{HEX_FOR_COLOR})(#{HEX_FOR_COLOR})?$/
-      
+
          attr_reader :r, :g, :b, :a
          attr_reader :h, :s, :v
-      
+
          def initialize
             @r, @g, @b, @a, @h, @s, @v, @color = nil, nil, nil, nil, nil, nil, nil, nil
          end
-      
+
          def rgb(r, g, b, a = nil)
             if r.is_a?(Fixnum)
                r = r.to_s.convert_base(10, 16)
@@ -20,64 +20,64 @@ class GraphViz
             unless r.is_a?(String) and HEX_FOR_COLOR.match(r)
                raise ColorException, "Bad red value"
             end
-               
+
             if g.is_a?(Fixnum)
                g = g.to_s.convert_base(10, 16)
             end
             unless g.is_a?(String) and HEX_FOR_COLOR.match(g)
                raise ColorException, "Bad green value"
             end
-            
+
             if b.is_a?(Fixnum)
                b = b.to_s.convert_base(10, 16)
             end
             unless b.is_a?(String) and HEX_FOR_COLOR.match(b)
                raise ColorException, "Bad blue value"
             end
-      
+
             if a.is_a?(Fixnum)
                a = a.to_s.convert_base(10, 16)
             end
             unless a.nil? or (a.is_a?(String) and HEX_FOR_COLOR.match(a))
                raise ColorException, "Bad alpha value"
             end
-      
+
             @r = r
             @g = g
             @b = b
             @a = a
-            
+
             @color = COLORS.key(rgba_string.downcase)
-            
+
             @h, @s, @v = rgb_to_hsv(@r, @g, @b)
          end
-      
+
          def hsv(h, s, v)
             unless h.is_a?(Float) and s.is_a?(Float) and v.is_a?(Float)
                raise ColorException, "Bas HSV value"
             end
-      
+
             @h = h
             @s = s
             @v = v
-      
+
             @r, @g, @b = hsv_to_rgb(@h, @s, @v)
-      
+
             @color = COLORS.key(rgba_string.downcase);
          end
-      
+
          def name(c = nil)
             return @color if c.nil?
 
             @color = c
-      
+
             rgb = COLORS[c]
             unless rgb.nil?
                m = RGBA.match(rgb)
                @r = m[1]
                @g = m[2]
                @b = m[3]
-      
+
                @h, @s, @v = rgb_to_hsv(@r, @g, @b)
             end
          end
@@ -89,7 +89,7 @@ class GraphViz
                nil
             end
          end
-      
+
          def hsv_string(s = ", ")
             unless @h.nil?
                "#{@h}#{s}#{@s}#{s}#{@v}"
@@ -105,45 +105,45 @@ class GraphViz
          def hsv_to_rgb(h, s, v)
             Colors.hsv_to_rgb(h, s, v)
          end
-      
+
          class <<self
             def rgb(r, g, b, a = nil)
                color = Colors.new
                color.rgb(r, g, b, a)
                color
             end
-      
+
             def hsv(h, s, v)
                color = Colors.new
                color.hsv(h, s, v)
                color
             end
-      
+
             def name(c)
                color = Colors.new
                color.name(c)
                color
             end
-      
+
             def rgb_to_hsv(r, g, b)
                h, s, v = 0.0, 0.0, 0.0
-      
+
                _r = r.convert_base(16, 10).to_f / 255.0
                _g = g.convert_base(16, 10).to_f / 255.0
                _b = b.convert_base(16, 10).to_f / 255.0
                rgb = [ _r, _g, _b ]
-      
+
                min = rgb.min
                max = rgb.max
                v = max
-      
+
                delta = max - min
                if max != 0.0
                   s = delta / max
                else
                   return [-1, 0, v]
                end
-      
+
                if _r == max
                   h = ( _g - _b ) / delta
                elsif( _g == max )
@@ -151,29 +151,29 @@ class GraphViz
                else
                   h = 4 + ( _r - _g ) / delta
                end
-                  
+
                h = h * 60
                h = h + 360 if h < 0
                h = h / 360.0
-      
+
                [h, s, v]
             end
-      
+
             def hsv_to_rgb(h, s, v)
                _h, _s, _v = h.to_f * 360.0, s.to_f, v.to_f
-      
-               if _s == 0.0  
+
+               if _s == 0.0
                  r = (_v * 255 ).to_i.to_s.convert_base(10,16)
                  return [r, r, r]
                end
-      
+
                _h = _h / 60.0
                i = _h.floor
                f = _h - i
                p = _v * ( 1.0 - _s )
                q = _v * ( 1.0 - _s * f )
                t = _v * ( 1.0 - _s * ( 1 - f ) )
-               case i 
+               case i
                when 0
                   r = _v
                   g = t
@@ -199,7 +199,7 @@ class GraphViz
                   g = p
                   b = q
                end
-      
+
                [
                   (r * 255).to_i.to_s.convert_base(10, 16),
                   (g * 255).to_i.to_s.convert_base(10, 16),
@@ -207,7 +207,7 @@ class GraphViz
                ]
             end
          end
-         
+
          COLORS = {
             "aliceblue" => "f0f8ff",
             "antiquewhite" => "faebd7",