graphvizml 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70367b15cd9ecda5a2010ca241fdd7e5ff80c3356df9ab7b599c8a4e0a812fc7
-  data.tar.gz: 8fc13a6a0f08d6786a12327ed39fdb0735d5ff7b7f43359eefd05b6771ca43b4
+  metadata.gz: 1177c0f368688b11b03baf3bc48c47663cba20382bbae91664cd04802b4ee84a
+  data.tar.gz: 8de0bc97739fa89072392f39ef8535b2348c6e0840313b00f44f2731f128be25
 SHA512:
-  metadata.gz: 75ba5f6d83152d16c870101bb3157cb5fcd6aa651586992d84f19a34631ce67a5d88601bb9682b5bd3e5881f2374098d59ab400d484bc8bfbb3e39f4470561a4
-  data.tar.gz: 661c553f24df368c9c8855d9bb98c39dba70d5bf35eba744ca349647847754691a339bbb46457689cd36b080387b3a19e9e0a2de401002ea0ddd4cddfe5b70f5
+  metadata.gz: e527204ac7a3ac49e0bc48310716fb9985952caa389bb29eb52d0d338fadf33f58c1797d838f0a1c973467c228fc5b242546babb5950adb8338a22ea04ec694c
+  data.tar.gz: 44dd8c179e7d8bc20be227db17b302575258ef076862e51a80de1782f73ff9293f693b810308271359d30ec591d836866d58384acfb36e5b289c6896e03eb7b2

data/lib/graphvizml.rb

@@ -19,7 +19,7 @@ hkey_gems
       require graphvizml
       class GraphVizML
       media_type svg
-'      
+'
   end
 end
 
@@ -30,31 +30,42 @@ class GraphVizML
   attr_reader :g
 
   def initialize(obj=nil, debug: false, fill: 'transparent', stroke: '#000', text_color: '#000')
-    
+
     @debug = debug
     @fill, @stroke, @text_color = fill, stroke, text_color
-    
+
     if obj then
-      
-      s = RXFHelper.read(obj).first
-      
-      if s =~ /<\?graphvizml\b/ then
-        
-        import_string s        
-        
+
+
+      xml = if obj.is_a? Rexle or obj.is_a? Rexle::Element
+
+        obj.xml
+
       else
-      
-        if @debug then
-          #File.write '/tmp/graphviz.xml', xml
-          puts('graphvizml xml: ' + s.inspect) 
+
+        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
+
+          s
+
         end
-        
-        @g = build_from_nodes Domle.new(s)
-      
+
       end
-      
+
+      @g = build_from_nodes Domle.new(xml)
+
     end
-    
+
     @css = "
       .node ellipse {stroke: #{stroke}; fill: #{fill}}
       .node text {fill: #{text_color}}
@@ -63,78 +74,85 @@ class GraphVizML
     "
 
   end
-  
+
   def import(obj)
-    
+
     s = RXFHelper.read(obj).first
-    import_string s
-    
+    xml = import_string s
+    puts('graphvizml/import xml: ' + xml.inspect).debug if @debug
+    @g = build_from_nodes Domle.new(xml)
+    self
+
   end
 
-  
+
   def to_dot()
+
     @g.to_dot
+
   end
 
-  
+
   # returns an SVG blob
   #
   def to_svg()
     f = Tempfile.new('graphvizml')
-    Graphviz::output(@g, format: 'svg', path: f.path)
+    #jr 26-01-2022 Graphviz::output(@g, format: 'svg', path: f.path)
+    Graphviz.output(@g, path: f.path, format: 'svg')
     s = File.read f.path
-    s.sub!('xmlns:xlink="http://www.w3.org/1999/xlink"','')
-    s.lines.insert(8, css_code()).join    
+    #s.sub!('xmlns:xlink="http://www.w3.org/1999/xlink"','')
+    #s.sub!('xlink:','') # not yet implemented because of a local namespace issue
+    s.lines.insert(8, css_code()).join
   end
 
-  
+
   private
-  
-  
+
+
   def build_from_nodes(doc)
 
     puts 'inside build_from_nodes'.info if @debug
 
-    g = Graphviz::Graph.new format_summary_attributes(doc.root.attributes) 
-    
-    # add the nodes    
+    g = Graphviz::Graph.new **format_summary_attributes(doc.root.attributes)
+
+    # add the nodes
 
     nodes = doc.root.xpath('//node').inject({}) do |r,e|
-      
+
       r.merge fetch_node(e)
 
     end
-    
+
     if @debug then
-      puts 'nodes: ' + nodes.inspect 
+      puts 'nodes: ' + nodes.inspect
       puts 'doc: ' + doc.root.xml.inspect
     end
 
     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)
 
-      h = raw_styles.strip.split(/;/).inject({}) do |r, x| 
+      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
-    
+
     puts ' a: ' + a.inspect if @debug
-    
+
 
     edge_style = a.any? ? a.find {|x| x[0].grep(/edge/).any?}.last : []
 
-    
-    
-    # add the edges    
+
+
+    # add the edges
 
     id_1 = nodes.first[0]
-    nodes[id_1][-1] = g.add_node(nodes[id_1][0])    
+    nodes[id_1][-1] = g.add_node(nodes[id_1][0])
 
 
     doc.root.each_recursive do |node|
@@ -142,7 +160,7 @@ class GraphVizML
       next unless node.name == 'node'
 
       node.xpath('a/node | node').each do |child|
-        
+
         id1, id2 = node.object_id, child.object_id
 
         label = child.attributes[:connection].to_s
@@ -153,130 +171,127 @@ class GraphVizML
 
         conn = nodes[id1][-1].connections.last
         conn.attributes[:label] = label
-        
-        edge_style.each {|key,val| conn.attributes[key] = m(val) }    
-              
+
+        edge_style.each {|key,val| conn.attributes[key] = m(val) }
+
       end
-    end    
-    
-    format_attributes nodes    
-    
+    end
+
+    format_attributes nodes
+
     g
-    
+
   end
-  
+
   def css_code()
-<<EOF    
+<<EOF
 	<defs>
 		<style type='text/css'><![CDATA[
       #{@css}
 		]]></style>
-	</defs>    
-	
+	</defs>
+
 EOF
-  end  
-  
+  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
-                    
+
       url = node.parent.attributes[:href]
       h[:url] = url if url
-      
-    end    
+
+    end
 
     id = h[:gid] || node.object_id
     label = node.text('label')
-    
+
     # shape options:  box, ellipse, record, diamond, circle, polygon, point
-    
+
     style = {}
 
     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]
-    
-    # the nil is replaced by the Graphviz node object 
+
+    # 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
       next unless obj
       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)    
+
+    type = (h.has_key?(:type) ? h[:type].to_sym : :digraph)
 
     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| 
+
+    %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.each {|key, value| h.delete key if value.empty?}
+
     h
   end
-  
-  
-  def import_string(obj)
-    
-    s = RXFHelper.read(obj).first
-    
-    s2 = s.slice(/<\?graphvizml\b[^>]*\?>/)
+
+
+  def import_string(s)
+
+
+    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
+
+    xml = LineTree.new(s, root: 'nodes', debug: @debug).to_xml
+
   end
-  
+
   # modify the value if it matches the following criteria
   #
   def m(s)
-    
+
     # is it a shorthand hexcode? e.g. #fff
     s.gsub(/^#([\da-f]{3})$/)\
         { '#' + ($1).chars.inject([]) {|r,x| r << x + x}.join}
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphvizml
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   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
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMTI2MTk0ODM4WhcN
+  MjMwMTI2MTk0ODM4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDXvh01
+  vamU8KghEdMGyDHKZFFvDe0WS24O2Z9+aqxDnwBFqhYc7OrPtNltbBcOWSPU8sZ2
+  WnMohFCcyEFvbX0krCmHQuKp3EDtgV2jkwRRM4ZTdMPsxbl0ewt4OBGWBgRqpPva
+  QQj4nY+70eS2p4Z9NxtKJkjrTaScItrYC8So439THliv6fE/X1wmVthA87QRoLLv
+  Nn0ExY9cUkCRhpQ+BKgysDiShBkVeVMD5krTToeF375dhQjYumB6pfRcR3FwZtwA
+  21uslDaVbd2QQ+jvQ7UdvtkAYEtxdQd2sgXlVArLoQq8c7yYZY7OuQtXj71YMJBs
+  SyEW5mN3jNpkA34I8K6oxSCtktOpplNVN+qnqEDl0zn1x+ltC99Fw61iwZ0TUuNZ
+  iMT7KIkYzaxf2cI9KkPuy8QRBf8h+d1zhNj738isW9DncA8rVlRNbQAnj6zrkUPQ
+  3or24nFsBjLhxG55VtrgG0tYmMdtD4YYZc+AcgjS7PxMLp0xLPMduwq4ftUCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUITb4eCGd
+  35h+35s7ViJVcpR86bYwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   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
+  BgkqhkiG9w0BAQsFAAOCAYEACtwXE0bRRrEC5NqayvsRvVTLJYs1mHMWBfsPXBFZ
+  auEcRhToEKNQfW1eQxYMyaMiLVphzoPTAKgM36SrCd6fbSS40djlX8tXlr9N7EIC
+  8cV4BiDWNTyNItJgsZpDSXvWmorO0sxFdS3bX+wGpIqjTucov3xCL29oipOTed78
+  CiGPYDYX2ddYBPv4DCnKRlmpbQPSEAv+Vr4MIXK2DIz/pNKhVkO60CkhQLfbmuIt
+  tHEHxLaJBrdFImPRVRDbCA7h+a5QyotAldi99hPBCdxS5CyAaFQkn5ScfyBbGOla
+  88GxnM8dyYQwA7jGKJzEVP4Oe2tIlC66Cuvt9aFJY5ILYAvn8yaL9Zz/jfvK/txT
+  g5jRbEphIM24ZKx4Ujg457ks1jQG6qQxzJOQk1dDKsKzY+75/npWJbZFPCdpEX1l
+  n5la83UsDTB94LHIHb/W8YdApT3vWP/4nxl+/aAPJPBgyN8mZ4Td0FFgbaPGbW4e
+  PxZXxv6QqQ7uOHhRsvNRkYj3
   -----END CERTIFICATE-----
-date: 2019-06-09 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: domle
@@ -43,62 +43,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.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: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: line-tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.3
   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'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.3
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -116,14 +116,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Generates an SVG file from GraphViz using a GraphViz Markup Language file