ruby-graphviz 1.0.8 → 1.0.9

data/lib/graphviz/core_ext.rb

@@ -17,7 +17,7 @@ class Object
    def to_ruby
       begin
          eval self
-      rescue => e
+      rescue
          self
       end
    end

data/lib/graphviz/dot2ruby.rb

@@ -19,7 +19,7 @@ require 'graphviz/ext'
 require 'graphviz/utils'
 
 class Dot2Ruby #:nodoc:
-  include GVUtils
+  include GraphViz::Utils
 
   def initialize( xGVPath, xOutFile, xOutFormat = nil ) #:nodoc:
     paths = (xGVPath.nil?) ? [] : [xGVPath]

data/lib/graphviz/dot_script.rb

@@ -0,0 +1,109 @@
+require "forwardable"
+class GraphViz
+
+  class DOTScriptData
+    attr_accessor :type
+    def initialize(type = nil)
+      @data = []
+      @separator = ""
+      @type = type
+    end
+
+    def append(data)
+      @data << data
+    end
+    alias :<< :append
+
+    def add_attribute(name, value)
+      @data << @separator << name << " = " << value
+      @separator = determine_separator
+    end
+
+    def to_str
+      case @type
+        when "graph_attr" then "#{@data.join}#{@separator}"
+        when "node_attr" then "node[#{@data.join(' ')}];"
+        when "edge_attr" then "edge[#{@data.join(' ')}];"
+        else raise ArgumentError, "Wrong type: #{@type}."
+      end
+    end
+    alias :to_s :to_str
+
+    def empty?
+      @data.empty?
+    end
+
+    private
+
+    def determine_separator
+      case @type
+        when "graph_attr"             then ";\n"
+        when "node_attr", "edge_attr" then ","
+        else raise ArgumentError, "Wrong type: #{@type}."
+      end
+    end
+
+  end
+
+  class DOTScript
+    extend Forwardable
+
+    def_delegators :@script, :end_with?
+
+    def initialize
+      @script = ''
+    end
+
+    def append(line)
+      @script << assure_ends_with(line.to_s,"\n")
+
+      self
+    end
+    alias :<< :append
+
+    def prepend(line)
+      @script = assure_ends_with(line.to_s,"\n") + @script
+
+      self
+    end
+
+    def make_subgraph(name)
+      prepend(assure_ends_with("subgraph #{name}"," {"))
+    end
+
+    def add_type(type, data)
+      return self if data.empty?
+
+      case type
+      when "graph_attr"
+        append_statement("  " + data)
+      when "node_attr"
+        append_statement("  node [" + data + "]")
+      when "edge_attr"
+        append_statement("  edge [" + data + "]")
+      else
+        raise ArgumentError,
+          "Unknown type: #{type}." <<
+          "Possible: 'graph_attr','node_attr','edge_attr'"
+      end
+
+      self
+    end
+
+    def to_str
+      @script
+    end
+    alias :to_s :to_str
+
+    private
+
+    def assure_ends_with(str,ending="\n")
+      str.to_s.end_with?("\n") ? str : str + ending
+    end
+
+    def append_statement(statement)
+      append(assure_ends_with(statement, ";\n"))
+    end
+
+  end
+end

data/lib/graphviz/edge.rb

@@ -19,7 +19,7 @@ require 'graphviz/constants'
 
 class GraphViz
    class Edge
-      include Constants
+      include GraphViz::Constants
 
       # Create a new edge
       #
@@ -45,7 +45,7 @@ class GraphViz
 
       # Return the node one as string (so with port if any)
       def node_one( with_port = true )
-         if not (@node_one_port and with_port)
+         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,7 +55,7 @@ class GraphViz
 
       # Return the node two as string (so with port if any)
       def node_two( with_port = true )
-         if not (@node_two_port and with_port)
+         if not(@node_two_port and with_port)
             GraphViz.escape(@node_two_id)
          else
             GraphViz.escape(@node_two_id, :force => true) + ":#{@node_two_port}"
@@ -172,7 +172,7 @@ class GraphViz
          if xAttr.length > 0
             xOut << " [" + xAttr + "]"
          end
-         xOut + ";"
+         xOut << ";"
 
          return( xOut )
       end

data/lib/graphviz/node.rb

@@ -19,7 +19,7 @@ require 'graphviz/constants'
 
 class GraphViz
    class Node
-      include Constants
+      include GraphViz::Constants
 
       # List of nodes that are directly accessible from given node (in a directed graph neighbors == incidents)
       attr_reader :neighbors

data/lib/graphviz/theory.rb

@@ -150,8 +150,8 @@ class GraphViz
          return nil if range.include?(nil) or @graph.type != "digraph"
          r = [ [0, [1]] ]
 
-         critical_path_recursion( distance_matrix, adjancy_matrix, r, [], 0 ).inject( {:distance => 0, :path => []} ) { |r, item|
-            (r[:distance] < item[0]) ? { :distance => item[0], :path => item[1] } : r
+         critical_path_recursion( distance_matrix, adjancy_matrix, r, [], 0 ).inject( {:distance => 0, :path => []} ) { |_r, item|
+            (_r[:distance] < item[0]) ? { :distance => item[0], :path => item[1] } : _r
          }
       end
 
@@ -309,7 +309,7 @@ class GraphViz
                cpath = [ (p[0] + d[node,succ]), (p[1].clone << succ) ]
 
                if index_of_item( a.line(succ), 1 ).size > 0
-                  capth = critical_path_recursion( d, a, [cpath], result, level+1 )
+                  critical_path_recursion( d, a, [cpath], result, level+1 )
                else
                   result << cpath
                end

data/lib/graphviz/types.rb

@@ -15,7 +15,8 @@ class GraphViz
     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
+      #autoload File.basename(f).gsub(File.extname(f), "").split( "_" ).map{|n| n.capitalize }.join.to_sym, f
+      require f
     end
   end
 end

data/lib/graphviz/types/lbl_string.rb

@@ -6,7 +6,7 @@ class GraphViz
       end
 
       def output
-        html = /^<([<|(^<)*<].*)>$/m.match(@data)
+        html = /^<([<|(^<)*<].*)>$/m.match(@data.to_s)
         if html != nil
           "<#{html[1]}>"
         else

data/lib/graphviz/utils.rb

@@ -1,80 +1,83 @@
 require 'rbconfig'
 
-module GVUtils
-  # Since this code is an adaptation of Launchy::Application#find_executable
-  # (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
-  # 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
-  # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  def find_executable(bin, custom_paths) #:nodoc:
-    system_path = ENV['PATH']
-    user_given_path = Array(custom_paths).join(File::PATH_SEPARATOR)
-    search_path = system_path + File::PATH_SEPARATOR + user_given_path
+class GraphViz
+  module Utils
+    # Since this code is an adaptation of Launchy::Application#find_executable
+    # (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
+    # 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
+    # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+    def find_executable(bin, custom_paths) #:nodoc:
+      system_path = ENV['PATH']
+      user_given_path = Array(custom_paths).join(File::PATH_SEPARATOR)
+      search_path = system_path + File::PATH_SEPARATOR + user_given_path
 
-    search_path.split(File::PATH_SEPARATOR).each do |path|
-      file_path = File.join(path,bin)
-      return file_path if File.executable?(file_path) and File.file?(file_path)
+      search_path.split(File::PATH_SEPARATOR).each do |path|
+        file_path = File.join(path,bin)
+        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_path + ext) }
-        return file_path + found_ext if found_ext
+        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_path + ext) }
+          return file_path + found_ext if found_ext
+        end
       end
+      return nil
     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)
-    path_elements.map! do |element|
-      if element.include?(' ')
-        "\"#{element}\""
-      else
-        element
+    def escape_path_containing_blanks(path) #:nodoc:
+      path.gsub!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
+      path_elements = path.split(File::SEPARATOR)
+      path_elements.map! do |element|
+        if element.include?(' ')
+          "\"#{element}\""
+        else
+          element
+        end
       end
+      path_elements.join(File::SEPARATOR)
     end
-    path_elements.join(File::SEPARATOR)
-  end
 
-  def output_and_errors_from_command(cmd) #:nodoc:
-   unless defined? Open3
-     begin
-       require 'open3'
-       require 'win32/open3'
-     rescue LoadError
-     end
-   end
-   begin
-     Open3.popen3( cmd ) do |stdin, stdout, stderr|
-       stdin.close
-       stdout.binmode
-       [stdout.read, stderr.read]
-     end
-   rescue NotImplementedError, NoMethodError
-     IO.popen( cmd ) do |stdout|
-       stdout.binmode
-       [stdout.read, nil]
-     end
-   end
-  end
+    def output_and_errors_from_command(cmd) #:nodoc:
+      unless defined? Open3
+        begin
+          require 'open3'
+          require 'win32/open3'
+        rescue LoadError
+        end
+      end
+      begin
+        Open3.popen3( cmd ) do |stdin, stdout, stderr|
+          stdin.close
+          stdout.binmode
+          [stdout.read, stderr.read]
+        end
+      rescue NotImplementedError, NoMethodError
+        IO.popen( cmd ) do |stdout|
+          stdout.binmode
+          [stdout.read, nil]
+        end
+      end
+    end
 
-  def output_from_command(cmd) #:nodoc:
-   output, errors = output_and_errors_from_command(cmd)
-   if errors.nil? || errors.strip.empty?
-     output
-   else
-     raise "Error from #{cmd}:\n#{errors}"
-   end
-  end
+    def output_from_command(cmd) #:nodoc:
+      output, errors = output_and_errors_from_command(cmd)
+      if errors.nil? || errors.strip.empty?
+        output
+      else
+        raise "Error from #{cmd}:\n#{errors}"
+      end
+    end
 
+  end
 end
+

data/lib/graphviz/utils/colors.rb

@@ -1,7 +1,7 @@
 require 'graphviz/core_ext'
 
 class GraphViz
-   class Utils
+   module Utils
       class Colors
          HEX_FOR_COLOR = /[0-9a-fA-F]{2}/
          RGBA = /^(#{HEX_FOR_COLOR})(#{HEX_FOR_COLOR})(#{HEX_FOR_COLOR})(#{HEX_FOR_COLOR})?$/

data/man/dot2ruby.1

@@ -0,0 +1,66 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "DOT2RUBY" "1" "April 2013" "" ""
+.
+.SH "NAME"
+\fBdot2ruby\fR \- create a ruby script from a graphviz script
+.
+.SH "SYNOPSIS"
+\fBdot2ruby\fR [\fB\-o\fR\fIfile\fR] [\fB\-T\fR\fIformat\fR] [\fB\-h\fR] [\fB\-V\fR] \fIscript\fR
+.
+.SH "DESCRIPTION"
+\fBdot2ruby\fR is a tool that allows you to create a ruby script from a graphviz script\.
+.
+.P
+See </usr/share/doc/ruby\-graphviz/> for more details\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-o\fR, \fB\-\-output\-file\fR [\fIfile\fR]
+Path to output image file (default STDOUT)
+.
+.TP
+\fB\-T\fR, \fB\-\-output\-format\fR [\fIformat\fR]
+Output format (default: png)
+.
+.TP
+\fB\-p\fR, \fB\-\-path\fR
+Graphviz path
+.
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Show version
+.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Show this usage message
+.
+.SH "EXAMPLE"
+.
+.nf
+
+$ cat hello\.dot
+digraph G {Hello\->World;}
+
+$ dot2ruby hello\.dot
+# This code was generated by dot2ruby\.g
+
+require \'rubygems\'
+require \'graphviz\'
+graph_g = GraphViz\.digraph( "G" ) { |graph_g|
+  graph_g[:bb] = \'0,0,70,108\'
+  node_hello = graph_g\.add_nodes( "Hello", :height => \'0\.5\', :label => \'\eN\', :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 => \'\eN\', :pos => \'35,18\', :width => \'0\.97222\' )
+}
+puts graph_g\.output( :canon => String )
+.
+.fi
+.
+.SH "AUTHOR"
+Copyright 2004\-2013 Gregoire Lejeune
+.
+.P
+This manual page is written by Praveen Arimbrathodiyl \fIpraveen@debian\.org\fR for Debian GNU System (GNU/Linux, GNU/kFreeBSD, GNU/Hurd)\.

data/man/dot2ruby.1.ronn

@@ -0,0 +1,55 @@
+dot2ruby(1) - create a ruby script from a graphviz script
+=========================================================
+
+## SYNOPSIS
+
+`dot2ruby` [`-o`<file>] [`-T`<format>] [`-h`] [`-V`] _script_
+
+## DESCRIPTION
+
+**dot2ruby** is a tool that allows you to create a ruby script from 
+a graphviz script.
+
+See </usr/share/doc/ruby-graphviz/> for more details.
+
+## OPTIONS
+
+ * `-o`, `--output-file` [<file>]:
+   Path to output image file (default STDOUT)
+
+ * `-T`, `--output-format` [<format>]:
+   Output format (default: png)
+
+ * `-p`, `--path`:
+   Graphviz path
+
+ * `-V`, `--version`:
+   Show version
+
+ * `-h`, `--help`:
+   Show this usage message
+
+## EXAMPLE
+
+    $ cat hello.dot
+    digraph G {Hello->World;}
+
+    $ dot2ruby hello.dot
+    # This code was generated by dot2ruby.g
+
+    require 'rubygems'
+    require 'graphviz'
+    graph_g = GraphViz.digraph( "G" ) { |graph_g|
+      graph_g[:bb] = '0,0,70,108'
+      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 )
+
+## AUTHOR
+
+Copyright 2004-2013 Gregoire Lejeune
+
+This manual page is written by Praveen Arimbrathodiyl <praveen@debian.org> for
+Debian GNU System (GNU/Linux, GNU/kFreeBSD, GNU/Hurd).