graphvizml 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: febd83b16af433c07a734388b45f56e68790e5e1
-  data.tar.gz: 19d83ae5a7bb14426f119c5d31c0717e356f5337
+  metadata.gz: 39ea97ac12a4a601926f83b5337f0325b749f1ba
+  data.tar.gz: b67e291b4bcb8ee2db0223f9b506ebd943bce346
 SHA512:
-  metadata.gz: 8cc1a9cfef615c6901441023c40c852725f72c8fe6376e8c11cda8956f95ed85f74bd43ae9e078f2cd6e492de70753d8236a341f043d572ff0cb1c3b36c1f40e
-  data.tar.gz: cbed869e1969b87ee818d36b2039c7a30dbde297776a44aeac86bd2ebba1899c57d271783f1ec0ad378caf9158119fec43b19916ed8625f021b13b0e9ed1dda3
+  metadata.gz: 91e66ab9af6fface7d8122ae888e7a01d6f540967b24ef0055b85c3192e9c1bb158735bfe6ecc237b3f2a57c58609f76c6602064249b46cda1c30b4943d90288
+  data.tar.gz: 2f04f948869723991efb05e001282611bcffc11499bf7326e3ed68b371a8fb36c67e73b1742dd8cf50a869919602fd214b94aa5b85439a17c7c078a223fec2c3

data/lib/graphvizml.rb

@@ -4,38 +4,48 @@
 
 
 require 'rexle'
-require 'graphviz'  # this loads the ruby-graphviz gem
+require 'graphviz'
+
 
 class GraphVizML
 
+  attr_reader :g
 
   def initialize(obj)
-
-    @g = GraphViz::new( "structs", "type" => "graph" )
-    @g[:rankdir] = "LR"
     
-    if obj.is_a? String then
-      
-      @filename = obj
-      @doc = Rexle.new(File.read @filename)
+    @doc = if obj.is_a? String then
+            
+      Rexle.new(File.read @filename=obj)
       
     elsif obj.is_a? Rexle
       
       @filename = 'gvml.xml'
-      @doc = obj
+      obj
 
     end
     
+    h = @doc.root.attributes
+
+    type = h.has_key?(:type) ? h[:type].to_sym : :graph
+    direction = h.has_key?(:direction) ? h[:direction].to_s.upcase : 'LR'
+    
+    @g = GraphViz::new( :G, type: type)
+    @g[:rankdir] = direction
+    
     build()
 
   end
 
+  # writes to a PNG file (not a PNG blob)
+  #
   def to_png(filename=@filename.sub(/\.xml$/,'.png'))
-    @g.output( png: filename )
+    @g.output( :png => filename )
   end
   
+  # writes to a SVG file (not an SVG blob)
+  #
   def to_svg(filename=@filename.sub(/\.xml$/,'.svg'))
-    @g.output( svg: filename )
+    @g.output( :svg => filename )
   end  
   
   private
@@ -70,7 +80,11 @@ class GraphVizML
     # add the nodes
 
     e_nodes.root.xpath('records/node').each do |node|
-      @g.add_node(node.attribute('id').to_s).label = node.text('label')
+
+      id = node.attribute('id').to_s
+      label = node.text('label')
+      #puts "adding node id: %s label: %s" % [id, label]
+      @g.add_node(id).label = label
     end
 
     # add the edges
@@ -78,9 +92,13 @@ class GraphVizML
     e_edges.root.xpath('records/edge').each do |edge|
 
       a = edge.xpath('records/node')
-      @g.add_edge(a[0].attribute('id').to_s, 
-        a[1].attribute('id').to_s).label = edge.text('summary/label').to_s
+      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
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphvizml
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   0fBBWVqwHyWs77T9gCuDZmQrw2NmfyhNWhBw0iljBXo7WLDNB3x0nP6mYTzk47O8
   sL5FGYJNgQqFlw==
   -----END CERTIFICATE-----
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle