ruby-graphviz 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09cf41331aaf2b0baafb4602ffc9fd380f8b3fe9
-  data.tar.gz: bb8ecb3ec2d96996b88828571fab1b5524f722ca
+  metadata.gz: b41b2ddc156dd0ea02af2fdc5914e9494e61a4e0
+  data.tar.gz: a10df946f3a81fb23d44dafe6b3d89c46dc64cad
 SHA512:
-  metadata.gz: bb891ab78f980673972eedbd897d507b5fef69e9bf168765f6fd576025d25f504e2844a9af294166ecf2a89b9c2478307cbdee86f3dd90206e70012306b0ee56
-  data.tar.gz: 3b509fdc45e4332048a718a7bac659b376fa2eeecee2d716d12a252ed507e053e107a190b9184d01c021ef582c679acacfeb6ad3e8c5de755b387a9e5543aa43
+  metadata.gz: 343df04cb63e2694e04ae3c6cb1343207aa13f6e4b7abdbd6f394613045bb04aa508050903179c757eeec9699dd3034dddfe0305a0e2d2ee0244454586593b2e
+  data.tar.gz: 3f9eb3928166fc170e924a6c302d2baf1c685930431700f3bf792fd1d51712c5ba85f8f7f33fa13a533a77629279f4fea270ee9dda6318f81f4d83a18a243a8b

data/.travis.yml

@@ -1,6 +1,7 @@
 rvm:
   - 1.8.7
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
   - jruby
-  - rbx-18mode
-  - rbx-19mode
+  - rbx-2

data/AUTHORS.rdoc

@@ -19,8 +19,12 @@
 * coding64 <https://github.com/coding46>
 * Neven Has <https://github.com/nevenh>
 * Postmodern <https://github.com/postmodern> 
-* markus1189 <https://github.com/markus1189>
 * Mike Fiedler <https://github.com/miketheman>
+* Kenichi Kamiya <https://github.com/kachick>
+* Gabe Kopley <https://github.com/gkop>
+* markus1189 <https://github.com/markus1189>
+* Praveen Arimbrathodiyil <https://github.com/pravi>
+* Andrew <https://github.com/AndrewKvalheim>
 
 Thanks to :
 

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = CHANGELOG
 
+== 1.1.0 :
+* Issue #61 : Combine graphviz instances
+* Issue #73 : Avoid constructing shell commands as strings
+* Bug correction with development dependencies on JRuby
+
 == 1.0.9 :
 * Add support for attributs 
   * forcelabels
@@ -10,6 +15,11 @@
 * 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
+* Issue #57 : Add man pages for the commandline programs (by Praveen Arimbrathodiyil)
+* Issue #59 : Support label as Fixnum (by Gabe Kopley)
+* Issue #62 : Remove warnings (by Kenichi Kamiya)
+* Issue #63 : Fix typo (by Kenichi Kamiya)
+* Issue #65 : ruby-graphviz breaks autoloading of ActiveSupport::Concerns
 * Update graphviz attributs
 
 == 1.0.8 :

data/README.rdoc

@@ -1,8 +1,9 @@
 = Ruby/GraphViz
 
 {<img src="https://secure.travis-ci.org/glejeune/Ruby-Graphviz.png" />}[http://travis-ci.org/glejeune/Ruby-Graphviz]
+{<img src="https://badge.fury.io/rb/ruby-graphviz.png" alt="Gem Version" />}[http://badge.fury.io/rb/ruby-graphviz]
 
-Copyright (C) 2004-2012 Gregoire Lejeune
+Copyright (C) 2004-2013 Gregoire Lejeune
 
 * Doc : http://rdoc.info/projects/glejeune/Ruby-Graphviz
 * Sources : http://github.com/glejeune/Ruby-Graphviz

data/Rakefile

@@ -13,9 +13,9 @@ include FileUtils
 
 CLEAN.include ['**/.*.sw?', '*.gem', '.config', 'test/test.log']
 RDOC_OPTS = ['--quiet', '--title', "Ruby/GraphViz, the Documentation",
-    "--opname", "index.html",
-    "--line-numbers",
-    "--main", "README.rdoc"]
+  "--opname", "index.html",
+  "--line-numbers",
+  "--main", "README.rdoc"]
 
 desc "Packages up Ruby/GraphViz."
 task :default => [:test, :package]
@@ -24,38 +24,46 @@ task :package => [:clean]
 task :doc => :rdoc
 
 RDoc::Task.new do |rdoc|
-    rdoc.rdoc_dir = 'doc/rdoc'
-    rdoc.options += RDOC_OPTS
-    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/node.rb',
-      'lib/graphviz/edge.rb',
-      'lib/graphviz/constants.rb',
-      'lib/graphviz/xml.rb',
-      'lib/graphviz/graphml.rb',
-      'lib/graphviz/family_tree.rb',
-      'lib/graphviz/family_tree/couple.rb',
-      'lib/graphviz/family_tree/generation.rb',
-      'lib/graphviz/family_tree/person.rb',
-      'lib/graphviz/family_tree/sibling.rb']
+  rdoc.rdoc_dir = 'doc/rdoc'
+  rdoc.options += RDOC_OPTS
+  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/node.rb',
+    'lib/graphviz/edge.rb',
+    'lib/graphviz/constants.rb',
+    'lib/graphviz/xml.rb',
+    'lib/graphviz/graphml.rb',
+    'lib/graphviz/family_tree.rb',
+    'lib/graphviz/family_tree/couple.rb',
+    'lib/graphviz/family_tree/generation.rb',
+    'lib/graphviz/family_tree/person.rb',
+    'lib/graphviz/family_tree/sibling.rb']
 end
 
 Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib' << 'test'
+  t.verbose = true
+
   require 'graphviz/utils'
   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 = FileList['test/test_*.rb']
   test_files.exclude("test/test_examples.rb") unless find_executable("dot", nil)
+
+  p test_files
   t.test_files = test_files
 end
 
 desc "Generate man pages"
 task :man do
-  require 'ronn'
-  chdir 'man' do
-    sh "ronn -r *.ronn"
+  unless RUBY_PLATFORM == 'java'
+    require 'ronn'
+    chdir 'man' do
+      sh "ronn -r *.ronn"
+    end
+  else
+    puts "Can't generate man pages with JRuby"
   end
 end
 

data/examples/sample70.rb

@@ -0,0 +1,9 @@
+$:.unshift( "../lib" )
+require 'graphviz'
+
+puts GraphViz.graph( :G ) { |g|
+  g[:label] = "<<b>This</b> is <i>a</i> <b>test</b>>"
+  n1 = g.add_nodes( "N1", :label => '<<b>node 1</b>>')
+  n2 = g.add_nodes( "N2", :label => '<<b>node 2</b>>')
+  g.add_edges( n1, n2, :label => '<<u>edge</u>>')
+}.output( :svg => "#{$0}.svg", :none => String )

data/examples/sample71.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../lib" )
+require "graphviz"
+
+g = nil
+if ARGV[0]
+  g = GraphViz::new( "G", :path => ARGV[0] )
+else
+  g = GraphViz::new( "G" )
+end
+
+g.add_edges("noDe", "graph")
+g.add_edges("node", "graph")
+g.add_edges("node", "Graph")
+g.add_edges("graph", "subgraph")
+g.add_edges("edge", "node")
+g.add_edges("subgraph", "digraph")
+g.add_edges("subgraph", "strict")
+
+g.output( :png => "#{$0}.png" )

data/examples/sample72.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../lib" )
+require "graphviz"
+
+g = nil
+if ARGV[0]
+  g = GraphViz::new( "G", :path => ARGV[0] )
+else
+  g = GraphViz::new( "G" )
+end
+
+g.node[:color] = "#FF0000:#FFFFFF"
+g.add_edges("noDe", "graph")
+g.add_edges("node", "graph")
+g.add_edges("node", "Graph")
+g.add_edges("graph", "subgraph")
+g.add_edges("edge", "node")
+g.add_edges("subgraph", "digraph")
+g.add_edges("subgraph", "strict")
+
+g.output( :png => "#{$0}.png" )

data/lib/ext/gvpr/dot2ruby.g

@@ -25,6 +25,8 @@ BEGIN {
   string attr; string attrv;
   graph_t subgraph; graph_t pgraph;
   graph_t ofgraph;
+  graph_t sub_graph;
+  graph_t tmp_g;
 
   string xOut;
   if( ARGC == 0 ) {
@@ -49,6 +51,55 @@ BEGIN {
     sout = gsub(sout, "$", "\\$");
     return( sout );
   }
+
+  void load_sub_graph( graph_t p ) {
+    if(p == NULL) {
+      return;
+    }
+    sub_graph = fstsubg(p);
+    while( sub_graph != NULL ) {
+      pgraph = sub_graph.parent;
+      printf ( "  graph_%s = graph_%s.add_graph( \"%s\" )\n", rubyfy(sub_graph.name), rubyfy(pgraph.name), rubyfy(sub_graph.name) );
+
+      // ATTRS
+      attr = fstAttr(sub_graph, "G");
+      while( attr != "" ) {
+        attrv = aget( sub_graph, attr );
+        if( attrv != "" ) {
+          printf( "  graph_%s[:%s] = '%s'\n", rubyfy(sub_graph.name), attr, attrv );
+        }
+        attr = nxtAttr( sub_graph, "G", attr );
+      }
+      tmp_g = sub_graph;
+      load_sub_graph(sub_graph);
+      sub_graph = nxtsubg( tmp_g );
+
+    }
+  }
+
+  graph_t get_node_graph(node_t n, graph_t p) {
+    sub_graph = fstsubg(p);
+    while( sub_graph != NULL ) {
+      if( isSubnode( sub_graph, n) != 0 ) {
+        return get_node_graph(n, sub_graph);
+      }    
+      sub_graph = nxtsubg( sub_graph );
+    }
+    return p;
+  }
+
+  graph_t get_edge_graph(edge_t e, graph_t p) {
+    sub_graph = fstsubg(p);
+    while( sub_graph != NULL ) {
+      if( isSubedge( sub_graph, e) != 0 ) {      
+        return get_edge_graph(e, sub_graph);
+      }    
+      sub_graph = nxtsubg( sub_graph );
+    }
+    return p;
+  }
+
+
 }
 
 BEG_G {
@@ -77,83 +128,50 @@ BEG_G {
     attr = nxtAttr( $, "G", attr );
   }
   
-  // Subgraph
-  subgraph = fstsubg( $ );
-  while( subgraph != NULL ) {
-    pgraph = subgraph.parent;
-    printf ( "  graph_%s = graph_%s.add_graph( \"%s\" )\n", rubyfy(subgraph.name), rubyfy(pgraph.name), rubyfy(subgraph.name) );
-    
-    // ATTRS
-    attr = fstAttr(subgraph, "G");
-    while( attr != "" ) {
-      attrv = aget( subgraph, attr );
-      if( attrv != "" ) {
-        printf( "  graph_%s[:%s] = '%s'\n", rubyfy(subgraph.name), attr, attrv );
-      }
-      attr = nxtAttr( subgraph, "G", attr );
-    }
-    
-    subgraph = nxtsubg( subgraph );
-  }
+  load_sub_graph($);
 }
 
 N {
   pgraph = $.root;
-  ofgraph = pgraph;
-
-  subgraph = fstsubg( pgraph );
-  while( subgraph != NULL ) {
-    if( isSubnode( subgraph, $ ) != 0 ) {
-      ofgraph = subgraph;
-    }
-    subgraph = nxtsubg( subgraph );
-  }
+  ofgraph = get_node_graph($, pgraph);
   
   printf( "  node_%s = graph_%s.add_nodes( \"%s\"", rubyfy($.name), rubyfy(ofgraph.name), stringify($.name) );
 
   // Attributs of N
-  attr = fstAttr($G, "N");
-  while( attr != "" ) {
-    attrv = aget( $, attr );
-    if( attrv != "" ) {
-      printf( ", :%s => '%s'", attr, gsub( attrv, "'", "\\'" ) );
-    } else {
-      printf( ", :%s => ''", attr );
+    attr = fstAttr($G, "N");
+    while( attr != "" ) {
+      attrv = aget( $, attr );
+      if( attrv != "" ) {
+        printf( ", :%s => '%s'", attr, gsub( attrv, "'", "\\'" ) );
+      } else {
+        printf( ", :%s => ''", attr );
+      }
+      attr = nxtAttr( $G, "N", attr );
     }
-    attr = nxtAttr( $G, "N", attr );
+
+    printf( " )\n");
   }
-  
-  printf( " )\n");
-}
 
 E {
-  pgraph = $.root;
-  ofgraph = pgraph;
-
-  subgraph = fstsubg( pgraph );
-  while( subgraph != NULL ) {
-    if( isSubedge( subgraph, $ ) != 0 ) {
-      ofgraph = subgraph;
-    }
-    subgraph = nxtsubg( subgraph );
-  }
+   pgraph = $.root;
+    ofgraph = get_edge_graph($, $.root);  
 
   printf( "  graph_%s.add_edges( \"%s\", \"%s\"", rubyfy(ofgraph.name), stringify($.tail.name), stringify($.head.name) );
-  
-  // Attributs of E
-  attr = fstAttr($G, "E");
-  while( attr != "" ) {
-    attrv = aget( $, attr );
-    if( attrv != "" ) {
-      printf( ", :%s => '%s'", attr, gsub( attrv, "'", "\\'" ) );
-    } else {
-      printf( ", :%s => ''", attr );
+
+// Attributs of E
+    attr = fstAttr($G, "E");
+    while( attr != "" ) {
+      attrv = aget( $, attr );
+      if( attrv != "" ) {
+        printf( ", :%s => '%s'", attr, gsub( attrv, "'", "\\'" ) );
+      } else {
+        printf( ", :%s => ''", attr );
+      }
+      attr = nxtAttr( $G, "E", attr );
     }
-    attr = nxtAttr( $G, "E", attr );
+
+    printf( " )\n" );
   }
-  
-  printf( " )\n" );
-}
 
 END_G {
   printf( "}\n" );
@@ -161,7 +179,7 @@ END_G {
     if( xOut == "-" ) {
       printf( "@_graph_eval = graph_%s\n", rubyfy($.name) );
     } else {
-      printf( "graph_%s.output( :%s => \"%s.%s\" )\n", rubyfy($.name), xOut, gsub($F, ".*/", ""), xOut );
+  printf( "graph_%s.output( :%s => \"%s.%s\" )\n", rubyfy($.name), xOut, gsub($F, ".*/", ""), xOut );
     }
   }
 }

data/lib/graphviz.rb

@@ -82,6 +82,7 @@ class GraphViz
   attr_accessor :edge
   alias_method :edge_attrs, :edge
 
+
   @elements_order = nil
 
   def add_node( xNodeName, hOpts = {} )
@@ -390,7 +391,12 @@ class GraphViz
         self[key] = value
       end
     else
-      return( @graph[xAttrName].clone )
+      attr = @graph[xAttrName]
+      if attr.nil?
+        return nil
+      else
+        return( @graph[xAttrName].clone )
+      end
     end
   end
 
@@ -408,6 +414,13 @@ class GraphViz
      each_attribute(&b)
   end
 
+  # Create a new graph from the current subgraph
+  def to_graph
+    graph = self.clone
+    graph.pg = nil
+    return graph
+  end
+
   #
   # Generate the graph
   #
@@ -531,61 +544,59 @@ class GraphViz
           raise StandardError, "GraphViz not installed or #{@prog} not in PATH. Install GraphViz or use the 'path' option"
         end
 
-        cmd = escape_path_containing_blanks(cmd) if IS_JRUBY
-
-        xOutputWithFile = ""
-        xOutputWithoutFile = ""
+        xOutputWithFile = []
+        xOutputWithoutFile = []
         unless @format.nil? or @format == "none"
           lNotHugly << @filename if @format.to_s == "svg" and @nothugly
           if @filename.nil? or @filename == String
-            xOutputWithoutFile = "-T#{@format} "
+            xOutputWithoutFile = ["-T#{@format}"]
           else
-            xOutputWithFile = "-T#{@format} -o#{@filename} "
+            xOutputWithFile = ["-T#{@format}", "-o#{@filename}"]
           end
         end
         @output.each_except( :key => ["none"] ) do |format, file|
           lNotHugly << file if format.to_s == "svg" and @nothugly
           if file.nil? or file == String
-            xOutputWithoutFile << "-T#{format} "
+            xOutputWithoutFile += ["-T#{format}"]
           else
-            xOutputWithFile << "-T#{format} -o#{file} "
+            xOutputWithFile += ["-T#{format}", "-o#{file}"]
           end
         end
 
-        xExternalLibraries = ""
-        @extlibs.each do |lib|
-          xExternalLibraries << "-l#{lib} "
-        end
-
-        xOtherOptions = ""
-        xOtherOptions += " -s#{@scale}" unless @scale.nil?
-        xOtherOptions += " -y" if @inverty
-        unless @no_layout.nil?
-          xOtherOptions += " -n"
-          xOtherOptions += "2" if @no_layout.to_i == 2
-        end
-        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}"
+        xExternalLibraries = @extlibs.map { |lib| "-l#{lib}" }
+
+        xOtherOptions = []
+        xOtherOptions << "-s#{@scale}" if @scale
+        xOtherOptions << "-y" if @inverty
+        xOtherOptions << "-n#{@no_layout}" if @no_layout
+        xOtherOptions << "-x" if @reduce_graph
+        xOtherOptions << "-Lg" if @Lg
+        xOtherOptions << "-LO" if @LO
+        xOtherOptions << "-Ln#{@Ln}" if @Ln
+        xOtherOptions << "-LU#{@LU}" if @LU
+        xOtherOptions << "-LC#{@LC}" if @LC
+        xOtherOptions << "-LT#{@LT}" if @LT
+
+        tmpPath = if IS_JRUBY
+          t.path
         elsif IS_CYGWIN
-          tmpPath = t.path
           begin
-            tmpPath = "'" + `cygpath -w #{t.path}`.chomp + "'"
+            IO.popen("cygpath", "-w", t.path).chomp
           rescue
             warn "cygpath is not installed!"
+            t.path
           end
-          xCmd = "\"#{cmd}\" -q#{@errors} #{xExternalLibraries} #{xOtherOptions} #{xOutputWithFile} #{xOutputWithoutFile} #{tmpPath}"
         else
-          xCmd = "\"#{cmd}\" -q#{@errors} #{xExternalLibraries} #{xOtherOptions} #{xOutputWithFile} #{xOutputWithoutFile} #{t.path}"
+          t.path
         end
 
+        xCmd = [cmd, "-q#{@errors}"] +
+               xExternalLibraries +
+               xOtherOptions +
+               xOutputWithFile +
+               xOutputWithoutFile +
+               [tmpPath]
+
         xOutput << output_from_command( xCmd )
       end
 
@@ -613,9 +624,7 @@ class GraphViz
     @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 << script_data unless script_data.type.nil? or script_data.empty?
         script_data = DOTScriptData.new(kElement["type"])
       end
 
@@ -634,6 +643,7 @@ class GraphViz
             "Don't know what to do with element type '#{kElement['type']}'"
       end
     }
+    script << script_data unless script_data.type.nil? or script_data.empty?
   end
 
   def to_s
@@ -773,7 +783,7 @@ class GraphViz
   end
 
   def has_parent_graph?
-     @oParentGraph
+     not @oParentGraph.nil?
   end
 ## ----------------------------------------------------------------------------
 
@@ -947,7 +957,8 @@ class GraphViz
       :unquote_empty => false,
     }.merge(opts)
 
-    if (options[:force] or str.match( /\A[a-zA-Z_]+[a-zA-Z0-9_]*\Z/ ).nil?)
+    reserved_words = %w{node edge graph digraph subgraph strict}
+    if (options[:force] or str.match( /\A[a-zA-Z_]+[a-zA-Z0-9_]*\Z/ ).nil? or reserved_words.include?(str.downcase))
       unless options[:unquote_empty] and str.size == 0
         '"' + str.gsub('"', '\\"').gsub("\n", '\\\\n') + '"'
       end