graphvizml 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2ee4042b59729e7f825e135a5aaa68c62595bd7
-  data.tar.gz: 6418e4a1a1911768a6e2ba279d4788769a42ac36
+  metadata.gz: d063484a482cc9e2512ffd708dd8c8cfb29f85d2
+  data.tar.gz: 44a191e3277241d87b481a343fbfbd07ad0a293f
 SHA512:
-  metadata.gz: 51aeed3ac59449d42ceb69db7f33dd0a759299090e77696e72a2f86ee9b34b856a3d5e20e76d0e5e28b79fb561444257e55fdf35256036e3aa56914ea11ad396
-  data.tar.gz: 9fa09220d5e3e0fed477783a4a16730278782582674bf90dbcd8c4e21bb15dab32662071d6cf46306109b198d9a072bac13da2a10fb0424912dc4954655fed27
+  metadata.gz: 7622da9909b58dae25bd620f253f9a9711cd2eccad4ef20e3a6d1b9c38dda60ac59030934be4608b0a645a7f032bbc81aac225c837b04bc07d24d439c7c036df
+  data.tar.gz: 6fd1f2d279d1bf25ae43867bb5c80d1c27e7e7eb394272d8787f9175a83fa72f55e32c26101b404c98e515a2c0f9faae8b422ca9fe5d33a35a053fec22072cca

data/lib/graphvizml.rb

@@ -26,11 +26,10 @@ class GraphVizML
     
     h = @doc.root.attributes
 
-    @type = h.has_key?(:type) ? h[:type].to_sym : :digraph
+    @type = (h.has_key?(:type) ? h[:type].to_sym : :digraph)
     direction = h.has_key?(:direction) ? h[:direction].to_s.upcase : 'LR'
     
-    @g = GraphViz::new( :G, type: @type)
-    @g[:rankdir] = direction
+    @g = Graphviz::Graph.new type: @type.to_s, rankdir: direction
     
     build()
 
@@ -39,26 +38,64 @@ class GraphVizML
   # writes to a PNG file (not a PNG blob)
   #
   def to_png(filename=@filename.sub(/\.xml$/,'.png'))
-    @g.output( :png => filename )
+    Graphviz::output(@g, :path => filename)
   end
   
   # writes to a SVG file (not an SVG blob)
   #
   def to_svg(filename=@filename.sub(/\.xml$/,'.svg'))
-    @g.output( :svg => filename )
+    Graphviz::output(@g, :path => filename)
   end  
   
   private
   
   def build
     
-    style = @doc.root.element('style')
-    
-    stylesheet = style ? style.text : default_stylesheet()
-
     e_nodes = @doc.root.element 'nodes'
     e_edges = @doc.root.element 'edges'
 
+    # add the nodes
+    
+    nodes = {}
+
+    nodes = e_nodes.root.xpath('records/node').inject({}) do |r,node|
+
+      h =node.attributes
+      id = h[:id]
+      label = node.text('label')
+      
+      # shape options:  box, ellipse, record, diamond, circle, polygon, point
+      shape = h.has_key?(:shape) ? h[:shape] : :box
+      #puts "adding node id: %s label: %s" % [id, label]
+      r.merge(id => [label, {shape: shape}, nil])
+    end
+
+    
+    # add the edges    
+
+    id_1 = e_edges.root.element('records/edge/records/node/attribute::id').to_s
+    nodes[id_1][-1] = @g.add_node(nodes[id_1][0])
+
+
+    e_edges.root.xpath('records/edge').each do |edge|
+
+      id1, id2 = edge.xpath('records/node/attribute::id').map(&:to_s)
+
+      label = edge.text('summary/label').to_s
+      #puts "adding edge id1: %s id2: %s label: %s" % [id1, id2, label]
+      nodes[id2][-1] ||= nodes[id1].last.add_node(nodes[id2][0])
+      
+    end 
+    
+    #puts @g.to_dot    
+    
+    # add the styling once the objects have been created
+    
+    style = @doc.root.element('style')
+    
+    stylesheet = style ? style.text : default_stylesheet()
+    
+    
     # parse the stylesheet
 
     a = stylesheet.split(/}/)[0..-2].map do |entry|
@@ -74,37 +111,25 @@ class GraphVizML
     end      
     
     node_style = a.detect {|x| x.assoc 'node'}
-    node_style.last.each {|key, value|  @g.node[key] = value } if node_style
     
-    edge_style = a.detect {|x| x.assoc 'edge'}
-    edge_style.last.each {|key, value| @g.edge[key] = value } if edge_style
-
-
-    # add the nodes
-
-    e_nodes.root.xpath('records/node').each do |node|
-
-      h =node.attributes
-      id = h[:id]
-      label = node.text('label')
+    if node_style then
       
-      # shape options:  box, ellipse, record, diamond, circle, polygon, point
-      shape = h.has_key?(:shape) ? h[:shape] : :box
-      #puts "adding node id: %s label: %s" % [id, label]
-      @g.add_node(id, shape: shape).label = label
+      nodes.each do |id, x|
+        node_style.last.each {|key, value| x.last.attributes[key] = value }
+      end      
     end
+    
+    edge_style = a.detect {|x| x.assoc 'edge'}
+    
+    if edge_style then
 
-    # add the edges
-
-    e_edges.root.xpath('records/edge').each do |edge|
-
-      a = edge.xpath('records/node')
+      nodes.each do |id,x|      
+        x.last.connections.each do |conn|
+          edge_style.last.each {|key, value| conn.attributes[key] = value }
+        end
+      end      
+    end
 
-      id1, id2 = a[0].attribute('id').to_s, a[1].attribute('id').to_s
-      label = edge.text('summary/label').to_s
-      #puts "adding edge id1: %s id2: %s label: %s" % [id1, id2, label]
-      @g.add_edge(id1, id2).label = label
-    end    
     
     :build
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphvizml
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -54,25 +54,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.7
 - !ruby/object:Gem::Dependency
-  name: ruby-graphviz
+  name: graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 0.4.0
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -103,5 +103,6 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: Generates a PNG file from GraphViz using a GraphViz Markup Language file
+summary: Generates an SVG file or PNG file from GraphViz using a GraphViz Markup Language
+  file
 test_files: []