ruby-graphviz 1.0.0 → 1.0.1

data/lib/graphviz/core_ext.rb

@@ -1,43 +1,66 @@
 class String
-  def self.random(size)
-    s = ""
-    d = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
-    size.times {
-      s << d[rand(d.size)]
-    }
-    return s
-  end
+   def self.random(size)
+      s = ""
+      d = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
+      size.times {
+         s << d[rand(d.size)]
+      }
+      return s
+   end
+
+   def convert_base(from, to)
+      self.to_i(from).to_s(to)
+   end
+end
+
+class Object
+   def to_ruby
+      begin
+         eval self
+      rescue => e
+         self
+      end
+   end
+end
+
+class Array
+   def all?(&b)
+      r = self.delete_if { |x|
+         yield x
+      }
+      r.size == 0
+   end
 end
 
 # From : http://www.geekmade.co.uk/2008/09/ruby-tip-normalizing-hash-keys-as-symbols/
 class Hash
-  def symbolize_keys
-    inject({}) do |options, (key, value)|
-      options[(key.to_sym rescue key) || key] = value
+   def symbolize_keys
+      inject({}) do |options, (key, value)|
+         options[(key.to_sym rescue key) || key] = value
       options
-    end
-  end
-  
-  # x = {
-  #   :none => String,
-  #   :png => "file.png",
-  #   :svg => "file.svg"
-  # }
-  # 
-  # x.each_except( :key => [:none], :value => [/\.png$/] ) do |k, v|
-  #   puts "#{k} -> #{v}"
-  # end
-  #
-  # => svg -> file.svg
-  def each_except( e, &b )
-    key_table = (e[:key]||[]).clone.delete_if {|i| i.kind_of? Regexp }
-    key_regexp = (e[:key]||[]).clone.delete_if {|i| key_table.include? i }.map {|i| i.to_s }.join("|")
+      end
+   end
+
+   # x = {
+   #   :none => String,
+   #   :png => "file.png",
+   #   :svg => "file.svg"
+   # }
+   # 
+   # x.each_except( :key => [:none], :value => [/\.png$/] ) do |k, v|
+   #   puts "#{k} -> #{v}"
+   # end
+   #
+   # => svg -> file.svg
+   def each_except( e, &b )
+      key_table = (e[:key]||[]).clone.delete_if {|i| i.kind_of? Regexp }
+      key_regexp = (e[:key]||[]).clone.delete_if {|i| key_table.include? i }.map {|i| i.to_s }.join("|")
 
-    value_table = (e[:value]||[]).clone.delete_if {|i| i.kind_of? Regexp }
-    value_regexp = (e[:value]||[]).clone.delete_if {|i| value_table.include? i }.map {|i| i.to_s }.join("|")
+      value_table = (e[:value]||[]).clone.delete_if {|i| i.kind_of? Regexp }
+      value_regexp = (e[:value]||[]).clone.delete_if {|i| value_table.include? i }.map {|i| i.to_s }.join("|")
 
-    self.each do |k, v|
-      yield( k, v ) unless (key_table.size > 0 and key_table.include?(k)) or (key_regexp.size > 0 and k.to_s.match(key_regexp)) or (value_table.size > 0 and value_table.include?(v)) or (value_regexp.size > 0 and v.to_s.match(value_regexp))
-    end
-  end
+      self.each do |k, v|
+         yield( k, v ) unless (key_table.size > 0 and key_table.include?(k)) or (key_regexp.size > 0 and k.to_s.match(key_regexp)) or (value_table.size > 0 and value_table.include?(v)) or (value_regexp.size > 0 and v.to_s.match(value_regexp))
+      end
+   end
 end

data/lib/graphviz/dot2ruby.rb

@@ -47,4 +47,13 @@ class Dot2Ruby #:nodoc:
     instance_eval(xOutput)
     return @_graph_eval
   end
+
+  def eval_string( data ) #:nodoc:
+    t = Tempfile::open( File.basename(__FILE__) )
+    t.print( data )
+    t.close
+    result = self.eval(t.path)
+    t.close
+    return result
+  end
 end

data/lib/graphviz/dsl.rb

@@ -0,0 +1,59 @@
+require 'graphviz'
+
+class GraphViz::DSL
+   attr_accessor :graph
+
+   def initialize(name, hOpts = {}, &block)
+      @graph = GraphViz.new(name, hOpts)
+      instance_eval(&block) if block
+   end
+
+   def method_missing(sym, *args, &block)
+      return @graph.get_graph(sym.to_s) unless @graph.get_graph(sym.to_s).nil?
+      return @graph.get_node(sym.to_s) unless @graph.get_node(sym.to_s).nil?
+      if(@graph.respond_to?(sym, true))
+         @graph.send(sym, *args)
+      elsif(block)
+         @graph.add_graph(GraphViz::DSL.new(sym, { :parent => @graph, :type => @graph.type }, &block).graph)
+      else
+         @graph.add_node(sym.to_s, *args)
+      end
+   end
+
+   def n(name)
+      return @graph.get_node(name) unless @graph.get_node(name.to_s).nil?
+      @graph.add_node(name)
+   end
+
+   def e(*args)
+      e = nil
+      last = args.shift
+      while current = args.shift
+         e = @graph.add_edge(last, current)
+         last = current
+      end
+      return e
+   end
+
+   def subgraph(name, &block) 
+      @graph.add_graph(GraphViz::DSL.new(name, { :parent => @graph, :type => @graph.type }, &block).graph)
+   end
+   alias :cluster :subgraph
+
+   def output(hOpts = {}) 
+      @graph.output(hOpts)
+   end
+end
+
+def graph(name, hOpts = {}, &block) 
+   GraphViz::DSL.new(name, hOpts.merge( { :type => "graph" } ), &block).graph
+end
+
+def digraph(name, hOpts = {}, &block) 
+   GraphViz::DSL.new(name, hOpts.merge( { :type => "digraph" } ), &block).graph
+end
+
+def strict(name, hOpts = {}, &block) 
+   GraphViz::DSL.new(name, hOpts.merge( { :type => "strict digraph" } ), &block).graph
+end
+

data/lib/graphviz/node.rb

@@ -62,7 +62,7 @@ class GraphViz
       return( (self.pg.nil?) ? nil : self.pg.root_graph )
     end
     
-	  # 
+	 # 
     # Set value +xAttrValue+ to the node attribut +xAttrName+
     # 
     def []=( xAttrName, xAttrValue )
@@ -78,6 +78,7 @@ class GraphViz
         xAttrName.each do |key, value|
           self[key] = value
         end
+        return self
       else
         (@oAttrNode[xAttrName.to_s].nil?)?nil:@oAttrNode[xAttrName.to_s].clone
       end

data/lib/graphviz/types.rb

@@ -19,7 +19,3 @@ class GraphViz
     end
   end
 end
-
-#x = :EscString
-#GraphViz::Types.const_get(x).new( "toto" )
-

data/lib/graphviz/types/arrow_type.rb

@@ -0,0 +1,32 @@
+# >> x = "hello\n\t\\l\"world\""
+# => "hello\n\t\\l\"world\""
+# >> puts x.inspect.gsub( "\\\\", "\\" )
+# "hello\n\t\l\"world\""
+#
+# OR
+# 
+# >> x = 'hello\n\t\l"world"'
+# => "hello\\n\\t\\l\"world\""
+# >> puts x.inspect.gsub( "\\\\", "\\" )
+# "hello\n\t\l\"world\""
+
+class GraphViz
+  class Types
+    class ArrowType < Common
+      def check(data)
+        return data
+      end
+      
+      def output
+        return @data.to_s.inspect.gsub( "\\\\", "\\" )
+      end
+      
+      alias :to_gv :output
+      alias :to_s :output
+
+      def to_ruby
+         @data
+      end
+    end
+  end
+end

data/lib/graphviz/types/color.rb

@@ -0,0 +1,56 @@
+require 'graphviz/utils/colors'
+
+class ColorException < RuntimeError
+end
+
+class GraphViz
+  class Types
+    class Color < Common
+      HEX_FOR_COLOR = /[0-9a-fA-F]{2}/
+      RGBA = /^#(#{HEX_FOR_COLOR})(#{HEX_FOR_COLOR})(#{HEX_FOR_COLOR})(#{HEX_FOR_COLOR})?$/
+
+      def check(data)
+        data = data.to_s if data.is_a?(Symbol)
+        if data[0].chr == "#"
+          m = RGBA.match(data)
+          if m.nil?
+            raise ColorException, "Wrong color definition RGBA #{data}"
+          end
+          @to_ruby = GraphViz::Utils::Colors.rgb(m[1], m[2], m[3], m[4])
+          return data
+        elsif data.include?(",") or data.include?(" ")
+          m = data.split(/(?:\s*,\s*|\s+)/).map { |x| x.to_f }
+          if m.size != 3
+            raise ColorException, "Wrong color definition HSV #{data}"
+          end
+          @to_ruby = GraphViz::Utils::Colors.hsv(m[0], m[1], m[2])
+          return data
+        elsif data.is_a?(Array)
+          if data.all? { |x| x.is_a?(String) and x =~ /^#{HEX_FOR_COLOR}$/ } and [3,4].include?(data.size)
+            @to_ruby = GraphViz::Utils::Colors.rgb(data[0], data[1], data[2], data[3])
+            return data
+          elsif data.all? { |x| x.kind_of?(Numeric) } and data.size == 3
+            @to_ruby = GraphViz::Utils::Colors.hsv(data[0], data[1], data[2])
+            return data
+          end
+
+          raise ColorException, "Wrong color definition Array #{data}"
+        else
+          @to_ruby = GraphViz::Utils::Colors.name(data)
+          return data
+        end
+      end
+      
+      def output
+        return @data.to_s.inspect.gsub( "\\\\", "\\" )
+      end
+      
+      alias :to_gv :output
+      alias :to_s :output
+
+      def to_ruby
+         @to_ruby
+      end
+    end
+  end
+end

data/lib/graphviz/types/color_list.rb

@@ -0,0 +1,22 @@
+class GraphViz
+  class Types
+    class ColorList < Common
+      def check(data)
+        data = data.to_s if data.is_a?(Symbol)
+        @to_ruby = data.split(/\s*:\s*/).map { |c| GraphViz::Types::Color.new(c).to_ruby }
+        return data
+      end
+      
+      def output
+        return @data.to_s.inspect.gsub( "\\\\", "\\" )
+      end
+      
+      alias :to_gv :output
+      alias :to_s :output
+
+      def to_ruby
+         @data
+      end
+    end
+  end
+end

data/lib/graphviz/types/esc_string.rb

@@ -1,16 +1,3 @@
-# >> x = "hello\n\t\\l\"world\""
-# => "hello\n\t\\l\"world\""
-# >> puts x.inspect.gsub( "\\\\", "\\" )
-# "hello\n\t\l\"world\""
-#
-# OR
-# 
-# >> x = 'hello\n\t\l"world"'
-# => "hello\\n\\t\\l\"world\""
-# >> puts x.inspect.gsub( "\\\\", "\\" )
-# "hello\n\t\l\"world\""
-
-
 class GraphViz
   class Types
     class EscString < Common
@@ -24,6 +11,10 @@ class GraphViz
       
       alias :to_gv :output
       alias :to_s :output
+
+      def to_ruby
+         @data
+      end
     end
   end
-end
+end

data/lib/graphviz/types/gv_bool.rb

@@ -0,0 +1,49 @@
+class BoolException < RuntimeError
+end
+
+# bool
+#
+# 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.
+#
+# Example 
+#
+#   graph[:center] = "true"
+# or
+#   graph[:center] = true
+# or
+#   graph[:center] = 23
+class GraphViz
+   class Types
+      class GvBool < Common
+         BOOL_TRUE = ["true", "yes"]
+         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))
+               @to_ruby = true
+               return data
+            end
+            
+            if false == data or (data.is_a?(Integer) and data == 0) or (data.is_a?(String) and BOOL_FALSE.include?(data.downcase))
+               @to_ruby = false
+               return data
+            end
+
+            raise BoolException, "Invalid bool value"
+         end
+
+         def output
+            return @data.to_s.inspect.gsub( "\\\\", "\\" )
+         end
+
+         alias :to_gv :output
+         alias :to_s :output
+
+         def to_ruby
+            @to_ruby
+         end
+      end
+   end
+end

data/lib/graphviz/types/gv_double.rb

@@ -1,8 +1,17 @@
+class DoubleException < RuntimeError
+end
+
 class GraphViz
   class Types
     class GvDouble < Common
+      FLOAT_MASK = /[-+]?(?:[0-9]*\.[0-9]+|[0-9]+)/
+
       def check(data)
-        return data
+        if data.kind_of?(Numeric) or (data.is_a?(String) and FLOAT_MASK.match(data))
+          return data
+        end
+
+        raise DoubleException, "Invalid double value"
       end
       
       def output
@@ -15,6 +24,7 @@ class GraphViz
       
       alias :to_gv :output
       alias :to_s :output
+      alias :to_ruby :to_f
     end
   end
-end
+end

data/lib/graphviz/types/html_string.rb

@@ -1,3 +1,4 @@
+# TODO: Remove
 class GraphViz
   class Types
     class HtmlString < Common
@@ -11,6 +12,7 @@ class GraphViz
       
       alias :to_gv :output
       alias :to_s :output
+      alias :to_ruby :output
     end
   end
-end
+end

data/lib/graphviz/types/lbl_string.rb

@@ -16,6 +16,7 @@ class GraphViz
       
       alias :to_gv :output
       alias :to_s :output
+      alias :to_ruby :output
     end
   end
-end
+end