ruby-graphviz 1.0.4 → 1.0.5

data/.travis.yml

@@ -1,4 +1,6 @@
 rvm:
   - 1.8.7
-  - 1.9.2
+  - 1.9.3
   - jruby
+  - rbx-18mode
+  - rbx-19mode

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = CHANGELOG
 
+== 1.0.5 :
+* Change deprecated methods in gem2gv, git2gv and ruby2gv
+* Issue #38
+* Issue #39
+
 == 1.0.4 :
 * GraphViz::Edge#each_attribut is deprecated, please use GraphViz::Edge#each_attribute
 * GraphViz::GraphML#attributs is deprecated, please, use GraphViz::GraphML#attributes

data/bin/gem2gv

@@ -71,7 +71,7 @@ class Gem2Gv
     #nodeLabel = "#{name}\n#{version}"
     nodeName = "#{name}"
     nodeLabel = "#{name}"
-    return @oGraph.get_node(nodeName) || @oGraph.add_node( nodeName, "label" => nodeLabel )
+    return @oGraph.get_node(nodeName) || @oGraph.add_nodes( nodeName, "label" => nodeLabel )
   end
   
   def createEdges( gemName, version, nodes )
@@ -79,7 +79,7 @@ class Gem2Gv
     
     nodes.each do |node|
       nodeB = getNode( node[:name], node[:version] )
-      @oGraph.add_edge( nodeA, nodeB )
+      @oGraph.add_edges( nodeA, nodeB )
     end
   end
 end
@@ -163,4 +163,4 @@ end
 g = Gem2Gv.new( xGVPath, xUse )
 g.go( xGem )
 result = g.out( xOutFormat, xOutFile )
-puts result unless result.nil?
+puts result unless result.nil?

data/bin/git2gv

@@ -30,11 +30,11 @@ class Git2Gv
     git.node[:shape => "record"]
     
     branches.each do |branch|
-      git.add_node( branch, :style => "filled", :fillcolor => :lightgrey )
+      git.add_nodes( branch, :style => "filled", :fillcolor => :lightgrey )
     end
     
     commits.each do |commit|
-      git.add_node( 
+      git.add_nodes( 
         commit[:short], 
         :style => "filled",
         :fillcolor => :lightblue,
@@ -43,11 +43,11 @@ class Git2Gv
     end
     
     refs.each do |from, to|
-      git.add_edge( from, to )
+      git.add_edges( from, to )
     end
     
     relations.each do |from, to|
-      git.add_edge( to, from, :dir => "back" )
+      git.add_edges( to, from, :dir => "back" )
     end
     
     git.output( @xOutFormat => @xOutFile, :nothugly => @bNothugly )

data/bin/ruby2gv

@@ -55,9 +55,9 @@ class Rb2Gv
   def gv_newNode( xNode, xShape = "box", xColor = nil )  
     xNodeName = xNode.gsub( /[^a-zA-Z0-9]/, "_" )
     if xColor.nil? == true
-      @oGraph.add_node( xNodeName, "label" => xNode, "shape" => xShape )
+      @oGraph.add_nodes( xNodeName, "label" => xNode, "shape" => xShape )
     else
-      @oGraph.add_node( xNodeName, "label" => xNode, "shape" => xShape, "style" => "filled", "color" => xColor )
+      @oGraph.add_nodes( xNodeName, "label" => xNode, "shape" => xShape, "style" => "filled", "color" => xColor )
     end
   end
   
@@ -143,7 +143,7 @@ class Rb2Gv
         
         puts "  + Edge #{xLib} -> #{xRequiredLib}" if DEBUG
         unless @hxEdge.include?( "#{@hxNodes[xLib].id}-#{@hxNodes[xRequiredLib].id}" )
-          @oGraph.add_edge( @hxNodes[xLib], @hxNodes[xRequiredLib] )
+          @oGraph.add_edges( @hxNodes[xLib], @hxNodes[xRequiredLib] )
           @hxEdge << "#{@hxNodes[xLib].id}-#{@hxNodes[xRequiredLib].id}"
         end
       end

data/lib/graphviz.rb

@@ -549,7 +549,7 @@ class GraphViz
             begin
               require 'graphviz/nothugly'
               @nothugly = true
-            rescue
+            rescue LoadError => e
               warn "You must install ruby-xslt to use nothugly option!"
               @nothugly = false
             end

data/lib/graphviz/attrs.rb

@@ -56,6 +56,11 @@ class GraphViz
             raise ArgumentError, "#{@name} attribute '#{key.to_s}' invalid"
          end
 
+         if value.nil?
+            warn "Value for attribute `#{key}` can't be null"
+            return
+         end
+
          begin
             value = GraphViz::Types.const_get(@attributes[key.to_s]).new( value )
          rescue => e

data/lib/graphviz/constants.rb

@@ -40,7 +40,7 @@
 #   C => cluster
 #
 module Constants
-  RGV_VERSION = "1.0.4"
+  RGV_VERSION = "1.0.5"
   
   ## Const: Output formats
   FORMATS = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-graphviz
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-29 00:00:00 Z
+date: 2012-02-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake