graphvizml 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78dc36faf679576f5f913a3135a1247b6bbcfeb2
-  data.tar.gz: 356e751c7b8dc79f8dc609b586fb49d0c25bce82
+  metadata.gz: de0694551027289ed8fa1585ad6b6c623ec452ba
+  data.tar.gz: 126a11754c78559bf196baab8c64df3f4f893981
 SHA512:
-  metadata.gz: 6ccbb933bfa3271231bca47d52a3a9c8ce5b0a7dec25783dbda8a85938df88463929dd1e901262f3099057c12f32bc3b202a38379cf22a707a4dc38bf4af3e7d
-  data.tar.gz: 491c0d9fdf2d41518f8254e3e57f5b3757f33537bda9ebaa3bab3d7b40f1498a8fc9bae244d1c24c1854480f3100b8c8ea0aa8d6b846956d507ec159017e3fb5
+  metadata.gz: 583cc6f8a779814a1388b734439b799342661490abd92472de500b9e1154eb11553ff71996640f106be09f73e4051ba6789b6469344d1a93a6676d6e460c33e0
+  data.tar.gz: 74f5895b91a83eecfbda1e3b0da57c3fca2a76fe67e135c32d3175c01504aeca370432f3b1508c072d6eacbebed4a05f2e41c64d34e8ac619e412fdfb5ebd184

data/lib/graphvizml.rb

@@ -14,34 +14,24 @@ class GraphVizML
 
   def initialize(obj)
     
-    @doc = if obj.is_a? String then
+    xml = if obj.is_a? String then
             
-      Domle.new(File.read @filename=obj)
+      File.read filename=obj
       
-    elsif obj.is_a? Domle
+    elsif obj.is_a? Rexle or obj.is_a? Rexle::Element
       
-      @filename = 'gvml.xml'
-      obj
+      obj.xml
 
-    end
+    end    
     
-    h = @doc.root.attributes
-
-    @type = (h.has_key?(:type) ? h[:type].to_sym : :digraph)    
+    doc = Domle.new(xml)    
 
-    h[:type] = @type.to_s
-    h[:rankdir] = h.has_key?(:direction) ? h[:direction].to_s.upcase : 'LR'
-    
-    %i(recordx_type format_mask schema direction).each do |x| 
-      h.delete x; h.delete x.to_s
+    # 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
-    
-    # remove any entries with an empty value
-    h.each {|key, value| h.delete key if value.empty?}
-    
-    @g = Graphviz::Graph.new h
-    
-    build()
 
   end
   
@@ -71,42 +61,19 @@ class GraphVizML
   
   private
   
-  def build
+  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'
+    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|
       
-      node = if e.name == 'a' then
-                      
-        url = e.attributes[:href]
-        child = e.element 'node'
-        child.attributes[:url] = url
-        
-        child
-      else
-        e
-      end
-      
-      h = node.attributes
-
-      id = h[:gid]
-      label = node.text('label')
-      
-      # shape options:  box, ellipse, record, diamond, circle, polygon, point
-      
-      style = {}
-      style[:shape] = h[:shape] || 'box'
-      style[:URL] = h[:url] if h[:url]
-      
-      #puts "adding node id: %s label: %s" % [id, label]
-      
-      # the nil is replaced by the Graphviz node object 
-      r.merge(id => [label, node.style.merge(style), nil]) 
+      r.merge fetch_node(e)
 
     end
 
@@ -114,7 +81,7 @@ class GraphVizML
     # 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])
+    nodes[id_1][-1] = g.add_node(nodes[id_1][0])
 
     e_edges.root.xpath('records/edge').each do |edge|
 
@@ -131,14 +98,112 @@ class GraphVizML
       
     end         
      
+    format_attributes nodes
+
+    return g
+  end
+  
+  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|
+      
+      r.merge fetch_node(e)
+
+    end    
+    
+    # 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|                
+        
+        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) }    
+              
+      end
+    end    
+    
+    format_attributes nodes    
+    
+    g
+    
+  end
+  
+  def fetch_node(e)
+    
+    node = if e.name == 'a' then
+                    
+      url = e.attributes[:href]
+      child = e.element 'node'
+      child.attributes[:url] = url
+      
+      child
+    else
+      e
+    end
+    
+    h = node.attributes
+
+    id = h[:gid] || node.object_id
+    label = node.text('label')
+    
+    # shape options:  box, ellipse, record, diamond, circle, polygon, point
+    
+    style = {}
+    style[:shape] = h[:shape] || 'box'
+    style[:URL] = h[:url] if h[:url]
+    
+    #puts "adding node id: %s label: %s" % [id, label]
+    
+    # the nil is replaced by the Graphviz node object 
+    {id => [label, node.style.merge(style), nil]}
+    
+  end
+  
+  def format_attributes(nodes)
+    
     nodes.each do |id, x|
       
       _, attributes, obj = x
       attributes.each {|key, val| obj.attributes[key] = m(val) }
                                                       
-    end      
+    end    
+
+  end
+  
+  def format_summary_attributes(h)
+    
+    type = (h.has_key?(:type) ? h[:type].to_sym : :digraph)    
 
-    :build
+    h[:type] = type.to_s
+    h[:rankdir] = h.has_key?(:direction) ? h[:direction].to_s.upcase : 'LR'
+    
+    %i(recordx_type format_mask schema direction).each do |x| 
+      h.delete x; h.delete x.to_s
+    end
+    
+    # remove any entries with an empty value
+    h.each {|key, value| h.delete key if value.empty?}    
+    
+    h
   end
   
   # modify the value if it matches the following criteria

metadata

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