graphviz 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53f53e53933990cd7d1db7893e889953abfcb29f
-  data.tar.gz: e5937034681308f0cc005cff8927427b5a14f8e4
+  metadata.gz: 5ecf43f4dc20f7751fdcab695ed60c56c05d2c99
+  data.tar.gz: caa5d9ee7b24714b8804085456ab55f020f069e1
 SHA512:
-  metadata.gz: e34c656a49ce0dc4ad30973e1093fef0bfc8fbef62622645e44d3f993bfc11c60a0ab8ad52a3f0badcd1102717132b8350b6c4632444d82a78ee8b7fe89057f4
-  data.tar.gz: 5b9196eed4421dc028400df9aa52a1610e8ddd8f20d654169823870ca90ff137c80f7b0b29f719db88bf13cfaca3ea56d624dbdd50c1de35488f12c15f5c548f
+  metadata.gz: 704db8989d9806ae9846f224272e10c4c80e10179e6da9259798e1cf9c0c7b34330733432de305f1f3e88de56a34812011861ac736d076eed31e35c066fdeba0
+  data.tar.gz: 7c4a946acc7edc8dc0d93e14803e960299ed8d17c57d3684a0ce4d7242fe01b7b079d485a9f57b9a5935d808ea1842f02012d2e3eea1e9427dd66fd4cb80275e

data/README.md

@@ -18,7 +18,23 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Some example code:
+
+	require 'graphviz';
+
+	g = Graphviz::Graph.new
+
+	foo = g.add_node("Foo")
+	foo.add_node("Bar")
+
+	foo.attributes[:shape] = 'box3d'
+	foo.attributes[:color] = 'red'
+
+	# Dup the dot data:
+	puts g.to_dot
+
+	# Process the graph to output:
+	Graphviz::output(g, :path => "test.pdf")
 
 ## Contributing
 

data/lib/graphviz/graph.rb

@@ -22,12 +22,12 @@ require 'stringio'
 
 module Graphviz
 	class Node
-		def initialize(graph, name, options)
+		def initialize(graph, name, attributes = {})
 			@graph = graph
 			@graph.nodes[name] = self
 			
 			@name = name
-			@options = options
+			@attributes = attributes
 			
 			@edges = []
 		end
@@ -36,6 +36,7 @@ module Graphviz
 		attr :options
 		
 		attr :edges
+		attr_accessor :attributes
 		
 		def connect(destination, options = {})
 			edge = Edge.new(@graph, self, destination, options)
@@ -45,6 +46,10 @@ module Graphviz
 			return edge
 		end
 		
+		def connected?(node)
+			return @edges.find{|edge| edge.destination == node}
+		end
+		
 		def add_node(name, options = {})
 			node = Node.new(@graph, name, options)
 			
@@ -55,61 +60,124 @@ module Graphviz
 	end
 	
 	class Edge
-		def initialize(graph, source, destination, options = {})
+		def initialize(graph, source, destination, attributes = {})
 			@graph = graph
 			@graph.edges << self
 			
 			@source = source
 			@destination = destination
 			
-			@options = options
+			@attributes = attributes
 		end
 		
 		attr :source
 		attr :destination
 		
+		attr_accessor :attributes
+		
 		attr :options
+		attr_accessor :line
 		
 		def to_s
-			"->"
+			'->'
 		end
 	end
 	
+	class EdgeNode < Node
+	end
+	
 	class Graph
-		def initialize(name = 'G', options = {})
+		def initialize(name = 'G', attributes = {})
 			@name = name
 			
 			@nodes = {}
 			@edges = []
+			@graphs = {}
+			
+			@parent = nil
+			
+			@attributes = attributes
 		end
 		
 		attr :nodes
 		attr :edges
+		attr :graphs
 		
-		def add_node(name, options = {})
-			Node.new(self, name, options)
+		attr_accessor :attributes
+		
+		def add_node(name, attributes = {})
+			Node.new(self, name, attributes)
+		end
+		
+		def add_subgraph(name, attributes = {})
+			graph = Graph.new(name, attributes)
+			
+			graph.attach(self)
+			@graphs[name] = graph
+			
+			return graph
+		end
+		
+		def attach(parent)
+			@parent = parent
 		end
 		
 		def to_dot(options = {})
 			buffer = StringIO.new
 			
+			dump_graph(buffer, "", options)
+			
+			return buffer.string
+		end
+		
+		protected
+		
+		def dump_graph(buffer, indent, options)
 			format = options[:format] || 'digraph'
 			
-			buffer.puts "#{format} #{@name} {"
+			buffer.puts "#{indent}#{format} #{dump_value(@name)} {"
+			
+			@attributes.each do |(name, value)|
+				buffer.puts "#{indent}\t#{name}=#{dump_value(value)};"
+			end
 			
 			@nodes.each do |(name, node)|
+				node_attributes_text = dump_attributes(node.attributes)
+				node_name = dump_value(node.name)
+				buffer.puts "#{indent}\t#{node_name}#{node_attributes_text};"
+				
 				if node.edges.size > 0
 					node.edges.each do |edge|
-						buffer.puts "\t#{edge.source.name.dump} #{edge} #{edge.destination.name.dump};"
+						from_name = dump_value(edge.source.name)
+						to_name = dump_value(edge.destination.name)
+						edge_attributes_text = dump_attributes(edge.attributes)
+						
+						buffer.puts "#{indent}\t#{from_name} #{edge} #{to_name}#{edge_attributes_text};"
 					end
-				else
-					buffer.puts "\t#{node.name.dump};"
 				end
 			end
 			
-			buffer.puts "}"
+			@graphs.each do |(name, graph)|
+				graph.dump_graph(buffer, indent + "\t", options.merge(:format => 'subgraph'))
+			end
 			
-			return buffer.string
+			buffer.puts "#{indent}}"
+		end
+		
+		def dump_value(value)
+			if Symbol === value
+				value.to_s
+			else
+				value.inspect
+			end
+		end
+		
+		def dump_attributes(attributes)
+			if attributes.size > 0
+				"[" + attributes.collect{|(name, value)| "#{name}=#{dump_value(value)}"}.join(", ") + "]"
+			else
+				""
+			end
 		end
 	end
 end

data/lib/graphviz/version.rb

@@ -1,3 +1,3 @@
 module Graphviz
-	VERSION = "0.0.1"
+	VERSION = "0.0.2"
 end

data/sample.rb

@@ -5,6 +5,12 @@ g = Graphviz::Graph.new
 foo = g.add_node("Foo")
 foo.add_node("Bar")
 
+foo.attributes[:shape] = 'box3d'
+foo.attributes[:color] = 'red'
+
+# Dup the dot data:
 puts g.to_dot
 
+# Process the graph to output:
 Graphviz::output(g, :path => "test.pdf")
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphviz
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Samuel Williams