ruby-graphviz 1.0.3 → 1.0.4

data/lib/graphviz/types/gv_bool.rb

@@ -5,7 +5,7 @@ end
 #
 # For the bool type, 
 # - TRUE values are represented by "true" or "yes" (case-insensitive), true and any non-zero integer
-# - FALSE values by "false" or "no" (case-insensitive), false and zero.
+# - FALSE values by "false", "no" or empty string (case-insensitive), false and zero.
 #
 # Example 
 #
@@ -18,10 +18,10 @@ class GraphViz
    class Types
       class GvBool < Common
          BOOL_TRUE = ["true", "yes"]
-         BOOL_FALSE = ["false", "no"]
+         BOOL_FALSE = ["false", "no", ""]
 
          def check(data)
-            if true == data or (data.is_a?(Integer) and data != 0) or (data.is_a?(String) and BOOL_TRUE.include?(data.downcase))
+            if true == data or (data.is_a?(Integer) and data != 0) or (data.is_a?(String) and !BOOL_FALSE.include?(data.downcase))
                @to_ruby = true
                return data
             end

data/lib/graphviz/types/gv_double.rb

@@ -11,7 +11,9 @@ class GraphViz
           return data
         end
 
-        raise DoubleException, "Invalid double value"
+        return nil if data.is_a?(String) and data.empty?
+
+        raise DoubleException, "Invalid double value for `#{data}`"
       end
       
       def output

data/lib/graphviz/types/rect.rb

@@ -15,6 +15,7 @@ class GraphViz
         if data.is_a?(Array)
            return check(data.join(","))
         end
+        return nil if data.is_a?(String) and data.empty?
 
         raise RectException, "Invalid rect value"
       end

data/lib/graphviz/types/spline_type.rb

@@ -35,6 +35,8 @@ class GraphViz
            @is_spline = false
            return data
         end
+        return nil if data.empty?
+
         raise SplineTypeException, "Invalid spline type value"
       end
       

data/lib/graphviz/xml.rb

@@ -42,12 +42,12 @@ class GraphViz
     # * xml_file : XML File
     # * *options : Graph options:
     #   * :text : show text nodes (default true)
-    #   * :attrs : show XML attributs (default true)
+    #   * :attrs : show XML attributes (default true)
     # 
     def initialize( xml_file, *options )
       @node_name = "00000"
 	   @show_text = true
-	   @show_attributs = true
+	   @show_attributes = true
 
       if options.nil? == false and options[0].nil? == false
         options[0].each do |xKey, xValue|
@@ -56,7 +56,7 @@ class GraphViz
               @show_text = xValue
 		          options[0].delete( xKey )
             when "attrs"
-              @show_attributs = xValue
+              @show_attributes = xValue
 		          options[0].delete( xKey )
           end
         end
@@ -72,7 +72,7 @@ class GraphViz
       @node_name.succ!
       
       label = xml_node.name
-      if xml_node.has_attributes? == true and @show_attributs == true
+      if xml_node.has_attributes? == true and @show_attributes == true
         label = "{ " + xml_node.name 
 		
 		    xml_node.attributes.each do |xName, xValue|
@@ -104,7 +104,7 @@ class GraphViz
         end
       end
 
-      ## Act: Search and add attributs
+      ## Act: Search and add attributes
       ## TODO
 
       xml_node.each_element( ) do |xml_child_node|

data/lib/graphviz.rb

@@ -64,65 +64,38 @@ class GraphViz
   ## Var: Graph name
   @name
 
-  ## Var: defined attributs
+  ## Var: defined attributes
   @graph
   @node
   @edge
 
-  # This accessor allow you to set global graph attributs
+  # This accessor allow you to set global graph attributes
   attr_accessor :graph
   alias_method :graph_attrs, :graph
   
-  # This accessor allow you to set global nodes attributs
+  # This accessor allow you to set global nodes attributes
   attr_accessor :node
   alias_method :node_attrs, :node
 
-  # This accessor allow you to set global edges attributs
+  # This accessor allow you to set global edges attributes
   attr_accessor :edge
   alias_method :edge_attrs, :edge
 
   @elements_order
   
-  ##
+  #<b>DEPRECATED</b> please use GraphViz#add_nodes
+  def add_node( xNodeName, hOpts = {} )
+     warn "GraphViz#add_node is deprecated, please use GraphViz#add_nodes"
+     return add_nodes(xNodeName, hOpts)
+  end
+
   # Create a new node
   #
   # In:
   # * xNodeName : Name of the new node
-  # * hOpts : Node attributs
+  # * hOpts : Node attributes
   # 
   # Return the GraphViz::Node object created
-  #
-  def add_node( xNodeName, hOpts = {} )
-     warn "GraphViz#add_node is deprecated, please use GraphViz#add_nodes"
-     return add_nodes(xNodeName, hOpts)
-=begin
-    node = @hoNodes[xNodeName]
-
-    if node.nil?
-      @hoNodes[xNodeName] = GraphViz::Node::new( xNodeName, self )
-      @hoNodes[xNodeName].index = @elements_order.size_of( "node" )
-    
-      unless hOpts.keys.include?(:label) or hOpts.keys.include?("label")
-        hOpts[:label] = xNodeName
-      end
-    
-      @elements_order.push( { 
-        "type" => "node", 
-        "name" => xNodeName,
-        "value" => @hoNodes[xNodeName] 
-      } )
-
-      node = @hoNodes[xNodeName]
-    end
-
-    hOpts.each do |xKey, xValue|
-       @hoNodes[xNodeName][xKey.to_s] = xValue
-    end
-
-    return node
-=end
-  end
-
   def add_nodes(node_name, options = {})
      if node_name.kind_of? Array
         node_name.each { |n| add_nodes(n, options.clone) }
@@ -206,7 +179,7 @@ class GraphViz
     @hoNodes.size
   end
   
-  #<b>DEPRECATED</b>
+  #<b>DEPRECATED</b> please use GraphViz#add_edges
   def add_edge( oNodeOne, oNodeTwo, hOpts = {} )
      warn "GraphViz#add_edge is deprecated, please use GraphViz#add_edges"
      add_edges(oNodeOne, oNodeTwo, hOpts)
@@ -217,7 +190,7 @@ class GraphViz
   # In:
   # * node_one : First node (or node list)
   # * node_two : Second Node (or node list)
-  # * options : Edge attributs
+  # * options : Edge attributes
   def add_edges( node_one, node_two, options = {} )
     
     if( node_one.class == Array ) 
@@ -281,7 +254,7 @@ class GraphViz
   # 
   # In:
   # * xGraphName : Graph name
-  # * hOpts : Graph attributs
+  # * hOpts : Graph attributes
   #
   def add_graph( xGraphName = nil, hOpts = {}, &block )
      if xGraphName.kind_of?(GraphViz) 
@@ -393,7 +366,7 @@ class GraphViz
   end
   
   # 
-  # Set value +xValue+ to the graph attribut +xAttrName+
+  # Set value +xValue+ to the graph attribute +xAttrName+
   # 
   def []=( xAttrName, xValue )
     xValue = xValue.to_s if xValue.class == Symbol
@@ -401,7 +374,7 @@ class GraphViz
   end
 
   # 
-  # Get the value of the graph attribut +xAttrName+
+  # Get the value of the graph attribute +xAttrName+
   # 
   def []( xAttrName )
     if Hash === xAttrName
@@ -414,14 +387,18 @@ class GraphViz
   end
   
   #
-  # Calls block once for each attribut of the graph, passing the name and value to the 
+  # Calls block once for each attribute of the graph, passing the name and value to the 
   # block as a two-element array.
   #
-  def each_attribut(&b)
+  def each_attribute(&b)
     @graph.each do |k,v|
       yield(k,v)
     end
   end
+  def each_attribut(&b)
+     warn "`GraphViz#each_attribut` is deprecated, please use `GraphViz#each_attribute`"
+     each_attribute(&b)
+  end
   
   # 
   # Generate the graph

data/ruby-graphviz.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   
   s.rubyforge_project = 'ruby-asp'
   s.has_rdoc = true
-  s.extra_rdoc_files = ["README.rdoc", "COPYING", "AUTHORS"]
+  s.extra_rdoc_files = ["README.rdoc", "COPYING.rdoc", "AUTHORS.rdoc", "CHANGELOG.rdoc"]
   s.rdoc_options = ["--title", "Ruby/GraphViz", "--main", "README.rdoc"]
   s.post_install_message = %{
 Since version 0.9.2, Ruby/GraphViz can use Open3.popen3 (or not)
@@ -34,12 +34,14 @@ For more information about Ruby-Graphviz :
 * Sources : http://github.com/glejeune/Ruby-Graphviz
 * NEW - Mailing List : http://groups.google.com/group/ruby-graphviz
 
-/!\\ GraphViz#add_edge is deprecated, use GraphViz#add_edges
-/!\\ GraphViz#add_node is deprecated, use GraphViz#add_nodes
+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_runtime_dependency("middleman", "~>2.0.0.3")
-  
   s.add_development_dependency 'rake'
   s.add_development_dependency 'gems'
   s.add_development_dependency 'rdoc'

data/test/test_types.rb

@@ -55,11 +55,13 @@ class TypesTest < Test::Unit::TestCase
     assert_equal false, bool.to_ruby
 
     assert_raise BoolException, "Wrong bool value" do
-       GraphViz::Types::GvBool.new("toto")
+       GraphViz::Types::GvBool.new(:toto)
     end
 
-    assert_raise BoolException, "Wrong bool value" do
-       GraphViz::Types::GvBool.new("")
+    assert_block "Create GvBool with empty string failed." do
+       bool = GraphViz::Types::GvBool.new("")
     end
+    assert bool
+    assert_equal false, bool.to_ruby
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-graphviz
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-17 00:00:00 Z
+date: 2012-01-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -71,14 +71,16 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
-- COPYING
-- AUTHORS
+- COPYING.rdoc
+- AUTHORS.rdoc
+- CHANGELOG.rdoc
 files: 
 - .gemrc
 - .gitignore
 - .travis.yml
-- AUTHORS
-- COPYING
+- AUTHORS.rdoc
+- CHANGELOG.rdoc
+- COPYING.rdoc
 - Gemfile
 - README.rdoc
 - Rakefile
@@ -184,6 +186,7 @@ files:
 - examples/sample66.rb
 - examples/sample67.rb
 - examples/sample68.rb
+- examples/sample69.rb
 - examples/sample99.rb
 - examples/sdlshapes/README
 - examples/sdlshapes/sdl.ps
@@ -246,8 +249,12 @@ post_install_message: "\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\n\
-  /!\\ GraphViz#add_edge is deprecated, use GraphViz#add_edges\n\
-  /!\\ GraphViz#add_node is deprecated, use GraphViz#add_nodes\n  "
+  Last (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  "
 rdoc_options: 
 - --title
 - Ruby/GraphViz

data/AUTHORS

@@ -1,23 +0,0 @@
-Gregoire Lejeune <glejeune.lejeune@free.fr>
-Brandon Coleman <metrix1978@gmail.com>
-Dave Burt <http://github.com/dburt>
-Miguel Cabrera <http://mfcabrera.com>
-obruening <http://github.com/obruening>
-reactive <http://github.com/reactive>
-Hugh Sasse <hgs@dmu.ac.uk>
-axgle <http://github.com/axgle>
-hipe <http://github.com/hipe>
-Stefan Huber <http://github.com/MSNexploder>
-Nigel Thorne <http://github.com/NigelThorne>
-Rolf Timmermans <http://github.com/rolftimmermans>
-Jonas Elfström <http://github.com/jonelf>
-oupo <http://github.com/oupo>
-Daniel Zollinger <https://github.com/dznz>
-Ronen Barzel <https://github.com/ronen>
-Jamison Dance <https://github.com/jergason>
-hirochachacha <https://github.com/hirochachacha>
-
-Thanks to :
-
-Desmond Dsouza - Windows tests and corrections
-Vidar Hokstad and Ryan Shea - for nothugly.xsl