ruby-graphviz 0.9.11 → 0.9.12

data/lib/graphviz/attrs.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Gregoire Lejeune <gregoire.lejeune@free.fr>
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 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

data/lib/graphviz/constants.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Gregoire Lejeune <gregoire.lejeune@free.fr>
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 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
@@ -40,7 +40,7 @@
 #   C => cluster
 #
 module Constants
-  RGV_VERSION = "0.9.11"
+  RGV_VERSION = "0.9.12"
   
   ## Const: Output formats
   FORMATS = [

data/lib/graphviz/edge.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Gregoire Lejeune <gregoire.lejeune@free.fr>
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 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
@@ -21,7 +21,9 @@ class GraphViz
   class Edge
     include Constants
     @xNodeOne
+    @xNodeOnePort
     @xNodeTwo
+    @xNodeTwoPort
     @oAttrEdge
     @oGParrent
 
@@ -29,22 +31,23 @@ class GraphViz
     # Create a new edge
     # 
     # In:
-    # * vNodeOne : First node
-    # * vNodeTwo : Second node
+    # * vNodeOne : First node (can be a GraphViz::Node or a node ID)
+    # * vNodeTwo : Second node (can be a GraphViz::Node or a node ID)
     # * oGParrent : Graph 
     #
     def initialize( vNodeOne, vNodeTwo, oGParrent = nil )
-	    if vNodeOne.class == String
-        @xNodeOne = vNodeOne
-	    else
-        @xNodeOne = vNodeOne.name
-	    end
-	  
-	    if vNodeTwo.class == String
-        @xNodeTwo = vNodeTwo
-	    else
-        @xNodeTwo = vNodeTwo.name
-	    end
+      @xNodeOne, @xNodeOnePort = getNodeNameAndPort( vNodeOne )
+	    # if vNodeOne.class == String
+      #   @xNodeOne = vNodeOne
+	    # else
+      #   @xNodeOne = vNodeOne.id
+	    # end
+	    @xNodeTwo, @xNodeTwoPort = getNodeNameAndPort( vNodeTwo )
+	    # if vNodeTwo.class == String
+      #   @xNodeTwo = vNodeTwo
+	    # else
+      #   @xNodeTwo = vNodeTwo.id
+	    # end
 	    
 	    @oGParrent = oGParrent
 
@@ -112,13 +115,17 @@ class GraphViz
 	      xLink = " -- "
 	    end
 	  
-	    #xNodeNameOne = @xNodeOne.clone
-	    #xNodeNameOne = '"' << xNodeNameOne << '"' if xNodeNameOne.match( /^[a-zA-Z_]+[a-zA-Z0-9_\.]*$/ ).nil?
-	    xNodeNameOne = GraphViz.escape(@xNodeOne)
+	    xNodeNameOne = if @xNodeOnePort.nil?
+	      GraphViz.escape(@xNodeOne)
+      else
+        GraphViz.escape(@xNodeOne, true) + ":#{@xNodeOnePort}"
+      end
 	    
-	    #xNodeNameTwo = @xNodeTwo.clone
-	    #xNodeNameTwo = '"' << xNodeNameTwo << '"' if xNodeNameTwo.match( /^[a-zA-Z_]+[a-zA-Z0-9_\.]*$/ ).nil?
-	    xNodeNameTwo = GraphViz.escape(@xNodeTwo)
+	    xNodeNameTwo = if @xNodeTwoPort.nil?
+	      GraphViz.escape(@xNodeTwo) 
+	    else 
+	      GraphViz.escape(@xNodeTwo, true) + ":#{@xNodeTwoPort}"
+      end
       
       xOut = xNodeNameOne + xLink + xNodeNameTwo
       xAttr = ""
@@ -134,5 +141,22 @@ class GraphViz
 
       return( xOut )
 	  end
+  
+    private
+    def getNodeNameAndPort( node )
+      name, port = nil, nil
+      if node.class == Hash
+        node.each do |k, v|
+          name, port = getNodeNameAndPort(k)
+          port = v
+        end
+	    elsif node.class == String
+        name = node
+	    else
+        name = node.id
+      end
+      
+      return name, port
+    end
   end
 end

data/lib/graphviz/family_tree.rb

@@ -3,6 +3,7 @@ require 'graphviz'
 require 'graphviz/family_tree/generation'
 require 'graphviz/family_tree/person'
 require 'graphviz/family_tree/couple'
+require 'graphviz/family_tree/sibling'
 
 class GraphViz
   class FamilyTree
@@ -14,8 +15,9 @@ class GraphViz
     #   end
     def initialize( &block )
       @persons = {}
-      @graph = GraphViz.new( "FamilyTree" )
-      @generation = 0
+      @graph = GraphViz.new( "FamilyTree", :use => :neato )
+      @generation_number = 0
+      @generations = []
       @couples = {}
       
       instance_eval(&block) if block
@@ -33,8 +35,10 @@ class GraphViz
     #     end
     #   end
     def generation( &b )
-      GraphViz::FamilyTree::Generation.new( @graph, @persons, self, @generation ).make( &b )
-      @generation += 1
+      gen = GraphViz::FamilyTree::Generation.new( @graph, @persons, self, @generation_number )
+      gen.make( &b )
+      @generations << gen
+      @generation_number += 1
     end
     
     def persons #:nodoc:
@@ -43,7 +47,7 @@ class GraphViz
     
     def add_couple( x, y, node ) #:nodoc:
       @couples[x] = {} if @couples[x].nil?
-      @couples[x][y] = GraphViz::FamilyTree::Couple.new( @graph, node )
+      @couples[x][y] = GraphViz::FamilyTree::Couple.new( @graph, node, [x, y] )
       @couples[y] = {} if @couples[y].nil?
       @couples[y][x] = @couples[x][y]
     end
@@ -57,9 +61,56 @@ class GraphViz
       persons[sym.to_s]
     end
     
+    # Family size
+    def size
+      @persons.size
+    end
+    
     # Get the graph
     def graph
+      maxY = @generations.size
+      biggestGen, maxX = biggestGenerationNumberAndSize
+      
+      puts "#{maxY} generations"
+      puts "Plus grosse generation : ##{biggestGen} avec #{maxX} personnes"
+      
+      puts "traitement des générations..."
+      
+      puts "  #{biggestGen}:"
+      @generations[biggestGen].persons.each do |id, person|
+        puts "    - #{id} : #{person.class}"
+      end
+      
+      puts "  Up..."
+      (0...biggestGen).reverse_each do |genNumber|
+        puts "  #{genNumber}:"
+        @generations[genNumber].persons.each do |id, person|
+          puts "    - #{id} : #{person.class}"
+        end
+      end
+
+      puts "  Down..."
+      ((biggestGen+1)...maxY).each do |genNumber|
+        puts "  #{genNumber}:"
+        @generations[genNumber].persons.each do |id, person|
+          puts "    - #{id} : #{person.class}"
+        end
+      end
+      
       @graph
     end
+    
+    private
+    def biggestGenerationNumberAndSize
+      size = 0
+      number = 0
+      @generations.each do |gen|
+        if gen.size > size
+          size = gen.size
+          number = gen.number
+        end
+      end
+      return number, size
+    end
   end
 end

data/lib/graphviz/family_tree/couple.rb

@@ -1,9 +1,11 @@
 class GraphViz
   class FamilyTree
     class Couple
-      def initialize( g, n ) #:nodoc:
-        @graph = g
-        @node = n
+      def initialize( graph, node, persons ) #:nodoc:
+        @graph = graph
+        @node = node
+        @kids = []
+        @persons = persons
       end
       
       def node #:nodoc:
@@ -12,10 +14,14 @@ class GraphViz
       
       # Add kids to a couple
       def kids( *z )
+        @kids = GraphViz::FamilyTree::Sibling.new( z, @persons )
+        
+        return
+        
         if z.size == 1
           @graph.add_edge( @node, z[0].node, "dir" => "none" )
         else
-          cluster = @graph.add_graph( "#{@node.name}Kids" )
+          cluster = @graph.add_graph( "#{@node.id}Kids" )
           cluster["rank"] = "same"
 
           last = nil
@@ -26,7 +32,7 @@ class GraphViz
           z.each do |person|
             count = count + 1
             if count == add
-              middle = cluster.add_node( "#{@node.name}Kids", "shape" => "point" )
+              middle = cluster.add_node( "#{@node.id}Kids", "shape" => "point" )
               @graph.add_edge( @node, middle, "dir" => "none" )
               unless last.nil?
                 cluster.add_edge( last, middle, "dir" => "none" )
@@ -34,7 +40,7 @@ class GraphViz
               last = middle
             end
             
-            kid = cluster.add_node( "#{person.node.name}Kid", "shape" => "point" )
+            kid = cluster.add_node( "#{person.node.id}Kid", "shape" => "point" )
             @graph.add_edge( kid, person.node, "dir" => "none" )
             
             if add == 0 and count == link
@@ -48,6 +54,10 @@ class GraphViz
           end
         end        
       end
+      
+      def getKids
+        @kids
+      end
     end
   end
 end

data/lib/graphviz/family_tree/generation.rb

@@ -3,13 +3,17 @@ class GraphViz
     class Generation
       def initialize( graph, persons, tree, gen_number ) #:nodoc:
         @graph = graph
-        @persons = persons
-        @cluster = @graph.add_graph( "Generation#{gen_number}" )
-        @cluster["rank"] = "same"
+        @all_persons = persons
+        @persons = {}
         @tree = tree
+        @gen_number = gen_number
       end
       
-      def persons #:nodoc:
+      def all_persons #:nodoc:
+        @all_persons
+      end
+      
+      def persons
         @persons
       end
       
@@ -18,7 +22,17 @@ class GraphViz
       end
       
       def method_missing(sym, *args, &block) #:nodoc:
-        persons[sym.to_s] ||= GraphViz::FamilyTree::Person.new( @graph, @cluster, @tree, sym.to_s )
+        all_persons[sym.to_s] ||= (persons[sym.to_s] ||= GraphViz::FamilyTree::Person.new( @graph, @tree, self, sym.to_s ))
+      end
+      
+      # Generation number
+      def number
+        @gen_number
+      end
+      
+      # Generation size
+      def size
+        @persons.size
       end
     end
   end

data/lib/graphviz/family_tree/person.rb

@@ -4,12 +4,30 @@ require 'graphviz'
 class GraphViz
   class FamilyTree
     class Person
-      def initialize( graph, cluster, tree, name ) #:nodoc:
+      def initialize( graph, tree, generation, id ) #:nodoc:
         @graph = graph
-        @cluster = cluster
-        @node = @cluster.add_node( name )
+        @node = @graph.add_node( id )
         @node["shape"] = "box"
         @tree = tree
+        @generation = generation
+        @x, @y = 0, 0
+        @sibling = nil
+      end
+      
+      def id
+        @node.id
+      end
+      
+      def name
+        @node.label || @node.id
+      end
+      
+      def sibling
+        @sibling
+      end
+      
+      def sibling=(x)
+        @sibling=x
       end
       
       def couples #:nodoc:
@@ -27,6 +45,7 @@ class GraphViz
         @node["label"] = name
         @node["color"] = "blue"
       end
+      
       # Define the current person as a boy
       #
       #  greg.is_a_boy( "Greg" )
@@ -52,10 +71,10 @@ class GraphViz
       #
       #  mu.is_maried_with greg
       def is_maried_with( x )
-        node = @cluster.add_node( "#{@node.name}And#{x.node.name}" )
+        node = @graph.add_node( "#{@node.id}And#{x.node.id}" )
         node["shape"] = "point"
-        @cluster.add_edge( @node, node, "dir" => "none" )
-        @cluster.add_edge( node, x.node, "dir" => "none" )
+        @graph.add_edge( @node, node, "dir" => "none" )
+        @graph.add_edge( node, x.node, "dir" => "none" )
         @tree.add_couple( self, x, node )
       end
       
@@ -63,11 +82,11 @@ class GraphViz
       #
       #  sophie.is_divorced_with john
       def is_divorced_with( x )
-        node = @cluster.add_node( "#{@node.name}And#{x.node.name}" )
+        node = @graph.add_node( "#{@node.id}And#{x.node.id}" )
         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" )
+        @graph.add_edge( @node, node, "dir" => "none", "color" => "red" )
+        @graph.add_edge( node, x.node, "dir" => "none", "color" => "red" )
         @tree.add_couple( self, x, node )
       end
       
@@ -75,19 +94,26 @@ class GraphViz
       #
       #  simon.is_widower_of elisa
       def is_widower_of( x ) #veuf
-        node = @cluster.add_node( "#{@node.name}And#{x.node.name}" )
+        node = @graph.add_node( "#{@node.id}And#{x.node.id}" )
         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" )
+        @graph.add_edge( @node, node, "dir" => "none", "color" => "green" )
+        @graph.add_edge( node, x.node, "dir" => "none", "color" => "green" )
         @tree.add_couple( self, x, node )
       end
 
+      # Define the current person as dead
+      #
+      #  jack.is_dead
+      def is_dead
+        @node["style"] = "filled"
+      end
+      
       # Define the kids of a single person
       #
       #   alice.kids( john, jack, julie )
       def kids( *z )
-        GraphViz::FamilyTree::Couple.new( @graph, @node ).kids( *z )
+        GraphViz::FamilyTree::Couple.new( @graph, @node, [self] ).kids( *z )
       end
     end
   end

data/lib/graphviz/family_tree/sibling.rb

@@ -0,0 +1,13 @@
+class GraphViz
+  class FamilyTree
+    class Sibling
+      def initialize( bns, parents )
+        @brothers_and_sisters = bns
+        @brothers_and_sisters.each do |person|
+          person.sibling = self
+        end
+        @parents = parents
+      end
+    end
+  end
+end

data/lib/graphviz/node.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Gregoire Lejeune <gregoire.lejeune@free.fr>
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 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
@@ -28,7 +28,7 @@ class GraphViz
     # Create a new node
     # 
     # In:
-    # * xNodeName : Name of the node
+    # * xNodeName : ID of the node
     # * oGParrent : Graph 
     # 
     def initialize( xNodeName, oGParrent = nil )
@@ -38,9 +38,17 @@ class GraphViz
     end
 
     # 
-    # Get the node name
+    # Get the node ID
     # 
     def name
+	    warn "GraphViz::Node#name is deprecated, please use GraphViz::Node#id!"
+	    return self.id
+	  end
+
+    # 
+    # Get the node ID
+    # 
+    def id
 	    @xNodeName.clone
 	  end