pxgraphviz 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5567498ebd46ecaf176741b68bc9dd42199d9ac33bae825518f85934f893d33
-  data.tar.gz: c1ffe2da02b87e4700734520858133931311533a075036ff1d0ab354a144a80c
+  metadata.gz: 8ec769baa44cc90b7da7bb62a0856f87da40246ffaa5096051e58eed34d783b1
+  data.tar.gz: d471f35e76cc4993a38405c5dba1e162401402811661a8b71148c41f746e2760
 SHA512:
-  metadata.gz: da79778a85611f9151eed784f10c0a6e4df50aa7d3727814d5a174573e63d11cfa8ad8327d31cbeacf5ba96239b68e004cb97ea6c93391a1025132144106746e
-  data.tar.gz: 329ff7530bbb92da72f41a52395a7d7875564f8200538ad19fd06b9195df6388a0df256cf03d67bb3aaa4467c007da76bf35ac26ed21dba711a921d502d4fe04
+  metadata.gz: 807f06da5f13d2194f8a0c75444c62ac59bc06990956282a71d075e1c70df86cc8c83a2daf21531757a1e137ed2f2edfea269a61f43fd1823f1d526d4b33321e
+  data.tar.gz: dea35e397915adc20147b7884b649b01563d616884e9a8f06856f93074071cb646ff42357bf8f391237c58f1f2c3e57acffe5acc34b8ab9bc32629778f63d6b5

data/lib/pxgraphviz.rb

@@ -5,6 +5,7 @@
 
 require 'polyrex'
 require 'graphvizml'
+require 'rxfreader'
 
 
 module RegGem
@@ -17,7 +18,7 @@ hkey_gems
       require pxgraphviz
       class PxGraphViz
       media_type svg
-'      
+'
   end
 end
 
@@ -27,65 +28,65 @@ class PxGraphViz < GraphVizML
 
   attr_reader :doc, :px
 
-  def initialize(obj=nil, style: nil, debug: false, fill: '#778833', 
+  def initialize(obj=nil, style: nil, debug: false, fill: '#778833',
                  stroke: '#999999', text_color: '#ffeecc')
 
     if obj then
 
-      s = RXFHelper.read(obj).first
+      s = RXFReader.read(obj).first
       @doc = import_string(s)
 
       puts 'pxgraphviz: before super'.info if debug
 
-      super(@doc, debug: debug, fill: fill, 
+      super(@doc, debug: debug, fill: fill,
                   stroke: stroke, text_color: text_color)
-      
+
     end
-    
+
     @css = "
       .node polygon {stroke: #{stroke}; fill: #{fill}}
       .node text {fill: #{text_color}}
       .edge path {stroke: #{stroke}}
       .edge polygon {stroke: #{stroke}; fill: #{stroke}}
     "
-    
+
   end
 
   def import(s)
-    s2 = RXFHelper.read(s).first
+    s2 = RXFReader.read(s).first
     @doc = import_string s2
     @g = build_from_nodes Domle.new(@doc.root.xml)
     self
-  end  
-    
-  
+  end
+
+
   protected
-  
+
   def default_stylesheet()
 
 <<STYLE
-  node { 
-    color: #ddaa66; 
+  node {
+    color: #ddaa66;
     fillcolor: #{@fill};
-    fontcolor: #{@text_color}; 
+    fontcolor: #{@text_color};
     fontname: 'Trebuchet MS';
-    fontsize: 8; 
+    fontsize: 8;
     margin: 0.0;
-    penwidth: 1; 
+    penwidth: 1;
     style: filled;
-    shape: #{@shape}; 
+    shape: #{@shape};
   }
-  
+
   a node {
-    color: #0011ee;   
+    color: #0011ee;
   }
 
   edge {
     arrowsize: 0.5;
-    color: #{@stroke}; 
-    fontcolor: #444444; 
-    fontname: Verdana; 
-    fontsize: 8; 
+    color: #{@stroke};
+    fontcolor: #444444;
+    fontname: Verdana;
+    fontsize: 8;
     #{@type}
     weight: 1;
   }
@@ -93,65 +94,65 @@ STYLE
 
   end
 
-  
+
   private
-  
+
   def import_string(s)
 
     @px = if s =~ /<\?pxgraphviz\b/ then
-      
+
 header = "<?polyrex schema='items[type, shape]/item[label, connection]' delimiter =' # '?>
 type: digraph
-shape: box    
+shape: box
 "
       s2 = s.slice!(/<\?pxgraphviz\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 
+      "
+
+      end
       s3 = header + s
       puts 's3: ' + s3.inspect if @debug
       Polyrex.new.import(s3)
-      
+
     else
-      
+
       Polyrex.new(s)
-      
-    end    
+
+    end
 
     @type = @px.summary[:type] == 'digraph' ? 'dir: forward;' : 'dir: none;'
     @shape = @px.summary[:shape] || 'ellipse;'
-    
+
     @style ||= default_stylesheet()
     doc = Rexslt.new(xslt_stylesheet(), @px.to_xml)\
         .to_doc.root.element('nodes')
-    
+
     doc.root.elements.first.insert_before Rexle::Element.new('style')\
         .add_text @style
-    
+
     doc
-    
+
   end
-  
+
   def xslt_stylesheet()
-    
-<<XSLT    
+
+<<XSLT
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 <xsl:output method="xml" indent="yes" />
@@ -185,12 +186,12 @@ shape: box
         <xsl:element name="a">
           <xsl:attribute name="href">
             <xsl:value-of select="summary/url"/>
-          </xsl:attribute>   
+          </xsl:attribute>
           <xsl:call-template name='node'/>
         </xsl:element>
 
       </xsl:when>
-      <xsl:otherwise> 
+      <xsl:otherwise>
 
         <xsl:call-template name='node'/>
 
@@ -207,33 +208,33 @@ shape: box
 
   <xsl:template name='node'>
      <xsl:element name="node">
-    
+
       <xsl:attribute name="shape">
         <xsl:value-of select="summary/shape"/>
       </xsl:attribute>
-      
+
       <xsl:if test="summary/id">
         <xsl:attribute name="id">
           <xsl:value-of select="summary/id"/>
         </xsl:attribute>
       </xsl:if>
-    
+
       <xsl:if test="summary/class">
         <xsl:attribute name="class">
           <xsl:value-of select="summary/class"/>
         </xsl:attribute>
       </xsl:if>
-      
+
       <xsl:if test="summary/connection">
         <xsl:attribute name="connection">
           <xsl:value-of select="summary/connection"/>
         </xsl:attribute>
-      </xsl:if>    
-    
+      </xsl:if>
+
       <xsl:apply-templates select='summary'/>
       <xsl:apply-templates select='records'/>
 
-    </xsl:element>  
+    </xsl:element>
   </xsl:template>
 
 </xsl:stylesheet>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pxgraphviz
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwNjA5MjEzOTE3WhcN
-  MjAwNjA4MjEzOTE3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC4WgMZ
-  e8riZEJtUZOk0m7zdNgVdI9tUhwz0TvyIMcXy+CXdyLhBXlotsqBYluCKuPDv+Ev
-  XEgzTpT9GxUY/k3W4BCGlV/+/GAnnMmYbNnWwQDXO3au3TxLzRo9QtAamr2LlcXf
-  r6SyQU2HOF5uzgxpmIuj/Fva2qQKkX373pcOOIeaWR2Xv4QMYrTKikhFRxS6TLJo
-  3p4x5xadq85ixScBJPs1SAUgCq0T9mLtTTiEBfArqKhKOSs8scIK7CTLqQz64I8X
-  IXPtntGQJoUpp0aMaPdkcQxXI4Vx9piyWQOKSPhn53u1H4QtY4fzvb0+jPNAxq/K
-  4OYFrdlxEPe/NiXCSgjw1af0Ht382BqCwdhrzV2vhYefg9u3wUyZp8auFhY55k3+
-  005EYJOTG/bfspWw+nR/RCWLcYjEts0l7+O++8yWJGgsk4TyW/LbjOcEv/mGDGP/
-  p2Ai+wcfXwZ7h5Eoh7/6TmWHmHT2OnN1of+ZB9Bi/1yvady+yGzB3DDgRJkCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUM7kVhjOH
-  qwZ0y7UF/yN+MI4r5ggwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjIzMTkzNDE0WhcN
+  MjMwMjIzMTkzNDE0WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDEi+Tj
+  UQzuglQ5q17fcvr1ji+Q1A5yGy6EApo8waXyaSYiV9eESUDVh4C61pUw4+GC8lD7
+  mz5zFS3UGyQOvoZIoANTFx7WRH3dxpggbxQ9UMgdy+GTYSfBvgEuduTt5hthPNjx
+  fv/McRCCrk7NJjEYhlPDm8gA9hoBd+9J+nBRwLJ7Mt2nxrsXxnf08e6Wa8e0ZoYk
+  jNr0T/Ido8gANCrEXmNcT2Bu8erT5b/4A5ktykt+cVZ8UAqtLr2kbal47QtRMVXk
+  QdK/sw9Bny2bFhsdJQi7KYuU//IkRaH1zyX61rARrzQ7pUh7nsT5/C/bPmdeOUTl
+  wTECwAlN817+XNcPDgxr562yG4Euzj/6FVTkCuMWS7V7sZC/UJE0Xbg0jU+0iKWo
+  2XoE6+SAIBpClO+kmF7zEk3jdoOKKp8XRjJOtRAr3aFeepT+Qms3XzWOo2w0fy4+
+  bVFVRevXtCLOlpp/oFAWzZwrqtruaKuafZadRAILMNRYF4FM8/+h2KNRLZcCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUfbcEKTs8
+  lLE1Q8D2XGO9I+5MgOMwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEATTooi3YSpusmxMfRXBKu935fdFhsX2/e81ckvIQh
-  8fmcNRd9mE7nfts1ipjmt7UkPVRUhD5Ag+Bbd7HSbA+pmbLsFzsq3T+hDcO82KfA
-  RRVGzcBi5LI5yjGYa5yTAf1z9VnNZ+OffVQce3/usuXEN8WWwSu+qiJkz1/tYjuH
-  VHnWd2ev/sdQK+S2x/icqXIPubabC9f1V9yLcZXkAC7TOaxc3/nAiGhDGDoY+PVH
-  KShAlMz8gPqci5EwWK6yy+tOSv2e8xpipTPEZ1JyR4FiAz5AOrJzn7Z2idELpcY5
-  OifmF8AO85wYwTUAW0O04ihDElZHR9uao79oiUNUY1Tdl/tXbrMI1l0dteQZdyNR
-  aQIB0TXpdRb2V63OwA7958Xd2I5M/9SwsHLV6vInmmSRrtf05mxmKSZqF9gkSUNh
-  UsYtvIztjMa8JTBJoeeVZQth+cfIFVp37noogboz8XiH8Q7j6kei39fxssRfOn8Z
-  LQb4grw+PYKG3ZWURYEkALEW
+  BgkqhkiG9w0BAQsFAAOCAYEAg9lEWHF3avcbK4ktmHyDJl71m7SvG6QqPGbC5aYT
+  pI3+A9AIIUI9BlF0P4V/mSt9c9YccOjs1oT5qLIvhCpMJtDDy2w+tbzVG9ia1S0t
+  /1EZqbiAKGuMwaLI9P94ku3SjqecHQlMsA+dSqiJpHOBjhPB3fePATtCHIgzwhjT
+  a1SV51/pDyiNhwsUBLhqEMqUBOKBcDnZDXFQ612khj8GLW0TlLd1DnhYjS5HBi57
+  A3HlI1ftQU4ywVtJVyY5++npvwg7N9CxRN02Q3It/OE9UcHVELYsjH8T1IO23U5g
+  LcE3a44K374xnOB2a5Rjvr3n9dmbPIJSUWXAGKtVAxJQaQkXJ/JgORkG3UyOwyxx
+  4+Iryd9KLXqoOlZie53pHP3baUn+NFWsOQTVWyhLDSvj4aG2fFZ4sYMOD8zJHrxl
+  Kw5MEmLLND9M4uj/YjCJaxgvkZ9u4iTBMNldKFS8X5Go7qOpzee47emfjxes++nS
+  6hgbEtPQ0Tr9VNd2zW1qmLkG
   -----END CERTIFICATE-----
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex
@@ -43,42 +43,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: graphvizml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.7.1
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Generates a GraphViz Markup Language file from a Polyrex document