ruby-graphviz 0.9.0 → 0.9.1

data/lib/graphviz/attrs.rb

@@ -41,10 +41,10 @@ class GraphViz
       if @attributs.index( xKey.to_s ).nil? == true
         raise ArgumentError, "#{@name} attribut '#{xKey.to_s}' invalid"
       end
-      @data[xKey.to_s] = xValue
+      @data[xKey.to_s] = xValue.to_s
 
       if @graphviz.nil? == false
-        @graphviz.set_position( @name, xKey.to_s, xValue )
+        @graphviz.set_position( @name, xKey.to_s, xValue.to_s )
       end
     end
   end

data/lib/graphviz/constants.rb

@@ -15,7 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
 module Constants
-  RGV_VERSION = "0.9.0"
+  RGV_VERSION = "0.9.1"
   
   ## Const: Output formats
   FORMATS = [

data/lib/graphviz/dot.treetop

@@ -0,0 +1,93 @@
+grammar Dot
+	rule graph
+		space type:("graph" / "digraph") blank name:string space cluster:cluster space <GraphViz::Parser::Graph>
+	end
+	
+	rule cluster
+		"{" content:(preference / node / edge / subgraph)* "}" <GraphViz::Parser::Cluster>
+	end
+	
+	rule preference
+		graph_preference / named_graph_preference / node_preference / edge_preference
+	end
+	
+	rule graph_preference
+		space key:name blank "=" blank value:string separator <GraphViz::Parser::GraphPreference>
+	end
+	
+	rule named_graph_preference
+		space "graph" blank options:options? separator  <GraphViz::Parser::NamedGraphPreference>
+	end
+	
+	rule node_preference
+		space "node" blank options:options? separator <GraphViz::Parser::NodePreference>
+	end
+	
+	rule edge_preference
+		space "edge" blank options:options? separator <GraphViz::Parser::EdgePreference>
+	end
+	
+	rule node
+		space name:string blank options:options? separator <GraphViz::Parser::Node>
+	end
+	
+	rule edge
+		direct_edge / undirect_edge
+	end
+	
+	rule direct_edge
+		space node_one:string blank "->" blank node_two:string blank other_nodes:("->" blank next_node:string blank)* options:options? separator <GraphViz::Parser::Edge>
+	end
+	
+	rule undirect_edge
+		space node_one:string blank "--" blank node_two:string blank other_nodes:("--" blank next_node:string blank)* options:options? separator <GraphViz::Parser::Edge>
+	end
+	
+	rule subgraph
+	  space "subgraph" blank name:string space cluster:cluster space <GraphViz::Parser::Subgraph>
+	end
+	
+	rule options
+		"[" space (name blank "=" blank string comma space)* name blank "=" blank string space "]" <GraphViz::Parser::Options>
+	end
+	
+	rule string
+		name / quoted_string
+	end
+	
+	rule comma
+		space ","
+	end
+	
+	rule separator
+		blank ";" space
+	end
+	
+	rule quoted_string
+		'"' [^"]* '"'
+	end
+	
+	rule name
+		[a-zA-Z0-9_\.]+
+	end
+	
+	rule blank
+		[\ \t]*
+	end
+	
+	rule space
+    [\s\n\r\t]*
+  end
+
+	rule newline
+		CR LF
+	end
+	
+	rule CR
+    [\r]?
+	end
+	
+	rule LF
+		[\n]?
+	end
+end

data/lib/graphviz/edge.rb

@@ -55,6 +55,7 @@ class GraphViz
     # Set value +xAttrValue+ to the edge attribut +xAttrName+
     # 
 	  def []=( xAttrName, xAttrValue )
+      xAttrValue = xAttrValue.to_s if xAttrValue.class == Symbol
       @oAttrEdge[xAttrName.to_s] = xAttrValue
     end
 
@@ -65,6 +66,11 @@ class GraphViz
       @oAttrEdge[xAttrName.to_s].clone
     end
     
+    def <<( oNode ) #:nodoc:
+      n = @oGParrent.get_node(@xNodeTwo)
+      
+      GraphViz::commonGraph( oNode, n ).add_edge( n, oNode )
+    end
     #
     # Set edge attributs
     #
@@ -94,7 +100,13 @@ class GraphViz
 	      xLink = " -- "
 	    end
 	  
-	    xOut = @xNodeOne + xLink + @xNodeTwo
+	    xNodeNameOne = @xNodeOne.clone
+	    xNodeNameOne = '"' << xNodeNameOne << '"' if xNodeNameOne.match( /^[a-zA-Z_]+[a-zA-Z0-9_\.]*$/ ).nil?
+	    
+	    xNodeNameTwo = @xNodeTwo.clone
+	    xNodeNameTwo = '"' << xNodeNameTwo << '"' if xNodeNameTwo.match( /^[a-zA-Z_]+[a-zA-Z0-9_\.]*$/ ).nil?
+      
+      xOut = xNodeNameOne + xLink + xNodeNameTwo
       xAttr = ""
       xSeparator = ""
       @oAttrEdge.data.each do |k, v|

data/lib/graphviz/node.rb

@@ -48,6 +48,7 @@ class GraphViz
     # Set value +xAttrValue+ to the node attribut +xAttrName+
     # 
     def []=( xAttrName, xAttrValue )
+      xAttrValue = xAttrValue.to_s if xAttrValue.class == Symbol
       @oAttrNode[xAttrName.to_s] = xAttrValue
     end
 
@@ -99,7 +100,10 @@ class GraphViz
     end
     
     def output #:nodoc:
-      xOut = "" << @xNodeName.clone
+      xNodeName = @xNodeName.clone
+      xNodeName = '"' << xNodeName << '"' if xNodeName.match( /^[a-zA-Z_]+[a-zA-Z0-9_\.]*$/ ).nil?
+      
+      xOut = "" << xNodeName
       xAttr = ""
       xSeparator = ""
       @oAttrNode.data.each do |k, v|

data/lib/graphviz/parser.rb

@@ -0,0 +1,244 @@
+require 'rubygems'
+require 'treetop'
+
+Treetop.load File.dirname(__FILE__) + '/dot.treetop'
+
+class GraphViz
+  class Parser
+
+    class Context
+      def initialize
+        @graph = nil
+        @nodes = {}
+        @edges = []
+        @options = {
+          :node => {},
+          :edge => {}
+        }
+      end
+      
+      def graph
+        @graph
+      end
+      
+      def graph=(g)
+        @graph = g
+      end
+      
+      def nodes
+        @nodes
+      end
+      
+      def edges
+        @edges
+      end
+      
+      def options
+        @options
+      end
+      
+      def options=(o)
+        @options = o
+      end
+    end
+    
+    class Graph < Treetop::Runtime::SyntaxNode
+      def eval( context, hOpts )
+        puts "GRAPH TYPE = #{type.text_value}"
+        puts "GRAPH NAME = #{name.text_value}"
+        
+        hOpts = hOpts[0].merge( {:type => type.text_value} )
+        
+        # Create Graph
+        context.graph = GraphViz.new( name.text_value.gsub(/"/, ""), hOpts )
+        
+        # Eval cluster
+        cluster.eval( context )
+        
+        return context.graph
+      end
+    end
+    
+    class Cluster < Treetop::Runtime::SyntaxNode
+      def eval( context )
+        content.elements.each do |e|
+          e.eval( context )
+        end
+      end
+    end
+    
+    class GraphPreference < Treetop::Runtime::SyntaxNode
+      def eval( context )
+        puts "GRAPH PREFERENCE : "
+        puts "  #{key.text_value} = #{value.text_value.gsub(/"/, "")}"
+        context.graph[key.text_value] = value.text_value.gsub(/"/, "")
+      end
+    end
+    
+    class NamedGraphPreference < Treetop::Runtime::SyntaxNode
+      def eval( context )
+        puts "GRAPH PREFERENCES :"
+        options.eval().each do |k,v|
+          context.graph[k] = v
+        end
+      end
+    end
+    
+    class NodePreference < Treetop::Runtime::SyntaxNode
+      def eval( context )
+        puts "NODE PREFERENCES :"
+        context.options[:node] = context.options[:node].merge( options.eval() )
+      end
+    end
+    
+    class EdgePreference < Treetop::Runtime::SyntaxNode
+      def eval( context )
+        puts "EDGE PREFERENCES :"
+        context.options[:edge] = context.options[:edge].merge( options.eval() )
+      end
+    end
+    
+    class Node < Treetop::Runtime::SyntaxNode
+      def eval( context )
+        node_name = name.text_value.gsub( /"/, "" )
+        puts "NODE NAME = #{node_name}"
+        puts "OPTIONS = "
+        
+        # Create node
+        node = context.nodes[node_name] || context.graph.add_node( node_name )
+    
+        # Add global options
+        context.options[:node].each do |k, v|
+          node[k] = v
+        end
+        
+        # Add custom options
+        unless options.terminal?
+          options.eval().each do |k, v|
+            node[k] = v
+          end
+        end
+        
+        # Save node
+        context.nodes[node_name] = node
+      end
+    end
+    
+    class Edge < Treetop::Runtime::SyntaxNode
+      def create_node( name, context )
+        puts "  NEED TO CREATE NODE : #{name}"
+        # Create the node
+        node = context.graph.add_node( name )
+        
+        # Add global options
+        context.options[:node].each do |k, v|
+          node[k] = v
+        end
+        
+        # Save node
+        context.nodes[name] = node
+      end
+      
+      def create_edge( one, two, edge_options, context )
+        # Create edge
+        edge = context.graph.add_edge( one, two )
+        
+        # Add global options
+        context.options[:edge].each do |k, v|
+          edge[k] = v
+        end
+        
+        # Add custom options
+        edge_options.each do |k, v|
+          edge[k] = v
+        end
+        
+        # Save edge
+        context.edges << edge
+      end
+      
+      def eval( context )
+        one_name = node_one.text_value.gsub( /"/, "" )
+        two_name = node_two.text_value.gsub( /"/, "" )
+        puts "EDGE"
+        puts "NODE ONE = #{one_name}"
+        puts "NODE TWO = #{two_name}"
+        puts "OPTIONS = "
+        
+        # Get or create node one
+        one = context.nodes[one_name] || create_node( one_name, context )
+    
+        # Get or create node two
+        two = context.nodes[two_name] || create_node( two_name, context )
+        
+        # Get options 
+        edge_options = {}
+        edge_options = options.eval() unless options.terminal?
+        
+        # Create edge
+        create_edge( one, two, edge_options, context )
+        
+        last_node = two
+        other_nodes.elements.each do |e|
+          new_node_name = e.next_node.text_value.gsub( /"/, "" )
+          puts "OTHER NODE : #{new_node_name}"
+          
+          new_node = context.nodes[new_node_name] || create_node( new_node_name, context )
+          create_edge( last_node, new_node, edge_options, context )
+          
+          last_node = new_node
+        end
+      end
+    end
+    
+    class Subgraph < Treetop::Runtime::SyntaxNode
+      def eval( context )
+        puts "CREATE SUBGRAPH : #{name.text_value}"
+        
+        # Save options
+        saved_options = context.options.clone
+        # Save graph 
+        saved_graph = context.graph
+        
+        # Create Graph
+        context.graph = context.graph.add_graph( name.text_value.gsub(/"/, "") )
+        #context.options = {
+        #  :node => {},
+        #  :edge => {}
+        #}
+        
+        # Eval cluster
+        cluster.eval( context )
+        
+        # Reinitialize graph and options
+        context.graph = saved_graph
+        context.options = saved_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
+      parser = DotParser.new()
+      tree = parser.parse( dot )
+      graph = tree.eval( GraphViz::Parser::Context.new(), hOpts )
+      
+      yield( graph ) if( block and graph.nil? == false )
+      
+      return graph
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-graphviz
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-12 00:00:00 +02:00
+date: 2009-10-10 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: treetop
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 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: 
@@ -20,18 +29,35 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.rdoc
 - ChangeLog
 - COPYING
 - AUTHORS
 files: 
 - ChangeLog
 - COPYING
-- README
+- README.rdoc
 - AUTHORS
 - setup.rb
 - bin/ruby2gv
 - examples/arrowhead.rb
+- examples/dot/cluster.dot
+- examples/dot/fsm.dot
+- examples/dot/genetic.dot
+- examples/dot/hello.dot
+- examples/dot/hello_test.rb
+- examples/dot/lion_share.dot
+- examples/dot/prof.dot
+- examples/dot/psg.dot
+- examples/dot/sdh.dot
+- examples/dot/siblings.dot
+- examples/dot/test.dot
+- 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/HTML-Labels.rb
 - examples/maketest.sh
 - examples/p2p.rb
@@ -40,6 +66,7 @@ files:
 - examples/sample03.rb
 - examples/sample04.rb
 - examples/sample05.rb
+- examples/sample06.rb
 - examples/sample07.rb
 - examples/sample08.rb
 - examples/sample09.rb
@@ -54,25 +81,30 @@ files:
 - examples/sample18.rb
 - examples/sample19.rb
 - examples/sample20.rb
+- examples/sample21.rb
+- examples/sample22.rb
 - examples/shapes.rb
 - examples/test.xml
 - examples/testorder.rb
 - examples/testxml.rb
-- lib/graphviz
 - lib/graphviz/attrs.rb
 - lib/graphviz/constants.rb
+- lib/graphviz/dot.treetop
 - lib/graphviz/edge.rb
 - lib/graphviz/node.rb
+- lib/graphviz/parser.rb
 - lib/graphviz/xml.rb
 - lib/graphviz.rb
 has_rdoc: true
 homepage: http://raa.ruby-lang.org/project/ruby-graphviz/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
 - Ruby/GraphViz
 - --main
-- README
+- README.rdoc
 - --line-numbers
 require_paths: 
 - lib
@@ -91,9 +123,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-asp
-rubygems_version: 1.1.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Interface to the GraphViz graphing tool
 test_files: []