graphviz 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddb46b8053b2f7327eabf54932a0940bf2495ac7
-  data.tar.gz: 0f8da017c2d17dba6b9786a09ddd6018bb470dff
+  metadata.gz: 3c4f0f3b611287cceb14c4dac3e77e2497ffae13
+  data.tar.gz: fe7cf2f64b8febce78609be21cce9ef81f7cccc7
 SHA512:
-  metadata.gz: 948aac08b37c57ab910f58ca6f30a672e29f5947cf8aa1a42389a49b8bbbe1ebdb51e60ef0eac5abbfb639a358bbcfb7f407795a5b32ef7799cd5b85956cc6d0
-  data.tar.gz: 77048e08ac224b0e034e5397c3b048532caf630f05fd605e5010e8a54db807b1044f2c929ed1ed7c13ce4e3bcd327e7ecfdede3692c0d57b5e4f90ea1d0bb32b
+  metadata.gz: 65d2682330f3b2d3aaa63590950eeb0c52db5a7071d3e0d89a110ab19de7df2a3f4759cc3f007529db310e8c1d8aa8f742133dca3270b17031332c4ea5193252
+  data.tar.gz: 36c924356952539a6856848857607d4b1d67d512132595f09f02373becc85aae462f214490ace2912699e560e8a231531a6f6ae2957af606b1c2fe330777c9c4

data/lib/graphviz/graph.rb

@@ -25,21 +25,25 @@ module Graphviz
 	class Node
 		# Initialize the node in the graph with the unique name.
 		# @param attributes [Hash] The associated graphviz attributes for this node.
-		def initialize(graph, name, attributes = {})
-			@graph = graph
-			@graph.nodes[name] = self
-			
+		def initialize(name, graph = nil, **attributes)
 			@name = name
 			@attributes = attributes
 			
-			@edges = []
+			@connections = []
+			
+			graph << self if graph
+		end
+		
+		# Attach this node to the given graph:
+		def attach(parent)
+			@graph = parent
 		end
 		
 		# @return [String] The unique name of the node.
 		attr :name
 		
 		# @return [Array<Edge>] Any edges connecting to other nodes.
-		attr :edges
+		attr :connections
 		
 		# @return [Hash] Any attributes specified for this node.
 		attr_accessor :attributes
@@ -49,25 +53,54 @@ module Graphviz
 		def connect(destination, attributes = {})
 			edge = Edge.new(@graph, self, destination, attributes)
 			
-			@edges << edge
+			@connections << edge
 			
 			return edge
 		end
 		
 		# Calculate if this node is connected to another. +O(N)+ search required.
 		def connected?(node)
-			return @edges.find{|edge| edge.destination == node}
+			return @connections.find{|edge| edge.destination == node}
 		end
 		
 		# Add a node and #connect to it.
 		# @param attributes [Hash] The associated graphviz attributes for the new node.
-		def add_node(name, attributes = {})
-			node = Node.new(@graph, name, attributes)
+		def add_node(name = nil, **attributes)
+			node = @graph.add_node(name, **attributes)
 			
 			connect(node)
 			
 			return node
 		end
+		
+		def identifier
+			@name
+		end
+		
+		def dump_graph(buffer, indent, options)
+			node_attributes_text = dump_attributes(@attributes)
+			node_name = dump_value(self.identifier)
+			
+			buffer.puts "#{indent}#{node_name}#{node_attributes_text};"
+		end
+		
+		# Dump the value to dot text format.
+		def dump_value(value)
+			if Symbol === value
+				value.to_s
+			else
+				value.inspect
+			end
+		end
+		
+		# Dump the attributes to dot text format.
+		def dump_attributes(attributes)
+			if attributes.size > 0
+				"[" + attributes.collect{|(name, value)| "#{name}=#{dump_value(value)}"}.join(", ") + "]"
+			else
+				""
+			end
+		end
 	end
 	
 	# Represents a visual edge between two nodes.
@@ -100,29 +133,21 @@ module Graphviz
 	end
 	
 	# Contains a set of nodes, edges and subgraphs.
-	class Graph
+	class Graph < Node
 		# Initialize the graph with the specified unique name.
-		def initialize(name = 'G', attributes = {})
-			@name = name
+		def initialize(name = 'G', parent = nil, **attributes)
+			super
 			
-			@nodes = {}
 			@edges = []
-			@graphs = {}
-			
-			@parent = nil
-			
-			@attributes = attributes
+			@nodes = {}
 		end
 		
-		# @return [Graph] The parent graph, if any.
-		attr :parent
+		# All edges in the graph
+		attr :edges
 		
 		# @return [Array<Node>] All nodes in the graph.
 		attr :nodes
 		
-		# @return [Array<Edge>] All edges in the graph.
-		attr :edges
-		
 		# @return [Array<Graph>] Any subgraphs.
 		attr :graphs
 		
@@ -130,24 +155,28 @@ module Graphviz
 		attr_accessor :attributes
 		
 		# @return [Node] Add a node to this graph.
-		def add_node(name, attributes = {})
-			Node.new(self, name, attributes)
+		def add_node(name = nil, **attributes)
+			name ||= "#{@name}N#{@nodes.count}"
+			
+			Node.new(name, self, attributes)
 		end
 		
 		# Add a subgraph with a given name and attributes.
 		# @return [Graph] the new graph.
-		def add_subgraph(name, attributes = {})
-			graph = Graph.new(name, attributes)
+		def add_subgraph(name = nil, **attributes)
+			name ||= "#{@name}S#{@nodes.count}"
+			
+			subgraph = Graph.new(name, self, attributes)
 			
-			graph.attach(self)
-			@graphs[name] = graph
+			self << subgraph
 			
-			return graph
+			return subgraph
 		end
 		
-		# Make this graph a subgraph of the parent.
-		def attach(parent)
-			@parent = parent
+		def << node
+			@nodes[node.name] = node
+			
+			node.attach(self)
 		end
 		
 		# @return [String] Output the graph using the dot format.
@@ -159,57 +188,49 @@ module Graphviz
 			return buffer.string
 		end
 		
-		protected
+		def graph_format(options)
+			if @graph
+				'subgraph'
+			else
+				options[:format] || 'digraph'
+			end
+		end
+		
+		def identifier
+			if @attributes[:cluster]
+				"cluster_#{@name}"
+			else
+				super
+			end
+		end
+		
+		def dump_edges(buffer, indent, options)
+			@edges.each do |edge|
+				from_name = dump_value(edge.source.identifier)
+				to_name = dump_value(edge.destination.identifier)
+				edge_attributes_text = dump_attributes(edge.attributes)
+				
+				buffer.puts "#{indent}#{from_name} #{edge} #{to_name}#{edge_attributes_text};"
+			end
+		end
 		
 		# Dump the entire graph and all subgraphs to dot text format.
 		def dump_graph(buffer, indent, options)
-			format = options[:format] || 'digraph'
+			format = graph_format(options)
 			
-			buffer.puts "#{indent}#{format} #{dump_value(@name)} {"
+			buffer.puts "#{indent}#{format} #{dump_value(self.identifier)} {"
 			
 			@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|
-						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
-				end
+				node.dump_graph(buffer, indent + "\t", options)
 			end
 			
-			@graphs.each do |(name, graph)|
-				graph.dump_graph(buffer, indent + "\t", options.merge(:format => 'subgraph'))
-			end
+			dump_edges(buffer, indent + "\t", options)
 			
 			buffer.puts "#{indent}}"
 		end
-		
-		# Dump the value to dot text format.
-		def dump_value(value)
-			if Symbol === value
-				value.to_s
-			else
-				value.inspect
-			end
-		end
-		
-		# Dump the attributes to dot text format.
-		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

@@ -20,5 +20,5 @@
 
 module Graphviz
 	# The version.
-	VERSION = "0.2.0"
+	VERSION = "0.3.0"
 end

data/spec/graphviz/graph_spec.rb

@@ -24,8 +24,8 @@ module Graphviz::GraphSpec
 	SAMPLE_GRAPH_DOT = <<-EOF
 digraph "G" {
 	"Foo"[shape="box3d", color="red"];
-	"Foo" -> "Bar";
 	"Bar";
+	"Foo" -> "Bar";
 }
 	EOF
 	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphviz
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A lightweight interface for generating graphs with Graphviz.