graphvizml 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5d3e64a89e4a8aca44de4b73ee8fdd67654f654
-  data.tar.gz: 9bbf22a678f88328434bee2d25dab96f67c42de7
+  metadata.gz: fa1a602a47c8fd18ef15dca1bade19d3fff91b4f
+  data.tar.gz: e720cce356fe7729149af89fe81e3ac4ae8490b7
 SHA512:
-  metadata.gz: 6eb862a9595478d7561ad7aa3d59af7128c3f6b98623b78d8348c8550606c3825d5f85198af44ddf0a10fb4746aa793d6f84697bb4a9a672b1a051af013937d6
-  data.tar.gz: 243962484ebc442197d35be82b8b2191ba00de9f0cf1c9f148597cf5d8cb051c3c34b524775ef9ce947a2bc370f4c947ae950b8438ebc5cac7f6244364cf09ef
+  metadata.gz: 44f4558ce01e9cd7d72a484fb081c754ed7c6c1db5c4a04ce89be1b08a501a8be7bf6b49f556c0cb53eea9281a56734e873aed8bd471288e3bccbc109c3c7cbf
+  data.tar.gz: 98a20cd7ae810889f8755aa98cc69f1179d3277821aa12dfb6e794403cd6d02877ce41ca6d27e123551b59a23475dadf9ed71ba0db01a5f7918cb01df5720a2d

data/lib/graphvizml.rb

@@ -25,26 +25,43 @@ class GraphVizML
       @doc = obj
 
     end
+    
+    build()
 
   end
 
   def to_png(filename=@filename.sub(/\.xml$/,'.png'))
-
-    e_options = @doc.root.element 'options'
+    @g.output( png: filename )
+  end
+  
+  private
+  
+  def build
+    
+    stylesheet = @doc.root.element('style').text
     e_nodes = @doc.root.element 'nodes'
     e_edges = @doc.root.element 'edges'
 
-    # set global node options
+    # parse the stylesheet
 
-    xpath_node = "records/option[summary/type='node']/records/attribute"
-    e_options.root.xpath(xpath_node).each do |attribute|
-      @g.node[attribute.text('name').to_sym] = attribute.text('value')
-    end
+    a = stylesheet.split(/}/)[0..-2].map do |entry|
+
+      raw_selector,raw_styles = entry.split(/{/,2)
+
+      h = raw_styles.strip.split(/;/).inject({}) do |r, x| 
+        k, v = x.split(/:/,2).map(&:strip)
+        r.merge(k.to_sym => v)
+      end
+
+      [raw_selector.split(/,\s*/).map(&:strip), h]
+    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
 
-    xpath_edge = "records/option[summary/type='edge']/records/attribute"
-    e_options.root.xpath(xpath_edge).each do |attribute|
-      @g.edge[attribute.text('name').to_sym] = attribute.text('value')
-    end
 
     # add the nodes
 
@@ -59,13 +76,7 @@ class GraphVizML
       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
-    end
-
-    # output the file
-
-    out_type = e_edges.root.text('summary/output_type')
-    out_file = e_edges.root.text('summary/output_file')
-    @g.output( png: filename )
+    end    
   end
 
-end
+end

metadata

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