graphvizml 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32126671e7c65cea2740afcdeb9d7202480435e2
-  data.tar.gz: 2120481175898598e5f29b5de6881dcd2690bd7b
+  metadata.gz: c518866f1ae8f45f7e48fb850ecae83c3ca7df99
+  data.tar.gz: 9ffb3522c4aee7d887dfe1734797a751056ca9ef
 SHA512:
-  metadata.gz: 79a10faa54b39c0cd848ad292a8c3852580d89403545f804e6958276de04a0b0da0ee183da31a71b08aa52c6d6855bffb706f3ebaff5a6b7149f78ae4a0a2a6b
-  data.tar.gz: ed3024826a29be27d5e05735624ee19bebb5722f17a023df3679865bf6600eb7fd628a49915c29acb1033c0fa1e7b9cb889dc4ac251585228b89842d1ca81af4
+  metadata.gz: '039b03b9fb2d33c7bdd4f0e7664f73dde30b1f60ff77771669df918c9f95fbe27de0301b80dd483400cebac95b913a3f3612d59ed0ca00836821610cc4765821'
+  data.tar.gz: a43c19e842e379f69641fea9969fe3b0fa399f4435a7b0d32c02b9ac2460e376caa4569e2e1f28f1c17d59ed524df97dafa55b0a6a7d4fd2d7da6cda6fa030d1

data/lib/graphvizml.rb

@@ -22,17 +22,10 @@ class GraphVizML
       
       obj.xml
 
-    end    
-    
-    doc = Domle.new(xml)    
-
-    # check if the root node is gvml or nodes
-    @g = if doc.root.name == 'gvml' then
-      build_from_gvml doc
-    elsif doc.root.name == 'nodes'
-      build_from_nodes doc
     end
 
+    @g = build_from_nodes Domle.new(xml)
+
   end
   
   def to_dot()
@@ -61,47 +54,6 @@ class GraphVizML
   
   private
   
-  def build_from_gvml(doc)
-        
-    g = Graphviz::Graph.new format_summary_attributes(doc.root.attributes) 
-
-    e_nodes = doc.root.element 'nodes'
-    e_edges = doc.root.element 'edges'
-
-
-    # add the nodes    
-
-    nodes = e_nodes.root.xpath('records/a | records/node').inject({}) do |r,e|
-      
-      r.merge fetch_node(e)
-
-    end
-
-    
-    # add the edges    
-
-    id_1 = e_edges.root.element('records/edge/records/node/attribute::gid').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::gid').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])
-      attributes = edge.style.merge({label: label})
-      
-      conn = nodes[id1][-1].connections.last
-      conn.attributes[:label] = label
-      edge.style.each {|key,val| conn.attributes[key] = m(val) }
-      
-    end         
-     
-    format_attributes nodes
-
-    return g
-  end
   
   def build_from_nodes(doc)    
 
@@ -128,7 +80,6 @@ class GraphVizML
     end
     
     edge_style = a.find {|x| x[0].grep(/edge/).any?}.last
-
     
     
     # add the edges    

metadata

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