graphvizml 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de0694551027289ed8fa1585ad6b6c623ec452ba
-  data.tar.gz: 126a11754c78559bf196baab8c64df3f4f893981
+  metadata.gz: cc88f0980d16f4c6ac702127b4038b4df8fe9076
+  data.tar.gz: d73d374242d788856f689bf0016c619803391bb3
 SHA512:
-  metadata.gz: 583cc6f8a779814a1388b734439b799342661490abd92472de500b9e1154eb11553ff71996640f106be09f73e4051ba6789b6469344d1a93a6676d6e460c33e0
-  data.tar.gz: 74f5895b91a83eecfbda1e3b0da57c3fca2a76fe67e135c32d3175c01504aeca370432f3b1508c072d6eacbebed4a05f2e41c64d34e8ac619e412fdfb5ebd184
+  metadata.gz: 2e476405816dd40ee6a31a0ac09f1103092e6fb75d35a8747f0e9868a9df34d56fc95d9a90f2f4807814ec143e6d8998d36f2246c56302a561da4cc57b6aa082
+  data.tar.gz: 0d5ba3b20ed75906ac73805013403bacec88d215c3fc40c44705b494aeb698903b4562e4475d42d8a900db136ca8cf06af52766a03b040061ce48118ecdbf8b3

data/lib/graphvizml.rb

@@ -105,38 +105,56 @@ class GraphVizML
   
   def build_from_nodes(doc)    
 
-    
     g = Graphviz::Graph.new format_summary_attributes(doc.root.attributes) 
     
-
     # add the nodes    
 
-    nodes = doc.root.xpath('//a | //node').inject({}) do |r,e|
+    nodes = doc.root.xpath('//node').inject({}) do |r,e|
       
       r.merge fetch_node(e)
 
-    end    
+    end
+
+    a = doc.root.element('style/text()').strip.split(/}/).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
+    
+    edge_style = a.find {|x| x[0].grep(/edge/).any?}.last
+
+    
     
     # add the edges    
 
     id_1 = nodes.first[0]
     nodes[id_1][-1] = g.add_node(nodes[id_1][0])    
-    
+
 
     doc.root.each_recursive do |node|
-      
-      node.xpath('node').each do |child|                
+
+      next unless node.name == 'node'
+
+      node.xpath('a | node').each do |childx|
         
+        child = childx.name == 'node' ? childx : childx.element('node')
         id1, id2 = node.object_id, child.object_id
 
         label = child.attributes[:connection].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])
         attributes = child.style.merge({label: label})
-        
+
         conn = nodes[id1][-1].connections.last
         conn.attributes[:label] = label
-        child.style.each {|key,val| conn.attributes[key] = m(val) }    
+        
+        edge_style.each {|key,val| conn.attributes[key] = m(val) }    
               
       end
     end    
@@ -147,20 +165,16 @@ class GraphVizML
     
   end
   
-  def fetch_node(e)
+  def fetch_node(node)
+
+    h = node.attributes
     
-    node = if e.name == 'a' then
+    if node.parent.name == 'a' then
                     
-      url = e.attributes[:href]
-      child = e.element 'node'
-      child.attributes[:url] = url
+      url = node.parent.attributes[:href]
+      h[:url] = url if url
       
-      child
-    else
-      e
-    end
-    
-    h = node.attributes
+    end    
 
     id = h[:gid] || node.object_id
     label = node.text('label')
@@ -181,8 +195,9 @@ class GraphVizML
   def format_attributes(nodes)
     
     nodes.each do |id, x|
-      
+
       _, attributes, obj = x
+      next unless obj
       attributes.each {|key, val| obj.attributes[key] = m(val) }
                                                       
     end    

data.tar.gz.sig

@@ -1,2 +1 @@
-ݡ7���V�Q=5��?�����@��v׷�NcfJ���wKLx�1-{f����0]��u��RAϚ4��U
��ɳ����	c�@꿢��]����c��s��$�%fM��l�SX�lOy3��9���
eK�k2��E?��akf����,W�W��E�������4\� '��&7��
-7���q��}�bh�:��őj5�k�e�܏N�!ft���Dž	�a�D��
+���� ���e��TF�����W�(ɮ'yi��,��<�ډ[�lBr����c

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphvizml
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   0fBBWVqwHyWs77T9gCuDZmQrw2NmfyhNWhBw0iljBXo7WLDNB3x0nP6mYTzk47O8
   sL5FGYJNgQqFlw==
   -----END CERTIFICATE-----
-date: 2017-09-10 00:00:00.000000000 Z
+date: 2017-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: domle