ruby-graphviz 1.0.8 → 1.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 09cf41331aaf2b0baafb4602ffc9fd380f8b3fe9
+  data.tar.gz: bb8ecb3ec2d96996b88828571fab1b5524f722ca
+SHA512:
+  metadata.gz: bb891ab78f980673972eedbd897d507b5fef69e9bf168765f6fd576025d25f504e2844a9af294166ecf2a89b9c2478307cbdee86f3dd90206e70012306b0ee56
+  data.tar.gz: 3b509fdc45e4332048a718a7bac659b376fa2eeecee2d716d12a252ed507e053e107a190b9184d01c021ef582c679acacfeb6ad3e8c5de755b387a9e5543aa43

data/AUTHORS.rdoc

@@ -20,6 +20,7 @@
 * Neven Has <https://github.com/nevenh>
 * Postmodern <https://github.com/postmodern> 
 * markus1189 <https://github.com/markus1189>
+* Mike Fiedler <https://github.com/miketheman>
 
 Thanks to :
 

data/CHANGELOG.rdoc

@@ -1,5 +1,17 @@
 = CHANGELOG
 
+== 1.0.9 :
+* Add support for attributs 
+  * forcelabels
+  * gradientangle
+  * imagepath
+  * layerlistsep
+  * layerselect
+* Issue #52 : Extracted xDOTScript to DOTScript class (by markus1189)
+* Issue #54 : Fixes a couple of typos and spacing (by Mike Fiedler)
+* Issue #55 : Avoid autoload
+* Update graphviz attributs
+
 == 1.0.8 :
 * Cleanup format (by markus1189)
 * Issue #49 : (undefined local variable or method `file' ) (by markus1189)

data/README.rdoc

@@ -1,5 +1,7 @@
 = Ruby/GraphViz
 
+{<img src="https://secure.travis-ci.org/glejeune/Ruby-Graphviz.png" />}[http://travis-ci.org/glejeune/Ruby-Graphviz]
+
 Copyright (C) 2004-2012 Gregoire Lejeune
 
 * Doc : http://rdoc.info/projects/glejeune/Ruby-Graphviz

data/Rakefile

@@ -29,7 +29,7 @@ RDoc::Task.new do |rdoc|
     rdoc.main = "README.rdoc"
     rdoc.title = "Ruby/GraphViz, the Documentation"
     rdoc.rdoc_files.add ['README.rdoc', 'CHANGELOG.rdoc', 'AUTHORS.rdoc', 'COPYING.rdoc',
-      'lib/graphviz.rb', 
+      'lib/graphviz.rb',
       'lib/graphviz/node.rb',
       'lib/graphviz/edge.rb',
       'lib/graphviz/constants.rb',
@@ -44,11 +44,18 @@ end
 
 Rake::TestTask.new(:test) do |t|
   require 'graphviz/utils'
-  include GVUtils
-  if find_executable("dot", nil).nil?
-    t.test_files = FileList['test/test_*.rb'].exclude("test/test_examples.rb") 
-  else
-    t.test_files = FileList['test/test_*.rb']
+  include GraphViz::Utils
+  test_files = FileList['test/test_*.rb'].exclude('test/test_dot_script.rb')
+  test_files.unshift('test/test_dot_script.rb')
+  test_files.exclude("test/test_examples.rb") unless find_executable("dot", nil)
+  t.test_files = test_files
+end
+
+desc "Generate man pages"
+task :man do
+  require 'ronn'
+  chdir 'man' do
+    sh "ronn -r *.ronn"
   end
 end
 

data/bin/dot2ruby

@@ -30,7 +30,7 @@ def usage
 end
 
 def version
-  puts "Dot2Ruby v#{Constants::RGV_VERSION}, (c) 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>"
+  puts "Dot2Ruby v#{GraphViz::Constants::RGV_VERSION}, (c) 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>"
   puts ""
   puts "This program is free software; you can redistribute it and/or modify"
   puts "it under the terms of the GNU General Public License as published by"
@@ -76,7 +76,7 @@ begin
         exit
     end
   end
-rescue GetoptLong::InvalidOption => e
+rescue GetoptLong::InvalidOption
   usage( )
   exit
 end

data/bin/gem2gv

@@ -96,7 +96,7 @@ def usage
 end
 
 def version
-  puts "Gem2GraphViz v#{Constants::RGV_VERSION}, (c)2010 Gregoire Lejeune <gregoire.lejeune@free.fr>"
+  puts "Gem2GraphViz v#{GraphViz::Constants::RGV_VERSION}, (c)2010 Gregoire Lejeune <gregoire.lejeune@free.fr>"
   puts ""
   puts "This program is free software; you can redistribute it and/or modify"
   puts "it under the terms of the GNU General Public License as published by"
@@ -117,7 +117,6 @@ xOutFormat = "png"
 xOutFile = nil
 xGVPath = ""
 xUse = "dot"
-xStops = []
 
 oOpt = GetoptLong.new(
   ['--output-format', '-T', GetoptLong::REQUIRED_ARGUMENT],
@@ -147,7 +146,7 @@ begin
         exit
     end
   end
-rescue GetoptLong::InvalidOption => e
+rescue GetoptLong::InvalidOption
   usage( )
   exit
 end

data/bin/git2gv

@@ -108,7 +108,7 @@ def usage
 end
 
 def version
-  puts "Git2GraphViz v#{Constants::RGV_VERSION}, (c)2010 Gregoire Lejeune <gregoire.lejeune@free.fr>"
+  puts "Git2GraphViz v#{GraphViz::Constants::RGV_VERSION}, (c)2010 Gregoire Lejeune <gregoire.lejeune@free.fr>"
   puts ""
   puts "This program is free software; you can redistribute it and/or modify"
   puts "it under the terms of the GNU General Public License as published by"
@@ -158,12 +158,10 @@ begin
         exit
     end
   end
-rescue GetoptLong::InvalidOption => e
+rescue GetoptLong::InvalidOption
   usage( )
   exit
 end
 
-xFile = ARGV[0]
-
 Git2Gv.new( xGVPath, xOutFile, xOutFormat, bNothugly ).run
 

data/bin/ruby2gv

@@ -78,7 +78,7 @@ class Rb2Gv
 
       # Search in "standard" paths
       xPath.each do |xDir|
-        xCurrentPath = Config::expand( Config::CONFIG[xDir] )
+        xCurrentPath = RbConfig::expand( RbConfig::CONFIG[xDir] )
         xFileFound = File.join( xCurrentPath, xRbFileWithExt )
         if File.exist?( xFileFound )
           return xFileFound
@@ -86,16 +86,17 @@ class Rb2Gv
       end
 
       # Search in "rubygems" :: This is not utile but...
-      spec = Gem.searcher.find(xLib)
-      unless spec.nil?
-        spec.require_paths.unshift spec.bindir if spec.bindir
-        xPath = spec.require_paths.map do |path|
-          File.join spec.full_gem_path, path
-        end
-        xPath.each do |xCurrentPath|
-          xFileFound = File.join( xCurrentPath, xRbFileWithExt )
-          if File.exist?( xFileFound )
-            return xFileFound
+      Gem::Specification.find_all do |spec|
+        if spec == xLib
+          spec.require_paths.unshift spec.bindir if spec.bindir
+          xPath = spec.require_paths.map do |path|
+            File.join spec.full_gem_path, path
+          end
+          xPath.each do |xCurrentPath|
+            xFileFound = File.join( xCurrentPath, xRbFileWithExt )
+            if File.exist?( xFileFound )
+              return xFileFound
+            end
           end
         end
       end
@@ -112,11 +113,7 @@ class Rb2Gv
       puts "Parse #{xFile} :" if DEBUG
     end
 
-    fp = open( xFile, 'r' )
-    xData = fp.read()
-    fp.close
-
-    xData.each do |xLine|
+    File.open(xFile, 'r').each_line do |xLine|
       if lxLineMatch = REQUIRE.match( xLine )
         xRequiredLib = lxLineMatch[2].gsub( /\.(rb|so)$/, "" )
 
@@ -132,7 +129,7 @@ class Rb2Gv
               @hxNodes[xRequiredLib] = gv_newNode( xRequiredLib, "invhouse", "deepskyblue" )
             end
           else
-            if (v = getLibraryPath( xRequiredLib, ["so", "bundle", "dll"] )) == nil
+            if getLibraryPath( xRequiredLib, ["so", "bundle", "dll"] ) == nil
               @hxNodes[xRequiredLib] = gv_newNode( xRequiredLib, "box", "red" )
             else
               @hxNodes[xRequiredLib] = gv_newNode( xRequiredLib, "box", "grey" )
@@ -165,7 +162,7 @@ def usage
 end
 
 def version
-  puts "Ruby2GraphViz v#{Constants::RGV_VERSION}, (c)2005, 2009, 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>"
+  puts "Ruby2GraphViz v#{GraphViz::Constants::RGV_VERSION}, (c)2005, 2009, 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>"
   puts ""
   puts "This program is free software; you can redistribute it and/or modify"
   puts "it under the terms of the GNU General Public License as published by"
@@ -219,7 +216,7 @@ begin
         exit
     end
   end
-rescue GetoptLong::InvalidOption => e
+rescue GetoptLong::InvalidOption
   usage( )
   exit
 end

data/bin/xml2gv

@@ -30,7 +30,7 @@ def usage
 end
 
 def version
-  puts "XML2GraphViz v#{Constants::RGV_VERSION}, (c)2010 Gregoire Lejeune <gregoire.lejeune@free.fr>"
+  puts "XML2GraphViz v#{GraphViz::Constants::RGV_VERSION}, (c)2010 Gregoire Lejeune <gregoire.lejeune@free.fr>"
   puts ""
   puts "This program is free software; you can redistribute it and/or modify"
   puts "it under the terms of the GNU General Public License as published by"
@@ -80,7 +80,7 @@ begin
         exit
     end
   end
-rescue GetoptLong::InvalidOption => e
+rescue GetoptLong::InvalidOption
   usage( )
   exit
 end

data/examples/sample38.rb

@@ -2,11 +2,11 @@
 $:.unshift( "../lib" )
 require "graphviz"
 
-g = GraphViz::new( :G ) { |g|
-  g.a[:label => "ε"]
-  g.add_nodes( "b", :label => "ε" )
-  g.c[:label => 'ε']
-  g.add_nodes( "d", :label => 'ε' )
+g = GraphViz::new( :G ) { |_g|
+  _g.a[:label => "ε"]
+  _g.add_nodes( "b", :label => "ε" )
+  _g.c[:label => 'ε']
+  _g.add_nodes( "d", :label => 'ε' )
 }
 
 puts g.output( :none => String, :png => "#{$0}.png", :path => "/usr/local/bin" )

data/lib/graphviz.rb

@@ -26,6 +26,7 @@ require 'graphviz/edge'
 require 'graphviz/attrs'
 require 'graphviz/constants'
 require 'graphviz/elements'
+require 'graphviz/dot_script'
 
 require 'graphviz/dot2ruby'
 require 'graphviz/types'
@@ -36,38 +37,38 @@ if /^1.8/.match RUBY_VERSION
 end
 
 class GraphViz
-  include Constants
-  include GVUtils
+  include GraphViz::Constants
+  include GraphViz::Utils
 
   public
 
   ## Var: Output format (dot, png, jpeg, ...)
   @@format = nil #"canon"
-  @format
+  @format = nil
   ## Var: Output file name
-  @filename
+  @filename = nil
   ## Var: Output format and file
-  @output
+  @output = nil
   ## Var: program to use (dot|twopi)
   @@prog = "dot"
-  @prog
+  @prog = nil
   ## Var: program path
   @@path = []
-  @path
+  @path = nil
   ## Var: Error level
   @@errors = 1
-  @errors
+  @errors = nil
   ## Var: External libraries
   @@extlibs = []
-  @extlibs
+  @extlibs = nil
 
   ## Var: Graph name
-  @name
+  @name = nil
 
   ## Var: defined attributes
-  @graph
-  @node
-  @edge
+  @graph = nil
+  @node = nil
+  @edge = nil
 
   # This accessor allow you to set global graph attributes
   attr_accessor :graph
@@ -81,12 +82,13 @@ class GraphViz
   attr_accessor :edge
   alias_method :edge_attrs, :edge
 
-  @elements_order
+  @elements_order = nil
 
-  #<b>DEPRECATED</b> please use GraphViz#add_nodes
   def add_node( xNodeName, hOpts = {} )
-     warn "GraphViz#add_node is deprecated, please use GraphViz#add_nodes"
-     return add_nodes(xNodeName, hOpts)
+    if xNodeName.kind_of? Array
+      raise ArgumentError, "use `add_nodes' to add several nodes at the same time"
+    end
+    return add_nodes(xNodeName, hOpts)
   end
 
   # Create a new node
@@ -179,10 +181,11 @@ class GraphViz
     @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"
-     add_edges(oNodeOne, oNodeTwo, hOpts)
+    if oNodeTwo.kind_of? Array or oNodeOne.kind_of? Array 
+      raise ArgumentError, "use `add_edges' to add several edges at the same time"
+    end
+    add_edges(oNodeOne, oNodeTwo, hOpts)
   end
 
   # Create a new edge
@@ -409,9 +412,9 @@ class GraphViz
   # Generate the graph
   #
   # Options :
-  # * :output : Output format (Constants::FORMATS)
+  # * :output : Output format (GraphViz::Constants::FORMATS)
   # * :file : Output file name
-  # * :use : Program to use (Constants::PROGRAMS)
+  # * :use : Program to use (GraphViz::Constants::PROGRAMS)
   # * :path : Program PATH
   # * :<format> => <file> : <file> can be
   #   * a file name
@@ -423,86 +426,15 @@ class GraphViz
   #   * 2 = none
   #
   def output( hOpts = {} )
-    xDOTScript = ""
-    xLastType = nil
-    xSeparator = ""
-    xData = ""
+    xDOTScript = DOTScript.new
     lNotHugly = []
 
-    @elements_order.each { |kElement|
-      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
-
-      xLastType = kElement["type"]
-
-      #Modified by
-      #Brandon Coleman
-      #verify value is NOT NULL
-      if kElement["value"] == nil then
-        raise ArgumentError, "#{kElement["name"]} has a nil value!"
-      end
-
-      case kElement["type"]
-        when "graph_attr"
-          xData << xSeparator + kElement["name"] + " = " + kElement["value"].to_gv
-          xSeparator = "; "
-
-        when "node_attr"
-          xData << xSeparator + kElement["name"] + " = " + kElement["value"].to_gv
-          xSeparator = ", "
-
-        when "edge_attr"
-          xData << xSeparator + kElement["name"] + " = " + kElement["value"].to_gv
-          xSeparator = ", "
-
-        when "node"
-          xDOTScript << "  " + kElement["value"].output() + "\n"
-
-        when "edge"
-          xDOTScript << "  " + kElement["value"].output( @oGraphType ) + "\n"
-
-        when "graph"
-          xDOTScript << kElement["value"].output() + "\n"
-
-        else
-          raise ArgumentError, "Don't know what to do with element type '#{kElement['type']}'"
-      end
-    }
-
-    if xData.length > 0
-      case xLastType
-        when "graph_attr"
-          xDOTScript << "  " + xData + ";\n"
+    append_attributes_and_types(xDOTScript)
 
-        when "node_attr"
-          xDOTScript << "  node [" + xData + "];\n"
-
-        when "edge_attr"
-          xDOTScript << "  edge [" + xData + "];\n"
-      end
-    end
     xDOTScript << "}"
 
-    if @oParentGraph
-      xDOTScript = "subgraph #{GraphViz.escape(@name, :unquote_empty => true)} {\n" << xDOTScript
-
-      return( xDOTScript )
+    if has_parent_graph?
+      xDOTScript.make_subgraph("#{GraphViz.escape(@name, :unquote_empty => true)}")
     else
       hOutput = {}
 
@@ -554,7 +486,7 @@ class GraphViz
             begin
               require 'graphviz/nothugly'
               @nothugly = true
-            rescue LoadError => e
+            rescue LoadError
               warn "You must install ruby-xslt or libxslt-ruby to use nothugly option!"
               @nothugly = false
             end
@@ -569,7 +501,9 @@ class GraphViz
       @output = hOutput if hOutput.size > 0
 
       xStict = ((@strict && @oGraphType == "digraph") ? "strict " : "")
-      xDOTScript = ("#{xStict}#{@oGraphType} #{GraphViz.escape(@name, :unquote_empty => true)} {\n" << xDOTScript).gsub( "\0", "" )
+      xDOTScript.prepend(
+        "#{xStict}#{@oGraphType} #{GraphViz.escape(@name, :unquote_empty => true)} {"
+      )
 
       xOutputString = (@filename == String ||
         @output.any? {|format, file| file == String })
@@ -633,7 +567,7 @@ class GraphViz
         xOtherOptions += " -x" if @reduce_graph
         xOtherOptions += " -Lg" if @Lg
         xOtherOptions += " -LO" if @LO
-        xOtherOptions += " -Ln#{@Ln}" unless @LN.nil?
+        xOtherOptions += " -Ln#{@Ln}" unless @Ln.nil?
         xOtherOptions += " -LU#{@LU}" unless @LU.nil?
         xOtherOptions += " -LC#{@LC}" unless @LC.nil?
         xOtherOptions += " -LT#{@LT}" unless @LT.nil?
@@ -671,9 +605,37 @@ class GraphViz
       end
     end
   end
-
   alias :save :output
 
+  def append_attributes_and_types(script)
+    script_data = DOTScriptData.new
+
+    @elements_order.each { |kElement|
+      is_new_type = script_data.type != kElement["type"]
+      if is_new_type 
+        unless script_data.type.nil? or script_data.empty?
+          script << script_data
+        end
+        script_data = DOTScriptData.new(kElement["type"])
+      end
+
+      # Modified by Brandon Coleman verify value is NOT NULL
+      kElement["value"] or raise ArgumentError, "#{kElement["name"]} is nil!"
+
+      case kElement["type"]
+        when "graph_attr", "node_attr", "edge_attr"
+          script_data.add_attribute(kElement["name"], kElement["value"].to_gv)
+        when "node", "graph"
+          script << kElement["value"].output()
+        when "edge"
+          script << "  " + kElement["value"].output( @oGraphType )
+        else
+          raise ArgumentError,
+            "Don't know what to do with element type '#{kElement['type']}'"
+      end
+    }
+  end
+
   def to_s
     self.output(:none => String)
   end
@@ -755,7 +717,7 @@ class GraphViz
         when "extlibs"
           @@extlibs = v.split( "," ).map{ |x| x.strip }
         else
-          warn "Invalide option #{k}!"
+          warn "Invalid option #{k}!"
       end
     end
   end
@@ -769,9 +731,9 @@ class GraphViz
   # Create a new graph from a GraphViz File
   #
   # Options :
-  # * :output : Output format (Constants::FORMATS) (default : dot)
+  # * :output : Output format (GraphViz::Constants::FORMATS) (default : dot)
   # * :file : Output file name (default : none)
-  # * :use : Program to use (Constants::PROGRAMS) (default : dot)
+  # * :use : Program to use (GraphViz::Constants::PROGRAMS) (default : dot)
   # * :path : Program PATH
   #
   def self.parse( xFile, hOpts = {}, &block )
@@ -783,9 +745,9 @@ class GraphViz
   # Create a new graph from a GraphViz File
   #
   # Options :
-  # * :output : Output format (Constants::FORMATS) (default : dot)
+  # * :output : Output format (GraphViz::Constants::FORMATS) (default : dot)
   # * :file : Output file name (default : none)
-  # * :use : Program to use (Constants::PROGRAMS) (default : dot)
+  # * :use : Program to use (GraphViz::Constants::PROGRAMS) (default : dot)
   # * :path : Program PATH
   #
   def self.parse_string( str, hOpts = {}, &block )
@@ -807,33 +769,37 @@ class GraphViz
 
   # Return true if the graph is directed.
   def directed?
-     not (/digraph/ =~ "bla digraph bla").nil?
+    not((/digraph/ =~ "bla digraph bla").nil?)
+  end
+
+  def has_parent_graph?
+     @oParentGraph
   end
 ## ----------------------------------------------------------------------------
 
   private
 
   ## Var: Nodes, Edges and Graphs tables
-  @hoNodes
-  @loEdges
-  @hoGraphs
+  @hoNodes = nil
+  @loEdges = nil
+  @hoGraphs = nil
 
   ## Var: Parent graph
-  @oParentGraph
+  @oParentGraph = nil
 
   ## Var: Type de graphe (orienté ou non)
-  @oGraphType
+  @oGraphType = nil
 
   #
   # Create a new graph object
   #
   # Options :
-  # * :output : Output format (Constants::FORMATS) (default : dot)
+  # * :output : Output format (GraphViz::Constants::FORMATS) (default : dot)
   # * :file : Output file name (default : nil)
-  # * :use : Program to use (Constants::PROGRAMS) (default : dot)
+  # * :use : Program to use (GraphViz::Constants::PROGRAMS) (default : dot)
   # * :path : Program PATH
   # * :parent : Parent graph (default : nil)
-  # * :type : Graph type (Constants::GRAPHTYPE) (default : digraph)
+  # * :type : Graph type (GraphViz::Constants::GRAPHTYPE) (default : digraph)
   # * :errors : DOT error level (default 1)
   #   * 0 = Error + Warning
   #   * 1 = Error
@@ -953,7 +919,7 @@ class GraphViz
      end
 
      nodes = (1..num_nodes).map{ |e| e.to_s }
-     x = g.add_nodes(nodes)
+     g.add_nodes(nodes)
 
      edges = []
      nodes.each do |head|