ruby-graphviz 1.0.9 → 1.1.0

data/lib/graphviz/utils.rb

@@ -34,19 +34,6 @@ class GraphViz
       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
-        end
-      end
-      path_elements.join(File::SEPARATOR)
-    end
-
     def output_and_errors_from_command(cmd) #:nodoc:
       unless defined? Open3
         begin
@@ -56,22 +43,19 @@ class GraphViz
         end
       end
       begin
-        Open3.popen3( cmd ) do |stdin, stdout, stderr|
-          stdin.close
-          stdout.binmode
-          [stdout.read, stderr.read]
-        end
+        out, err, status = Open3.capture3(*cmd)
+        [out, err, status.exitstatus]
       rescue NotImplementedError, NoMethodError
-        IO.popen( cmd ) do |stdout|
+        IO.popen( *cmd ) do |stdout|
           stdout.binmode
-          [stdout.read, nil]
+          [stdout.read, nil, 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, errors, status = output_and_errors_from_command(cmd)
+      if (status.nil? && (errors.nil? || errors.strip.empty?)) || status.zero?
         output
       else
         raise "Error from #{cmd}:\n#{errors}"

data/ruby-graphviz.gemspec

@@ -35,17 +35,13 @@ For more information about Ruby-Graphviz :
 * NEW - Mailing List : http://groups.google.com/group/ruby-graphviz
 
 Last (important) changes :
-* GraphViz#add_edge is deprecated, use GraphViz#add_edges
-* GraphViz#add_node is deprecated, use GraphViz#add_nodes
 * GraphViz::Edge#each_attribut is deprecated, use GraphViz::Edge#each_attribute
 * GraphViz::GraphML#attributs is deprecated, use GraphViz::GraphML#attributes
 * GraphViz::Node#each_attribut is deprecated, use GraphViz::Node#each_attribute
   }
   
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'gems'
   s.add_development_dependency 'rdoc'
-  s.add_development_dependency 'minitest'
   s.add_development_dependency 'bundler'
-  s.add_development_dependency 'ronn'
+  s.add_development_dependency 'ronn' unless RUBY_PLATFORM == 'java'
 end

data/test/helper.rb

@@ -0,0 +1,13 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'test/unit'
+require 'pathname'
+
+cur = Pathname.new(File.expand_path("..", __FILE__))
+lib = cur.join('..', 'lib')
+
+$LOAD_PATH.unshift(lib.to_s, cur.to_s)
+require 'graphviz'
+require 'graphviz/theory'
+require 'graphviz/math/matrix'
+require 'graphviz/utils/colors'

data/test/test_dot_script.rb

@@ -1,43 +1,47 @@
-require "minitest/autorun"
-require_relative "../lib/graphviz/dot_script"
-
-describe GraphViz::DOTScript do
-    let(:script) { GraphViz::DOTScript.new }
-
-    it "appends a newline character if it is missing" do
-      str = "Test without newline"
-      script.append(str)
-      script.to_s.must_equal(str + "\n")
-    end
-
-    it "does not append a newline if already present" do
-      str = "Linebreak follows at my tail:\n"
-      script.append(str)
-      script.to_s.must_equal(str)
-    end
-
-    it "can prepend lines to its content" do
-      start_content = "I want to be at the top!\n"
-      additional_content = "No way!\n"
-
-      script.append(start_content)
-      script.prepend(additional_content)
-
-      script.to_s.must_equal(additional_content + start_content)
-    end
-
-    it "can add types with data" do
-      data = "some random data"
-      script.add_type("node_attr", data)
-      script.to_s.must_match(/\s*node\s*\[\s*#{data}\s*\]\s*/m)
-    end
-
-    it "does nothing if data is empty" do
-      script.add_type("anything", "")
-      script.to_s.must_be :empty?
-    end
-
-    it "raises an argument error on unknown types" do
-      -> { script.add_type("invalid", "some data") }.must_raise(ArgumentError)
+require 'helper'
+
+class GraphVizDOTScriptTest < Test::Unit::TestCase
+  def setup
+    @script = GraphViz::DOTScript.new
+  end
+
+  def test_appends_a_newline_character_if_it_is_missing
+    str = "Test without newline"
+    @script.append(str)
+    assert_equal @script.to_s, str + "\n"
+  end
+
+  def test_does_not_append_a_newline_if_already_present
+    str = "Linebreak follows at my tail:\n"
+    @script.append(str)
+    assert_equal @script.to_s, str
+  end
+
+  def test_can_prepend_lines_to_its_content
+    start_content = "I want to be at the top!\n"
+    additional_content = "No way!\n"
+
+    @script.append(start_content)
+    @script.prepend(additional_content)
+
+    assert_equal @script.to_s, additional_content + start_content
+  end
+
+  def test_can_add_types_with_data
+    data = "some random data"
+    @script.add_type("node_attr", data)
+    assert_match(/\s*node\s*\[\s*#{data}\s*\]\s*/, @script.to_s)
+  end
+
+  def test_does_nothing_if_data_is_empty
+    @script.add_type("anything", "")
+    assert_equal true, @script.to_s.empty?
+  end
+
+  def test_raises_an_argument_error_on_unknown_types
+    assert_raise ArgumentError do
+      @script.add_type("invalid", "some data")
     end
+  end
 end
+

data/test/test_examples.rb

@@ -1,35 +1,24 @@
-require File.expand_path('support.rb', File.dirname(__FILE__))
-
 class GraphVizTest < Test::Unit::TestCase
-
-  #
   # you can run a subset of all the samples like this:
   #  ruby test/test_examples.rb  --name='/sample3[6-9]/'
   #
   # The above will run samples 36, 37, 38, and 39
   #
-
-
-  include IoHack
-
   RootDir    = File.expand_path('../..', __FILE__)
   ExampleDir = File.join(RootDir,'examples')
   OutputDir  = File.join(File.dirname(__FILE__),'output')
-  # OutputDir  = File.join(RootDir,'test','output')
-
 
   # the below tests write to stdout. the other tests write to filesystem
-
   Skips = {
     #'35' => 'hanging for me',
     '33' => 'FamilyTree is broken',
     '36' => 'hangs for me',
     '53' => 'FamilyTree is broken',
     '57' => 'will not be able to find the graphml script',
+    '98' => 'This test is just for debug',
     '99' => 'FamilyTree is broken'
   }
 
-
   def test_sample07
     assert_output_pattern(/\Adigraph structs \{.+\}\n\Z/m, '07')
   end
@@ -66,6 +55,10 @@ class GraphVizTest < Test::Unit::TestCase
      assert_output_pattern(/\ANode.*\n\Z/m, '62')
   end
 
+  def test_sample70
+    assert_output_pattern(/\Agraph G \{.*\}\n\Z/m, '70')
+  end
+
   #
   # for every sample file in the examples directory that matches the
   # pattern ("sample01.rb, sample02.rb, etc) make a corresponding
@@ -99,31 +92,30 @@ class GraphVizTest < Test::Unit::TestCase
     attr_accessor :last_image_path, :number_to_path
   end
 
-  samples = Dir[File.join(ExampleDir,'sample*.rb')].sort
+  if File.directory? OutputDir
+    FileUtils.rm_rf OutputDir
+  end
+  FileUtils.cp_r ExampleDir, OutputDir
+  
+  samples = Dir[File.join(OutputDir,'sample*.rb')].sort
   samples.each {|path| make_sample_test_method(path) }
 
-
 private
 
   def assert_output_pattern tgt_regexp, number
     path = self.class.number_to_path[number]
-    setup_sample path
-    out, err = fake_popen2(path)
+    out, err, _ = Open3.capture3("ruby #{path}")
     assert_equal "", err, "no errors"
     assert_match tgt_regexp, out.gsub(/\r\n/, "\n"), "output for sample#{number} should match regexp"
   end
 
   def assert_sample_file_has_no_output path
-    setup_sample(path)
     begin
-      out, err = fake_popen2(path)
-      assert_equal(0, out.length, "expecting empty output")
-      assert_equal(0, err.length, "expecting empty errorput")
-      msg = "maybe generated #{self.class.last_image_path}"
-      print "\n", msg
+      out, err, _ = Open3.capture3("ruby #{path}")
+      assert_equal(0, out.length, "expecting empty output got [#{out}]")
+      assert_equal(0, err.length, "expecting empty errorput got [#{err}]")
     rescue Exception => e
       assert(false, "got exception on #{File.basename(path)}: #{e.message}")
-      puts "out: ", out.inspect, "err:", err.inspect
     end
   end
 
@@ -132,14 +124,12 @@ private
       FileUtils.mkdir_p(OutputDir, :verbose => true)
     end
     ARGV[0] = nil if ARGV.any? # hack trigger searching for 'dot' executable
-    hack_output_path path
   end
 
-  def hack_output_path path
-    # hack $0 to change where the output image is written to
-    fake_example_path = File.join(OutputDir, File.basename(path))
-    $program_name = fake_example_path.dup
-    alias $0 $program_name
-    self.class.last_image_path = "#{$0}.png"
+  def run_sample(path)
+    run_path = File.join(OutputDir, File.basename(path))
+    FileUtils.cp path, run_path
+    out, err, _ = Open3.capture3("ruby #{run_path}")
+    return out, err
   end
 end

data/test/test_graph.rb

@@ -1,6 +1,4 @@
-require 'test/unit'
-$:.unshift(File.expand_path('../../lib',__FILE__))
-require 'graphviz'
+require 'helper'
 
 class GraphVizTest < Test::Unit::TestCase
   def setup
@@ -106,6 +104,19 @@ class GraphVizTest < Test::Unit::TestCase
      assert_nil   c1.search_node("a0")
   end
 
+  def test_getting_escaped_node_from_edge
+    @g = GraphViz.graph "G" do |g|
+      g.add_nodes 'a@com'
+      g.add_nodes 'b@com'
+      g.add_edges 'a@com', 'b@com'
+    end
+
+    @g.each_edge do |e|
+      assert_not_nil @g.get_node e.node_one(true, false)
+      assert_not_nil @g.get_node e.node_two(true, false)
+    end
+  end
+
   def test_to_s
     assert_nothing_raised 'to_s with edge with numeric label failed.' do
       a = @graph.add_nodes('a')

data/test/test_search.rb

@@ -1,7 +1,4 @@
-require 'test/unit'
-$:.unshift(File.expand_path('../../lib',__FILE__))
-require 'graphviz'
-require 'graphviz/theory'
+require 'helper'
 
 class GraphVizSearch < Test::Unit::TestCase
    def setup

data/test/test_subgraph.rb

@@ -1,6 +1,4 @@
-require 'test/unit'
-$:.unshift(File.expand_path('../../lib',__FILE__))
-require 'graphviz'
+require 'helper'
 
 class GraphVizSubGraphTest < Test::Unit::TestCase
   def test_subgraph
@@ -13,4 +11,17 @@ class GraphVizSubGraphTest < Test::Unit::TestCase
 
     assert_equal(master1.to_s, master2.to_s, "Wrong subgraph")
   end
+
+  def test_to_graph
+    m = GraphViz.new(:G)
+    m.add_edges("m1", "m2")
+    c = m.add_graph('c')
+    c.add_edges("c1", "c2")
+
+    assert_equal true, c.has_parent_graph?
+    assert_equal false, m.has_parent_graph?
+
+    ci = c.to_graph
+    assert_equal false, ci.has_parent_graph?
+  end
 end

data/test/test_theory.rb

@@ -1,8 +1,4 @@
-require 'test/unit'
-$:.unshift(File.expand_path('../../lib',__FILE__))
-require 'graphviz'
-require 'graphviz/theory'
-require 'graphviz/math/matrix'
+require 'helper'
 
 class GraphVizTheoryTest < Test::Unit::TestCase
    def setup
@@ -99,4 +95,18 @@ class GraphVizTheoryTest < Test::Unit::TestCase
       assert_equal [1, 6], r[:path]
       assert_equal 6.0, r[:distance]
    end
+
+   def test_escaped_node_ids__adjancy_matrix
+      @g = GraphViz.graph "G" do |g|
+         g.add_nodes 'a@com'
+         g.add_nodes 'b@com'
+         g.add_edges 'a@com', 'b@com'
+      end
+
+      @t = GraphViz::Theory.new( @g )
+
+      assert_nothing_raised NoMethodError do
+         @t.adjancy_matrix
+      end
+   end
 end

data/test/test_types.rb

@@ -1,6 +1,4 @@
-require 'test/unit'
-$:.unshift(File.expand_path('../../lib',__FILE__))
-require 'graphviz/types'
+require 'helper'
 
 class TypesTest < Test::Unit::TestCase
   def test_gv_bool

data/test/test_utils_colors.rb

@@ -1,6 +1,4 @@
-require 'test/unit'
-$:.unshift(File.expand_path('../../lib',__FILE__))
-require 'graphviz/utils/colors'
+require 'helper'
 
 class TypesTest < Test::Unit::TestCase
   def setup

metadata

@@ -1,97 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: ruby-graphviz
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Gregoire Lejeune
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: gems
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ronn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby/Graphviz provides an interface to layout and generate images of
@@ -110,9 +82,9 @@ extra_rdoc_files:
 - AUTHORS.rdoc
 - CHANGELOG.rdoc
 files:
-- .gemrc
-- .gitignore
-- .travis.yml
+- ".gemrc"
+- ".gitignore"
+- ".travis.yml"
 - AUTHORS.rdoc
 - CHANGELOG.rdoc
 - COPYING.rdoc
@@ -225,6 +197,9 @@ files:
 - examples/sample67.rb
 - examples/sample68.rb
 - examples/sample69.rb
+- examples/sample70.rb
+- examples/sample71.rb
+- examples/sample72.rb
 - examples/sample99.rb
 - examples/sdlshapes/README
 - examples/sdlshapes/sdl.ps
@@ -281,7 +256,7 @@ files:
 - man/xml2gv.1.ronn
 - ruby-graphviz.gemspec
 - setup.rb
-- test/support.rb
+- test/helper.rb
 - test/test_dot_script.rb
 - test/test_examples.rb
 - test/test_graph.rb
@@ -298,36 +273,34 @@ post_install_message: "\nSince version 0.9.2, Ruby/GraphViz can use Open3.popen3
   (http://graphviz.org/) to use this Gem.\n\nFor more information about Ruby-Graphviz
   :\n* Doc : http://rdoc.info/projects/glejeune/Ruby-Graphviz\n* Sources : http://github.com/glejeune/Ruby-Graphviz\n*
   NEW - Mailing List : http://groups.google.com/group/ruby-graphviz\n\nLast (important)
-  changes :\n* GraphViz#add_edge is deprecated, use GraphViz#add_edges\n* GraphViz#add_node
-  is deprecated, use GraphViz#add_nodes\n* GraphViz::Edge#each_attribut is deprecated,
-  use GraphViz::Edge#each_attribute\n* GraphViz::GraphML#attributs is deprecated,
-  use GraphViz::GraphML#attributes\n* GraphViz::Node#each_attribut is deprecated,
-  use GraphViz::Node#each_attribute\n  "
+  changes :\n* GraphViz::Edge#each_attribut is deprecated, use GraphViz::Edge#each_attribute\n*
+  GraphViz::GraphML#attributs is deprecated, use GraphViz::GraphML#attributes\n* GraphViz::Node#each_attribut
+  is deprecated, use GraphViz::Node#each_attribute\n  "
 rdoc_options:
-- --title
+- "--title"
 - Ruby/GraphViz
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ruby-asp
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Interface to the GraphViz graphing tool
 test_files:
-- test/support.rb
+- test/helper.rb
 - test/test_dot_script.rb
 - test/test_examples.rb
 - test/test_graph.rb