graphvizml 0.5.8 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c518866f1ae8f45f7e48fb850ecae83c3ca7df99
-  data.tar.gz: 9ffb3522c4aee7d887dfe1734797a751056ca9ef
+SHA256:
+  metadata.gz: 2ff0cd920435956aaf72422a17a849f326726c37cc63b2f7f87cc6fb3de6c697
+  data.tar.gz: 6df521883b1b22c4c78dc9b89487139c281e5fc61daf09b9e4e3092f24ddef9f
 SHA512:
-  metadata.gz: '039b03b9fb2d33c7bdd4f0e7664f73dde30b1f60ff77771669df918c9f95fbe27de0301b80dd483400cebac95b913a3f3612d59ed0ca00836821610cc4765821'
-  data.tar.gz: a43c19e842e379f69641fea9969fe3b0fa399f4435a7b0d32c02b9ac2460e376caa4569e2e1f28f1c17d59ed524df97dafa55b0a6a7d4fd2d7da6cda6fa030d1
+  metadata.gz: bfb61f402699fb0d36d1500a5c69c97902ba989a14e3a549f80d913e624ea099e3fd43d6ffd19f0d5e93adf00d511cc7c3403bc149b53ffea5ac275e8bd69715
+  data.tar.gz: c95c574367ad7eb83f56b62abd25b55070e3224bd2260f19643cedc95a9a4fc26781105ec79ec205b37c85b1538be2814aed72cc1ccb2d69521b5166131e5e6e

data/lib/graphvizml.rb

@@ -5,57 +5,92 @@
 
 require 'domle'
 require 'graphviz'
-require 'tempfile'
+require 'line-tree'
 
 
+module RegGem
+
+  def self.register()
+'
+hkey_gems
+  doctype
+    graphvizml
+      require graphvizml
+      class GraphVizML
+      media_type svg
+'      
+  end
+end
+
 class GraphVizML
+  using ColouredText
 
+  attr_accessor :css, :stroke, :fill, :text_color
   attr_reader :g
 
-  def initialize(obj)
+  def initialize(obj=nil, debug: false, fill: 'transparent', stroke: '#000', text_color: '#000')
     
-    xml = if obj.is_a? String then
-            
-      File.read filename=obj
+    @debug = debug
+    @fill, @stroke, @text_color = fill, stroke, text_color
+    
+    if obj then
       
-    elsif obj.is_a? Rexle or obj.is_a? Rexle::Element
+      s = RXFHelper.read(obj).first
+      
+      if s =~ /<\?graphvizml\b/ then
+        
+        import_string s        
+        
+      else
+      
+        if @debug then
+          #File.write '/tmp/graphviz.xml', xml
+          puts('graphvizml xml: ' + s.inspect) 
+        end
+        
+        @g = build_from_nodes Domle.new(s)
+      
+      end
       
-      obj.xml
-
     end
+    
+    @css = "
+      .node ellipse {stroke: #{stroke}; fill: #{fill}}
+      .node text {fill: #{text_color}}
+      .edge path {stroke: #{stroke}}
+      .edge polygon {stroke: #{stroke}; fill: #{stroke}}
+    "
 
-    @g = build_from_nodes Domle.new(xml)
-
   end
   
+  def import(obj)
+    
+    s = RXFHelper.read(obj).first
+    import_string s
+    
+  end
+
+  
   def to_dot()
     @g.to_dot
   end
 
-  # returns a PNG blob
-  #
-  def to_png()
-    f = Tempfile.new('graphvizml')
-    Graphviz::output(@g, output_format: 'png', path: f.path)
-    File.read f.path
-  end
   
   # returns an SVG blob
   #
   def to_svg()
-    f = Tempfile.new('graphvizml')
-    Graphviz::output(@g, format: 'svg', path: f.path)
-    File.read f.path
+    svg = Graphviz::output(@g, format: 'svg')
+    svg.sub!('xmlns:xlink="http://www.w3.org/1999/xlink"','')
+    svg.lines.insert(8, css_code()).join
   end
 
-  def write(filename)
-    Graphviz::output(@g, :path => filename)
-  end
   
   private
   
   
-  def build_from_nodes(doc)    
+  def build_from_nodes(doc)
+
+    puts 'inside build_from_nodes'.info if @debug
 
     g = Graphviz::Graph.new format_summary_attributes(doc.root.attributes) 
     
@@ -66,8 +101,15 @@ class GraphVizML
       r.merge fetch_node(e)
 
     end
+    
+    if @debug then
+      puts 'nodes: ' + nodes.inspect 
+      puts 'doc: ' + doc.root.xml.inspect
+    end
 
-    a = doc.root.element('style/text()').strip.split(/}/).map do |entry|
+    a = doc.root.element('style/text()').to_s.strip.split(/}/).map do |entry|
+      
+      puts 'entry: ' + entry.inspect if @debug
 
       raw_selector,raw_styles = entry.split(/{/,2)
 
@@ -79,7 +121,11 @@ class GraphVizML
       [raw_selector.split(/,\s*/).map(&:strip), h]
     end
     
-    edge_style = a.find {|x| x[0].grep(/edge/).any?}.last
+    puts ' a: ' + a.inspect if @debug
+    
+
+    edge_style = a.any? ? a.find {|x| x[0].grep(/edge/).any?}.last : []
+
     
     
     # add the edges    
@@ -92,13 +138,13 @@ class GraphVizML
 
       next unless node.name == 'node'
 
-      node.xpath('a | node').each do |childx|
+      node.xpath('a/node | node').each do |child|
         
-        child = childx.name == 'node' ? childx : childx.element('node')
         id1, id2 = node.object_id, child.object_id
 
         label = child.attributes[:connection].to_s
-
+        puts('nodes[id1]: ' + nodes[id1].inspect) if @debug
+        puts('nodes[id1].last: ' + nodes[id1].last.inspect) if @debug
         nodes[id2][-1] ||= nodes[id1].last.add_node(nodes[id2][0])
         attributes = child.style.merge({label: label})
 
@@ -116,9 +162,24 @@ class GraphVizML
     
   end
   
+  def css_code()
+<<EOF    
+	<defs>
+		<style type='text/css'><![CDATA[
+      #{@css}
+		]]></style>
+	</defs>    
+	
+EOF
+  end  
+  
   def fetch_node(node)
 
+    puts 'inside fetch_node'.info if @debug
+    
     h = node.attributes
+    #puts 'h: ' + h.inspect
+    puts('graphvizml/fetch_node h: ' + h.inspect) if @debug
     
     if node.parent.name == 'a' then
                     
@@ -134,7 +195,7 @@ class GraphVizML
     
     style = {}
 
-    style[:shape] = h[:shape] unless h[:shape].empty?
+    style[:shape] = h[:shape] if h[:shape] and !h[:shape].empty?
     style[:URL] = h[:url] if h[:url]
 
     #puts "adding node id: %s label: %s" % [id, label]
@@ -173,6 +234,39 @@ class GraphVizML
     h
   end
   
+  
+  def import_string(obj)
+    
+    s = RXFHelper.read(obj).first
+    
+    s2 = s.slice(/<\?graphvizml\b[^>]*\?>/)
+
+    if s2 then
+      
+      attributes = %w(id fill stroke text_color).inject({}) do |r, keyword|
+        found = s2[/(?<=#{keyword}=['"])[^'"]+/]
+        found ? r.merge(keyword.to_sym => found) : r
+      end
+      
+    fill, stroke, text_color = %i(fill stroke text_color).map do |x|
+      attributes[x] ? attributes[x] : method(x).call
+    end
+    
+    @css = "
+      .node ellipse {stroke: #{stroke}; fill: #{fill}}
+      .node text {fill: #{text_color}}
+      .edge path {stroke: #{stroke}}
+      .edge polygon {stroke: #{stroke}; fill: #{stroke}}
+    "      
+      
+    end 
+    
+    xml = LineTree.new(s, root: 'nodes', debug: true).to_xml
+    @g = build_from_nodes Domle.new(xml)
+    self
+    
+  end
+  
   # modify the value if it matches the following criteria
   #
   def m(s)
@@ -182,4 +276,4 @@ class GraphVizML
         { '#' + ($1).chars.inject([]) {|r,x| r << x + x}.join}
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphvizml
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MDEwNjEzMjA1MloXDTE4MDEwNjEzMjA1MlowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAOTZDlwcF3nlkpgerB73R+FnQaD/dbGeRqYOfBmeTaPuzHOE2ZqqrojvEIlH
-  JhmEs3RP3/nIGjlmUrf6QvCnvGAgPgxnoCWw48LHcwLGefk8+M4SUOvox4T4N7gy
-  RQpITK88ZyDwt5mzYaLHwT4pX+LjexWBTjOI1xNhh9aiBgcuq7E32a8xgULMZk+e
-  Jy1cYkgf0xDyf70t0bCuxtycDXaZFE2nC1P7oQS5lyYWzltiGigltTmtoBSoblNB
-  tKym6PIq+Dy81m//jKffGOkd+oe5U/VNFYCaM4mXJis4VhxrR/rbcrFN75FY32wZ
-  Sgarov2CBapH8K6b4FZOJZT0aXECAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUULJuuHOowirVpIUB5xhE27wdZuUwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAJMxkm1N7
-  rWL1wFFb9c3Nw9JVsIENcQqCWiV2vv2aC4vuZtXVtz3v0AdF2LHGAWMqwoZPN3yU
-  kfn6c32DGznzhE800jEUfJNlHO8X8Zv2PGxrlEzbl/tlp4QdZf+I2OVSh7DHowDW
-  G4A0cIY16r9z6bsfKXrp+jxjYBjaeYzOLfY/RrU3TviJZubOd1ZP1y+2dO8SfRFB
-  HhE9S4gvHzmSNpDd/9m1HACkvLH5fAd3Cgyp3mMTKiL5p5OlrSF5O3Pc4jRGl+Rx
-  0fBBWVqwHyWs77T9gCuDZmQrw2NmfyhNWhBw0iljBXo7WLDNB3x0nP6mYTzk47O8
-  sL5FGYJNgQqFlw==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwNjA5MTczOTQxWhcN
+  MjAwNjA4MTczOTQxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDYTr9/
+  0s/6N5/dRrEOhJYBRMqcrGr3VC058Pfvii4xqLgy+AHTOxZLEIV5DY5JWICEQGKO
+  rQUS7iN49f0odEW/7JciVo5yAotUaCVgL/ipjoTt7ti29coGx//9GvGKnEyEAbVu
+  3RS7SNDy+zE2MPrGA2d3o2fZ2nl/F8DAQ2zFvmLpa2dQ1mlvO6w/az5Zj/Cqq2Jj
+  5x5kVZjNvkt5x7fT0vcZDKuK97ALkiJ/a1iHRxi9fYFBbT3scMvWEzPE55/1mSGJ
+  tPQF8bt/8krtSQsFqKfEWPaU8CiRT5m3s7CVwMZtAo/Ydo7UyMJ0ZEuviCLvzErS
+  cyVD6OYF8mQd6gxNnAeHln9SEqDd9A/EOzdm1VYTW5+bicFYApwu34XlJvuqhv/0
+  NJp6B5qIHnvBzdwjJdx0WuE+p+Rx1AwbwofKxvJogWZ6S9Eh12iV0ZCGob7akga2
+  2+tG/ovV3u4VFt4ilJiz4naMmbjkANK8Vag6W/fbhSEJZskle1u9O+aAhOsCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU+TngFs1c
+  eTNQu3YSWDnCD642HKcwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAD4OApBYA1uDuqNm0gUyt1Tp1HHyXahpjWMoRx73f
+  bSGIMkJUBI3JLYuRGb8OGqXhWos4oDhUIGh237BGAmMvQRKXXhMPkzdJSDv8kWKe
+  aEWXdwAmIT3Kv5YTvOBeT3/e7c11lt2TvfWCz4XiZvvVxIExywsF1WCFQnV64lbT
+  qa0T9M7swO+0CPatb6qURPG0TNrDma8lw9XzE/PqoNvglLlLIY3SAAMYBq+lPPye
+  B4b6xjDDOi30/KL/+9fZqo8dDKvlFmRaNDPNJdNcqAYBtbmjM+hmDEeQjaGkwgMV
+  8YIyDVvnkB4yrWKOi2zOfslrM65FCFM8AkQzqx0dLknxzxW4lu4Fpqthnt6yHcfQ
+  IvQKd3YPQuRkcQuotfpJ2QU+ISEi1sw2Zcn7RARz+17XPkQZPnxknSLEJQtA+UT3
+  /8tqxCi/5ePYzYvc/FsI9Y1IJRY3sAZ8QYkhQ1+eHM4Q6WnPySjokqiHaKUI3rHR
+  7J+rmK2Wu7bYff3C/pg+xkkg
   -----END CERTIFICATE-----
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2019-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: domle
@@ -39,40 +43,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: line-tree
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -99,10 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
-summary: Generates an SVG file or PNG file from GraphViz using a GraphViz Markup Language
-  file
+summary: Generates an SVG file from GraphViz using a GraphViz Markup Language file
 test_files: []