ruby-graphviz 1.0.7 → 1.0.8

data/lib/graphviz/xml.rb

@@ -1,15 +1,15 @@
 # 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
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
@@ -19,37 +19,37 @@ require 'rexml/document'
 
 class GraphViz
   class XML
-    
+
     # The GraphViz object
     attr_accessor :graph
-    
-    # 
+
+    #
     # Generate the graph
-    # 
+    #
     # THIS METHOD IS DEPRECATED, PLEASE USE GraphViz::XML.graph.output
-    # 
+    #
     def output( *options )
       warn "GraphViz::XML.output is deprecated, use GraphViz::XML.graph.output"
       @graph.output( *options )
     end
-    
+
     private
-    
-    # 
+
+    #
     # Create a graph from a XML file
-    # 
+    #
     # In:
     # * xml_file : XML File
     # * *options : Graph options:
     #   * :text : show text nodes (default true)
     #   * :attrs : show XML attributes (default true)
-    # 
+    #
     def initialize( xml_file, *options )
       @node_name = "00000"
 	   @show_text = true
 	   @show_attributes = true
 
-      if options.nil? == false and options[0].nil? == false
+      if options and options[0]
         options[0].each do |xKey, xValue|
           case xKey.to_s
             when "text"
@@ -63,31 +63,31 @@ class GraphViz
       end
 
       @rexml_document = REXML::Document::new( File::new( xml_file ) )
-      @graph = GraphViz::new( "XML", *options ) 
+      @graph = GraphViz::new( "XML", *options )
       parse_xml_node( @rexml_document.root() )
     end
-    
+
     def parse_xml_node( xml_node ) #:nodoc:
       local_node_name = @node_name.clone
       @node_name.succ!
-      
+
       label = xml_node.name
-      if xml_node.has_attributes? == true and @show_attributes == true
-        label = "{ " + xml_node.name 
-		
+      if xml_node.has_attributes? and @show_attributes
+        label = "{ " + xml_node.name
+
 		    xml_node.attributes.each do |xName, xValue|
-		      label << "| { #{xName} | #{xValue} } " 
+		      label << "| { #{xName} | #{xValue} } "
 		    end
-		
+
 		    label << "}"
 	    end
       @graph.add_nodes( local_node_name, "label" => label, "color" => "blue", "shape" => "record" )
 
       ## Act: Search and add Text nodes
-      if xml_node.has_text? == true and @show_text == true
+      if xml_node.has_text? and @show_text
         text_node_name = local_node_name.clone
         text_node_name << "111"
-        
+
         xText = ""
         xSep = ""
         xml_node.texts().each do |l|

data/setup.rb

@@ -659,7 +659,7 @@ module FileOperations
   def ruby(*args)
     command config('rubyprog'), *args
   end
-  
+
   def make(task = nil)
     command(*[config('makeprog'), task].compact)
   end
@@ -722,7 +722,7 @@ module HookScriptAPI
   def srcdirectory?(path)
     File.dir?(srcfile(path))
   end
-  
+
   def srcfile?(path)
     File.file?(srcfile(path))
   end
@@ -826,7 +826,7 @@ class ToplevelInstaller
       __send__ "exec_#{task}"
     end
   end
-  
+
   def run_metaconfigs
     @config.load_script "#{@ardir}/metaconfig"
   end
@@ -1404,7 +1404,7 @@ class Installer
   end
 
   # picked up many entries from cvs-1.11.1/src/ignore.c
-  JUNK_FILES = %w( 
+  JUNK_FILES = %w(
     core RCSLOG tags TAGS .make.state
     .nse_depinfo #* .#* cvslog.* ,* .del-* *.olb
     *~ *.old *.bak *.BAK *.orig *.rej _$* *$

data/test/test_graph.rb

@@ -4,40 +4,40 @@ require 'graphviz'
 
 class GraphVizTest < Test::Unit::TestCase
   def setup
-    @graph = GraphViz::new( :G )    
+    @graph = GraphViz::new( :G )
   end
 
   def test_graph
     assert(@graph, 'Create graph faild.')
-    
+
     assert_block 'Set attribut for graph faild.' do
       @graph['size'] = "10,10"
     end
-    
+
     assert_equal( "\"10,10\"", @graph['size'].to_s, 'Get attribut for graph faild.' )
-    
+
     assert_equal( "G", @graph.name, "Wrong graph name." )
   end
 
   def test_node
     n, m = nil, nil
-    
+
     assert_block 'Create node failed.' do
       n = @graph.add_nodes( "n1" )
     end
 
-    assert_block 'Get node failed.' do    
+    assert_block 'Get node failed.' do
       m = @graph.get_node( "n1" )
     end
 
     assert_equal( m, n, "Node corrupted when get." )
-    
+
     assert_equal( @graph.node_count, 1, "Wrong number of nodes" )
-    
+
     assert_block 'Set attribut for node faild.' do
       n['label'] = "Hello\n\"world\"\\l"
     end
-    
+
     assert_equal( "\"Hello\\n\\\"world\\\"\\l\"", n['label'].to_s, 'Get attribut for node faild.' )
   end
 

data/test/test_subgraph.rb

@@ -11,6 +11,6 @@ class GraphVizSubGraphTest < Test::Unit::TestCase
     cl2 = GraphViz::new('cluster_cl1')
     master2.add_graph cl2
 
-    assert_equal(master1.inspect, master2.inspect, "Wrong subgraph")
+    assert_equal(master1.to_s, master2.to_s, "Wrong subgraph")
   end
 end

data/test/test_theory.rb

@@ -24,7 +24,7 @@ class GraphVizTheoryTest < Test::Unit::TestCase
          (g.c << g.f)[:weight => 2, :label => "2"]
          g.d << g.e
       end
-   
+
       @t = GraphViz::Theory.new( @g )
    end
 
@@ -35,7 +35,7 @@ class GraphVizTheoryTest < Test::Unit::TestCase
 
    def test_adgency_matrix
       adgency = GraphViz::Math::Matrix.new([
-        [0,1,0,1,0,1], 
+        [0,1,0,1,0,1],
         [0,0,1,1,1,0],
         [0,0,0,1,0,1],
         [0,0,0,0,1,0],
@@ -51,7 +51,7 @@ class GraphVizTheoryTest < Test::Unit::TestCase
 
    def test_incidence_matrix
       incidence = GraphViz::Math::Matrix.new([
-         [ 1, 1, 1, 0, 0, 0, 0, 0, 0], 
+         [ 1, 1, 1, 0, 0, 0, 0, 0, 0],
          [-1, 0, 0, 1, 1, 1, 0, 0, 0],
          [ 0, 0, 0,-1, 0, 0, 1, 1, 0],
          [ 0,-1, 0, 0,-1, 0,-1, 0, 1],
@@ -73,7 +73,7 @@ class GraphVizTheoryTest < Test::Unit::TestCase
    def test_laplacian_matrix
       laplacian = GraphViz::Math::Matrix.new([
          [3,-1, 0,-1, 0,-1],
-         [0, 4,-1,-1,-1, 0], 
+         [0, 4,-1,-1,-1, 0],
          [0, 0, 3,-1, 0,-1],
          [0, 0, 0, 4,-1, 0],
          [0, 0, 0, 0, 2, 0],

data/test/test_utils_colors.rb

@@ -6,7 +6,7 @@ class TypesTest < Test::Unit::TestCase
   def setup
     @brown_txt = GraphViz::Utils::Colors.name("brown")
     @brown_hsv = GraphViz::Utils::Colors.hsv(0.0, 0.745454545454545, 0.647058823529412)
-    @brown_rgb = GraphViz::Utils::Colors.rgb("a5", "2a", "2a") 
+    @brown_rgb = GraphViz::Utils::Colors.rgb("a5", "2a", "2a")
   end
 
   def test_color
@@ -22,17 +22,17 @@ class TypesTest < Test::Unit::TestCase
   end
 
   def test_color_by_rgb
-    assert_equal "a5", @brown_txt.r 
+    assert_equal "a5", @brown_txt.r
     assert_equal "2a", @brown_txt.g
     assert_equal "2a", @brown_txt.b
     assert_equal "#a52a2a", @brown_txt.rgba_string("#")
 
-    assert_equal "a5", @brown_hsv.r 
+    assert_equal "a5", @brown_hsv.r
     assert_equal "2a", @brown_hsv.g
     assert_equal "2a", @brown_hsv.b
     assert_equal "#a52a2a", @brown_hsv.rgba_string("#")
 
-    assert_equal "a5", @brown_rgb.r 
+    assert_equal "a5", @brown_rgb.r
     assert_equal "2a", @brown_rgb.g
     assert_equal "2a", @brown_rgb.b
     assert_equal "#a52a2a", @brown_rgb.rgba_string("#")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-graphviz
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake