ruby-graphviz 0.9.9 → 0.9.10

data/lib/graphviz/family_tree/person.rb

@@ -0,0 +1,70 @@
+require 'rubygems'
+require 'graphviz'
+
+class GraphViz
+  class FamilyTree
+    class Person
+      def initialize( graph, cluster, tree, name )
+        @graph = graph
+        @cluster = cluster
+        @node = @cluster.add_node( name )
+        @node["shape"] = "box"
+        @tree = tree
+      end
+      
+      def couples
+        @couples
+      end
+      
+      def node
+        @node
+      end
+      
+      def is_a_man( name )
+        @node["label"] = name
+        @node["color"] = "blue"
+      end
+      def is_a_boy( name )
+        is_a_man( name )
+      end
+      
+      def is_a_woman( name )
+        @node["label"] = name
+        @node["color"] = "pink"
+      end
+      def is_a_girl( name )
+        is_a_woman( name )
+      end
+      
+      def is_maried_with( x )
+        node = @cluster.add_node( "#{@node.name}And#{x.node.name}" )
+        node["shape"] = "point"
+        @cluster.add_edge( @node, node, "dir" => "none" )
+        @cluster.add_edge( node, x.node, "dir" => "none" )
+        @tree.add_couple( self, x, node )
+      end
+      
+      def is_divorced_with( x )
+        node = @cluster.add_node( "#{@node.name}And#{x.node.name}" )
+        node["shape"] = "point"
+        node["color"] = "red"
+        @cluster.add_edge( @node, node, "dir" => "none", "color" => "red" )
+        @cluster.add_edge( node, x.node, "dir" => "none", "color" => "red" )
+        @tree.add_couple( self, x, node )
+      end
+      
+      def is_widower_of( x ) #veuf
+        node = @cluster.add_node( "#{@node.name}And#{x.node.name}" )
+        node["shape"] = "point"
+        node["color"] = "green"
+        @cluster.add_edge( @node, node, "dir" => "none", "color" => "green" )
+        @cluster.add_edge( node, x.node, "dir" => "none", "color" => "green" )
+        @tree.add_couple( self, x, node )
+      end
+
+      def kids( *z )
+        GraphViz::FamilyTree::Couple.new( @graph, @node ).kids( *z )
+      end
+    end
+  end
+end

data/lib/graphviz/family_tree.rb

@@ -0,0 +1,46 @@
+require 'rubygems'
+require 'graphviz'
+require 'graphviz/family_tree/generation'
+require 'graphviz/family_tree/person'
+require 'graphviz/family_tree/couple'
+
+class GraphViz
+  class FamilyTree
+    def initialize( &block )
+      @persons = {}
+      @graph = GraphViz.new( "FamilyTree" )
+      @generation = 0
+      @couples = {}
+      
+      instance_eval(&block) if block
+    end
+    
+    def generation( &b )
+      GraphViz::FamilyTree::Generation.new( @graph, @persons, self, @generation ).make( &b )
+      @generation += 1
+    end
+    
+    def persons
+      @persons ||= {}
+    end
+    
+    def add_couple( x, y, node )
+      @couples[x] = {} if @couples[x].nil?
+      @couples[x][y] = GraphViz::FamilyTree::Couple.new( @graph, node )
+      @couples[y] = {} if @couples[y].nil?
+      @couples[y][x] = @couples[x][y]
+    end
+    
+    def couple( x, y )
+      @couples[x][y]
+    end
+    
+    def method_missing(sym, *args, &block)
+      persons[sym.to_s]
+    end
+    
+    def graph
+      @graph
+    end
+  end
+end

data/lib/graphviz/parser.rb

@@ -58,11 +58,15 @@ class GraphViz
     end
     
     class Graph < Treetop::Runtime::SyntaxNode
-      def eval( context, hOpts )
+      def eval( context, hOpts = [] )
         # puts "GRAPH TYPE = #{type.text_value}"
         # puts "GRAPH NAME = #{name.text_value}"
         
-        hOpts = hOpts[0].merge( {:type => type.text_value} )
+        begin
+          hOpts = hOpts[0].merge( {:type => type.text_value} )
+        rescue
+          hOpts = {:type => type.text_value}
+        end
         
         # Create Graph
         context.graph = GraphViz.new( name.text_value.gsub(/"/, ""), hOpts )
@@ -231,19 +235,44 @@ class GraphViz
       end
     end
     
-    class Options < Treetop::Runtime::SyntaxNode
-  def eval
-    options = {}
-    elements[2].elements.each do |e|
-      # puts "  #{e.elements[0].text_value} = #{e.elements[4].text_value}"
-      options[e.elements[0].text_value] = e.elements[4].text_value.gsub( /"/, "" )
+    class AnonymousSubgraph < Treetop::Runtime::SyntaxNode
+      def eval( context )
+        # puts "CREATE ANONYMOUS SUBGRAPH"
+        
+        # Save options
+        saved_options = context.options.clone
+        # Save graph 
+        saved_graph = context.graph
+        
+        # Create Graph
+        context.graph = context.graph.add_graph( )
+        #context.options = {
+        #  :node => {},
+        #  :edge => {}
+        #}
+        
+        # Eval cluster
+        cluster.eval( context )
+        
+        # Reinitialize graph and options
+        context.graph = saved_graph
+        context.options = saved_options
+      end
     end
-    # puts "  #{elements[3].text_value} = #{elements[7].text_value}"
-    options[elements[3].text_value] = elements[7].text_value.gsub( /"/, "" )
     
-    return options
-  end
-end
+    class Options < Treetop::Runtime::SyntaxNode
+      def eval
+        options = {}
+        elements[2].elements.each do |e|
+          # puts "  #{e.elements[0].text_value} = #{e.elements[4].text_value}"
+          options[e.elements[0].text_value] = e.elements[4].text_value.gsub( /"/, "" )
+        end
+        # puts "  #{elements[3].text_value} = #{elements[7].text_value}"
+        options[elements[3].text_value] = elements[7].text_value.gsub( /"/, "" )
+        
+        return options
+      end
+    end
 
     def self.parse( file, *hOpts, &block )
       dot = open(file).read

data/lib/graphviz.rb

@@ -30,6 +30,7 @@ require 'graphviz/attrs'
 require 'graphviz/constants'
 require 'graphviz/parser'
 require 'graphviz/types'
+require 'graphviz/core_ext'
 
 class GraphViz 
   include Constants
@@ -80,24 +81,21 @@ class GraphViz
   #
   # In:
   # * xNodeName : Name of the new node
-  # * *hOpt : Node attributs
+  # * hOpts : Node attributs
   # 
   # Return the GraphViz::Node object created
   #
-  def add_node( xNodeName, *hOpt )
+  def add_node( xNodeName, hOpts = {} )
     @hoNodes[xNodeName] = GraphViz::Node::new( xNodeName, self )
    
-    if hOpt.nil? == false and hOpt[0].nil? == false
-      
-      unless hOpt[0].keys.include?(:label) or hOpt[0].keys.include?("label")
-        hOpt[0][:label] = xNodeName
-      end
+    unless hOpts.keys.include?(:label) or hOpts.keys.include?("label")
+      hOpts[:label] = xNodeName
+    end
       
-      hOpt[0].each do |xKey, xValue|
-        @hoNodes[xNodeName][xKey.to_s] = xValue
-      end
+    hOpts.each do |xKey, xValue|
+      @hoNodes[xNodeName][xKey.to_s] = xValue
     end
-
+    
     @elements_order.push( { 
       "type" => "node", 
       "name" => xNodeName,
@@ -140,29 +138,27 @@ class GraphViz
   # In:
   # * oNodeOne : First node (or node list)
   # * oNodeTwo : Second Node (or node list)
-  # * *hOpt : Edge attributs
+  # * hOpts : Edge attributs
   #
-  def add_edge( oNodeOne, oNodeTwo, *hOpt )
+  def add_edge( oNodeOne, oNodeTwo, hOpts = {} )
     
     if( oNodeOne.class == Array ) 
       oNodeOne.each do |no|
-        add_edge( no, oNodeTwo, *hOpt )
+        add_edge( no, oNodeTwo, hOpts )
       end
     else
       if( oNodeTwo.class == Array )
         oNodeTwo.each do |nt|
-          add_edge( oNodeOne, nt, *hOpt )
+          add_edge( oNodeOne, nt, hOpts )
         end
       else
 
         oEdge = GraphViz::Edge::new( oNodeOne, oNodeTwo, self )
         
-        if hOpt.nil? == false and hOpt[0].nil? == false
-          hOpt[0].each do |xKey, xValue|
-            oEdge[xKey.to_s] = xValue
-          end
+        hOpts.each do |xKey, xValue|
+          oEdge[xKey.to_s] = xValue
         end
-
+        
         @elements_order.push( { 
           "type" => "edge", 
           "value" => oEdge
@@ -195,26 +191,36 @@ class GraphViz
   # 
   # In:
   # * xGraphName : Graph name
-  # * *hOpt : Graph attributs
+  # * hOpts : Graph attributs
   #
-  def add_graph( xGraphName, *hOpt )
-    @hoGraphs[xGraphName] = GraphViz::new( xGraphName, :parent => self, :type => @oGraphType )
+  def add_graph( xGraphName = nil, hOpts = {}, &block )
+    if xGraphName.kind_of?(Hash)
+      hOpts = xGraphName
+      xGraphName = nil
+    end
+    
+    if xGraphName.nil?
+      xGraphID = String.random(11)
+      xGraphName = ""
+    else
+      xGraphID = xGraphName
+    end
+    
+    @hoGraphs[xGraphID] = GraphViz::new( xGraphName, {:parent => self, :type => @oGraphType}, &block )
    
-    if hOpt.nil? == false and hOpt[0].nil? == false
-      hOpt[0].each do |xKey, xValue|
-        @hoGraphs[xGraphName][xKey.to_s] = xValue
-      end
+    hOpts.each do |xKey, xValue|
+      @hoGraphs[xGraphID][xKey.to_s] = xValue
     end
-
+    
     @elements_order.push( { 
       "type" => "graph", 
       "name" => xGraphName,
-      "value" => @hoGraphs[xGraphName] 
+      "value" => @hoGraphs[xGraphID] 
     } )
     
-    return( @hoGraphs[xGraphName] )
+    return( @hoGraphs[xGraphID] )
   end
-  
+  alias :subgraph :add_graph
   #
   # Return the graph object for the given name (or nil)
   #
@@ -249,7 +255,7 @@ class GraphViz
     
     if block
       # Creating a cluster named '#{xName}'
-      rCod = add_graph( xName, args[0] )
+      rCod = add_graph( xName, args[0]||{} )
       yield( rCod )
     else
       # Create a node named '#{xName}' or search for a node, edge or cluster
@@ -262,7 +268,7 @@ class GraphViz
       end
       return( @hoGraphs[xName] ) if @hoGraphs.keys.include?( xName )
       
-      rCod = add_node( xName, args[0] )
+      rCod = add_node( xName, args[0]||{} )
     end
 
     return rCod
@@ -306,7 +312,7 @@ class GraphViz
   #   * 1 = Error
   #   * 2 = none
   # 
-  def output( *hOpt )
+  def output( hOpts = {} )
     xDOTScript = ""
     xLastType = nil
     xSeparator = ""
@@ -387,36 +393,34 @@ class GraphViz
 
       return( xDOTScript )
     else
-      if hOpt.nil? == false and hOpt[0].nil? == false
-        hOpt[0].each do |xKey, xValue|
-          xValue = xValue.to_s unless xValue.nil? or [Class, TrueClass, FalseClass].include?(xValue.class)
-          case xKey.to_s
-            when "output"
-              warn ":output option is deprecated, please use :<format> => :<file>"
-              if FORMATS.index( xValue ).nil? == true
-                raise ArgumentError, "output format '#{xValue}' invalid"
-              end
-              @format = xValue
-            when "file"
-              warn ":file option is deprecated, please use :<format> => :<file>"
-              @filename = xValue
-            when "use"
-              if PROGRAMS.index( xValue ).nil? == true
-                raise ArgumentError, "can't use '#{xValue}'"
-              end
-              @prog = xValue
-            when "path"
-              @path = xValue.split( "," ).map{ |x| x.strip }
-            when "errors"
-              @errors = xValue
-            when "extlib"
-              @extlibs = xValue.split( "," ).map{ |x| x.strip }
-            else
-              if FORMATS.index( xKey.to_s ).nil? == true
-                raise ArgumentError, "output format '#{xValue}' invalid"
-              end
-              @output[xKey.to_s] = xValue
-          end
+      hOpts.each do |xKey, xValue|
+        xValue = xValue.to_s unless xValue.nil? or [Class, TrueClass, FalseClass].include?(xValue.class)
+        case xKey.to_s
+          when "output"
+            warn ":output option is deprecated, please use :<format> => :<file>"
+            if FORMATS.index( xValue ).nil? == true
+              raise ArgumentError, "output format '#{xValue}' invalid"
+            end
+            @format = xValue
+          when "file"
+            warn ":file option is deprecated, please use :<format> => :<file>"
+            @filename = xValue
+          when "use"
+            if PROGRAMS.index( xValue ).nil? == true
+              raise ArgumentError, "can't use '#{xValue}'"
+            end
+            @prog = xValue
+          when "path"
+            @path = xValue.split( "," ).map{ |x| x.strip }
+          when "errors"
+            @errors = xValue
+          when "extlib"
+            @extlibs = xValue.split( "," ).map{ |x| x.strip }
+          else
+            if FORMATS.index( xKey.to_s ).nil? == true
+              raise ArgumentError, "output format '#{xValue}' invalid"
+            end
+            @output[xKey.to_s] = xValue
         end
       end
   
@@ -604,8 +608,8 @@ class GraphViz
   # * :parent : Parent graph (default : none)
   # * :type : Graph type (Constants::GRAPHTYPE) (default : digraph)
   # 
-  def self.parse( xFile, *hOpts, &block )
-    g = GraphViz::Parser.parse( xFile, hOpts[0], &block )
+  def self.parse( xFile, hOpts = {}, &block )
+    g = GraphViz::Parser.parse( xFile, hOpts, &block )
     return g
   end
 
@@ -639,7 +643,7 @@ class GraphViz
   #   * 1 = Error
   #   * 2 = none
   # 
-  def initialize( xGraphName, *hOpt, &block )
+  def initialize( xGraphName, hOpts = {}, &block )
     @filename = nil
     @name     = xGraphName.to_s
     @format   = @@format
@@ -662,45 +666,50 @@ class GraphViz
     @edge  = GraphViz::Attrs::new( self, "edge",  EDGESATTRS  )
     @graph = GraphViz::Attrs::new( self, "graph", GRAPHSATTRS )
 
-    if hOpt.nil? == false and hOpt[0].nil? == false
-      hOpt[0].each do |xKey, xValue|
-        case xKey.to_s
-          when "output"
-            warn ":output option is deprecated, please use :<format> => :<file>"
-            if FORMATS.index( xValue.to_s ).nil? == true
-              raise ArgumentError, "output format '#{xValue}' invalid"
-            end
-            @format = xValue.to_s
-          when "use"
-            if PROGRAMS.index( xValue.to_s ).nil? == true
-              raise ArgumentError, "can't use '#{xValue}'"
-            end
-            @prog = xValue.to_s
-          when "file"
-            warn ":file option is deprecated, please use :<format> => :<file>"
-            @filename = xValue.to_s
-          when "parent"
-            @oParentGraph = xValue
-          when "type"
-            if GRAPHTYPE.index( xValue.to_s ).nil? == true
-              raise ArgumentError, "graph type '#{xValue}' unknow"
-            end
-            @oGraphType = xValue.to_s
-          when "path"
-            @path = xValue.split( "," ).map{ |x| x.strip }
-          when "errors"
-            @errors = xValue
-          when "extlibs"
-            @extlibs = xValue.split( "," ).map{ |x| x.strip }
-          else
-            self[xKey.to_s] = xValue.to_s
-        end
+    hOpts.each do |xKey, xValue|
+      case xKey.to_s
+        when "output"
+          warn ":output option is deprecated, please use :<format> => :<file>"
+          if FORMATS.index( xValue.to_s ).nil? == true
+            raise ArgumentError, "output format '#{xValue}' invalid"
+          end
+          @format = xValue.to_s
+        when "use"
+          if PROGRAMS.index( xValue.to_s ).nil? == true
+            raise ArgumentError, "can't use '#{xValue}'"
+          end
+          @prog = xValue.to_s
+        when "file"
+          warn ":file option is deprecated, please use :<format> => :<file>"
+          @filename = xValue.to_s
+        when "parent"
+          @oParentGraph = xValue
+        when "type"
+          if GRAPHTYPE.index( xValue.to_s ).nil? == true
+            raise ArgumentError, "graph type '#{xValue}' unknow"
+          end
+          @oGraphType = xValue.to_s
+        when "path"
+          @path = xValue.split( "," ).map{ |x| x.strip }
+        when "errors"
+          @errors = xValue
+        when "extlibs"
+          @extlibs = xValue.split( "," ).map{ |x| x.strip }
+        else
+          self[xKey.to_s] = xValue.to_s
       end
     end
   
     yield( self ) if( block )
   end
   
+  def self.graph( xGraphName, hOpts = {}, &block )
+    new( xGraphName, hOpts.symbolize_keys.merge( {:type => "graph"} ), &block )
+  end
+  def self.digraph( xGraphName, hOpts = {}, &block )
+    new( xGraphName, hOpts.symbolize_keys.merge( {:type => "digraph"} ), &block )
+  end
+  
   #
   # Escape a string to be acceptable as a node name in a graphviz input file
   #
@@ -755,7 +764,7 @@ class GraphViz
 #     return nil
 #   end
 
-  def add_exe_suffix(prog)
+  def add_exe_suffix(prog) #:nodoc:
     if /Windows/.match( ENV['OS'] )
       suffix = '.exe'
     else
@@ -764,8 +773,7 @@ class GraphViz
     "#{prog}#{suffix}"
   end
 
-
-  def escape_path_containing_blanks(path)
+  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|
@@ -778,6 +786,4 @@ class GraphViz
     path_elements.join(File::SEPARATOR)
   end
 
-  
 end
-

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-graphviz
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-12 00:00:00 +01:00
+date: 2010-03-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: treetop
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Ruby/Graphviz provides an interface to layout and generate images of directed graphs in a variety of formats (PostScript, PNG, etc.) using GraphViz.
 email: gregoire.lejeune@free.fr
 executables: 
@@ -31,11 +38,9 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
-- ChangeLog.rdoc
 - COPYING
 - AUTHORS
 files: 
-- ChangeLog.rdoc
 - COPYING
 - README.rdoc
 - AUTHORS
@@ -44,6 +49,7 @@ files:
 - bin/ruby2gv
 - examples/arrowhead.rb
 - examples/dot/cluster.dot
+- examples/dot/dotgraph.dot
 - examples/dot/fsm.dot
 - examples/dot/genetic.dot
 - examples/dot/hello.dot
@@ -51,15 +57,18 @@ files:
 - examples/dot/lion_share.dot
 - examples/dot/prof.dot
 - examples/dot/psg.dot
+- examples/dot/rank.dot
 - examples/dot/sdh.dot
 - examples/dot/siblings.dot
 - examples/dot/test.dot
+- examples/dot/test_parse.rb
 - examples/dot/unix.dot
 - examples/graphviz.org/cluster.rb
 - examples/graphviz.org/hello_world.rb
 - examples/graphviz.org/lion_share.rb
 - examples/graphviz.org/process.rb
 - examples/graphviz.org/TrafficLights.rb
+- examples/hello.png
 - examples/HTML-Labels.rb
 - examples/maketest.bat
 - examples/maketest.sh
@@ -80,6 +89,7 @@ files:
 - examples/sample11.rb
 - examples/sample12.rb
 - examples/sample13.rb
+- examples/sample13b.rb
 - examples/sample14.rb
 - examples/sample15.rb
 - examples/sample16.rb
@@ -99,17 +109,28 @@ files:
 - examples/sample30.rb
 - examples/sample31.rb
 - examples/sample32.rb
+- examples/sample33.rb
+- examples/sample34.rb
+- examples/sample35.rb
+- examples/sample36.rb
+- examples/sample40.rb
 - examples/sdlshapes/README
 - examples/sdlshapes/sdl.ps
 - examples/sdlshapes/sdlshapes.dot
 - examples/shapes.rb
+- examples/simpsons.gv
 - examples/test.xml
 - examples/testorder.rb
 - examples/testxml.rb
 - lib/graphviz/attrs.rb
 - lib/graphviz/constants.rb
+- lib/graphviz/core_ext.rb
 - lib/graphviz/dot.treetop
 - lib/graphviz/edge.rb
+- lib/graphviz/family_tree/couple.rb
+- lib/graphviz/family_tree/generation.rb
+- lib/graphviz/family_tree/person.rb
+- lib/graphviz/family_tree.rb
 - lib/graphviz/node.rb
 - lib/graphviz/parser.rb
 - lib/graphviz/types/esc_string.rb
@@ -141,18 +162,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ruby-asp
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Interface to the GraphViz graphing tool