graphvizml 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba6679dbfb36498af73546767fd8e751ef774af
-  data.tar.gz: cda9fbc78586c332282eb3d5cb8e70b1d9f4eea7
+  metadata.gz: b4bdf526de42c11fc8ce95cae6fb00ab33da0060
+  data.tar.gz: 95bbde7cc050c1505f6da0d1d88a115f4e12b587
 SHA512:
-  metadata.gz: ad0c4b1354f05d0bae6a8da70ea9eb3596a7671244621e2d627963c8f7213d3617e0e27745d3dfafb8e71e21d8d82b7affb087132a14d79762430ff29ae2e93c
-  data.tar.gz: acab68d1a61b4b941d687172cb55a640823d0a05f1ccdb64bfde001c096c190c53ed3ecc48be3254013c887c0d314366e2f470844d7520b4871ebd5c50b0c1e4
+  metadata.gz: 660a430841c9c74ee2a96c5d0c710368339fab5af3233337d8777040ce852eaec9addccae47558a0ad253f9563a175c625e4a73f54c92608eacb93cc30d373a8
+  data.tar.gz: 7446bdea1e72372999a5011fc3197ee8347689cb561953b06d105a2265316528b594b79c32b8723bc10f840dc071cce302369237d8271884fffca0d343a3899a

data/lib/graphvizml.rb

@@ -3,7 +3,7 @@
 # file: graphvizml.rb
 
 
-require 'rexle'
+require 'domle'
 require 'graphviz'
 
 
@@ -15,7 +15,7 @@ class GraphVizML
     
     @doc = if obj.is_a? String then
             
-      Rexle.new(File.read @filename=obj)
+      Domle.new(File.read @filename=obj)
       
     elsif obj.is_a? Rexle
       
@@ -80,7 +80,8 @@ class GraphVizML
       # shape options:  box, ellipse, record, diamond, circle, polygon, point
       shape = h.has_key?(:shape) ? h[:shape] : :box
       #puts "adding node id: %s label: %s" % [id, label]
-      r.merge(id => [label, {shape: shape}, nil])
+      r.merge(id => [label, node.style.merge({shape: shape}), nil])
+
     end
 
     
@@ -89,7 +90,6 @@ class GraphVizML
     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)
@@ -97,80 +97,21 @@ class GraphVizML
       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])
-      nodes[id1][-1].connections.last.attributes[:label] = label
-    end 
-    
-    
-    # add the styling once the objects have been created
-    
-    style = @doc.root.element('style')
-    
-    stylesheet = style ? style.text : default_stylesheet()
-    
-    
-    # parse the stylesheet
-
-    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'}    
-    
+      attributes = edge.style.merge({label: label})
+      conn = nodes[id1][-1].connections.last
+      conn.attributes[:label] = label
+      edge.style.each {|key,val| conn.attributes[key] = val }
+      
+    end         
+     
     nodes.each do |id, x|
       
       _, attributes, obj = x
-      attributes.each {|key, value| obj.attributes[key] = value }
-      node_style.last.each {|key, value| obj.attributes[key] = value } if node_style       
+      attributes.each {|key, value| obj.attributes[key] = value }    
                                                       
     end      
-    
-    edge_style = a.detect {|x| x.assoc 'edge'}
-    
-    nodes.each do |id,x|      
-      x.last.connections.each do |conn|
-        edge_style.last.each {|key, value| conn.attributes[key] = value } if edge_style
-      end
-    end      
-    
+
     :build
   end
   
-  private
-  
-  def default_stylesheet()
-
-<<STYLE
-  node { 
-    color: #ddaa66; 
-    fillcolor: #ffeeee;
-    fontcolor: #113377; 
-    fontname: Trebuchet MS; 
-    fontsize: 9; 
-    margin: 0.1;
-    penwidth: 1.3; 
-    shape: box; 
-    style: filled;
-  }
-
-  edge {
-    arrowsize: 0.9;
-    color: #999999; 
-    fontcolor: #444444; 
-    fontname: Verdana; 
-    fontsize: 9; 
-    #{@type == :digraph ? 'dir: forward;' : ''}
-    weight: 1;
-  }    
-  
-STYLE
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphvizml
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -34,25 +34,25 @@ cert_chain:
 date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rexle
+  name: domle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.7
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.7
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: graphviz
   requirement: !ruby/object:Gem::Requirement