ruby-graphviz 1.0.6 → 1.0.7

data/AUTHORS.rdoc

@@ -16,9 +16,10 @@
 * Ronen Barzel <https://github.com/ronen>
 * Jamison Dance <https://github.com/jergason>
 * hirochachacha <https://github.com/hirochachacha>
-* coding64 (https://github.com/coding46)
-* Neven Has (https://github.com/nevenh)
-* Postmodern (https://github.com/postmodern) 
+* coding64 <https://github.com/coding46>
+* Neven Has <https://github.com/nevenh>
+* Postmodern <https://github.com/postmodern> 
+* markus1189 <https://github.com/markus1189>
 
 Thanks to :
 

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = CHANGELOG
 
+== 1.0.7 :
+* Issue #48 : add_graph fails when passed a GraphViz object
+* Issue #47 : Find executable (by markus1189)
+
 == 1.0.6 :
 * Issue #46 : Some tests fail because it cannot find 'dot'
 * Issue #45 : Fix for copy/paste error (by coding46)

data/README.rdoc

@@ -1,6 +1,6 @@
 = Ruby/GraphViz
 
-Copyright (C) 2004-2011 Gregoire Lejeune
+Copyright (C) 2004-2012 Gregoire Lejeune
 
 * Doc : http://rdoc.info/projects/glejeune/Ruby-Graphviz
 * Sources : http://github.com/glejeune/Ruby-Graphviz

data/bin/ruby2gv

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>
+# Copyright (C) 2005 - 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

data/bin/xml2gv

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>
+# Copyright (C) 2005 - 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
@@ -93,4 +93,4 @@ if xFile.nil? == true
 end
 
 gvxml = GraphViz::XML::new( xFile, :text => true, :attrs => true )
-gvxml.graph.output( xOutFormat => xOutFile, :path => xGVPath )
+gvxml.graph.output( xOutFormat => xOutFile, :path => xGVPath )

data/lib/graphviz.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>
+# Copyright (C) 2003 - 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
@@ -260,6 +260,8 @@ class GraphViz
      if xGraphName.kind_of?(GraphViz) 
         xGraphID = xGraphName.id
         @hoGraphs[xGraphID] = xGraphName.clone
+        @hoGraphs[xGraphID].type = @oGraphType
+        @hoGraphs[xGraphID].pg = self
         xGraphName = xGraphID 
      else
         if xGraphName.kind_of?(Hash)
@@ -331,6 +333,9 @@ class GraphViz
   def type
     @oGraphType
   end
+  def type=(x) #:nodoc:
+    @oGraphType = x
+  end
   
   #
   # Get the number of graphs
@@ -510,7 +515,7 @@ class GraphViz
             end
             @prog = xValue
           when "path"
-            @path = xValue.split( "," ).map{ |x| x.strip }
+            @path = xValue && xValue.split( "," ).map{ |x| x.strip }
           when "errors"
             @errors = xValue
           when "extlib"
@@ -702,6 +707,9 @@ class GraphViz
   def pg #:nodoc:
     @oParentGraph
   end
+  def pg=(x) #:nodoc:
+    @oParentGraph = x
+  end
   
   #
   # Return the root graph

data/lib/graphviz/attrs.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>
+# 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

data/lib/graphviz/constants.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>
+# 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
@@ -40,7 +40,7 @@
 #   C => cluster
 #
 module Constants
-  RGV_VERSION = "1.0.6"
+  RGV_VERSION = "1.0.7"
   
   ## Const: Output formats
   FORMATS = [

data/lib/graphviz/edge.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>
+# 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

data/lib/graphviz/utils.rb

@@ -16,14 +16,16 @@ module GVUtils
   # 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, paths) #:nodoc:
-    paths = ENV['PATH'].split(File::PATH_SEPARATOR) if paths.nil? or paths.empty?
-  
-    paths.each do |path|    
-      file = (path.nil?)?bin:File.join(path,bin)
-      if File.executable?(file) and not File.directory?(file) then
-        return file
-      elsif RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ # WAS: elsif RUBY_PLATFORM =~ /mswin|mingw/
+  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)
+
+      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
       end

data/lib/graphviz/xml.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>
+# 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

data/test/test_subgraph.rb

@@ -0,0 +1,16 @@
+require 'test/unit'
+$:.unshift(File.expand_path('../../lib',__FILE__))
+require 'graphviz'
+
+class GraphVizSubGraphTest < Test::Unit::TestCase
+  def test_subgraph
+    master1 = GraphViz::new(:G)
+    cl1 = master1.add_graph('cluster_cl1')
+
+    master2 = GraphViz::new(:G)
+    cl2 = GraphViz::new('cluster_cl1')
+    master2.add_graph cl2
+
+    assert_equal(master1.inspect, master2.inspect, "Wrong subgraph")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-graphviz
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-01 00:00:00.000000000 Z
+date: 2012-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -239,6 +239,7 @@ files:
 - test/test_examples.rb
 - test/test_graph.rb
 - test/test_search.rb
+- test/test_subgraph.rb
 - test/test_theory.rb
 - test/test_types.rb
 - test/test_utils_colors.rb
@@ -284,6 +285,7 @@ test_files:
 - test/test_examples.rb
 - test/test_graph.rb
 - test/test_search.rb
+- test/test_subgraph.rb
 - test/test_theory.rb
 - test/test_types.rb
 - test/test_utils_colors.rb