pxgraphviz 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f684ae44e0d1395363d736a75afb4249da5fa1c0
-  data.tar.gz: 752c2037b77c545f70c63ad54041a72acbe0f1b8
+  metadata.gz: 880353e7984a79808755412706cc87e6fb87a27c
+  data.tar.gz: 97cfb0196e9f0aabe27383b19d9998e363a720f3
 SHA512:
-  metadata.gz: dce7169b4b8bfae5e31879698a911d6eb14d017a6257597ae51dbddae17f8df3820a39c4176f76a65b114c1ffcc2645c1248178434d7e577058113d6eb41a9a0
-  data.tar.gz: a899de93bb538df6b7c9add8c7edd5e8d072cf84677dc1319b1937779be92efecb0b09cee81ae5543782fb69f4db8a0274a801edd0b544a8b3cc61b2a5cc0d29
+  metadata.gz: 03e8c8d3bd24a12878fd37f096009c1f2468888bf82aed7c6a5bc0d0a93d7b2058dd666a245a8c167a058c8d20276cbe7d0df37aa46ebd2725339fb0bac22faf
+  data.tar.gz: f09a3ab964eaf9dee65beccc919499312976afad9608b8aae4272932b94ff5d5dd99d85cec78c61d4f07f6d54a41d279be76ba87b4e434e00585889c59245f23

data.tar.gz.sig

@@ -1,2 +1,2 @@
-L�����ϴe��jg�3��WQ��bfp0ZrNKi��#�ٞ|��M��!%_�]��|�B�Gq�v�6'`�iFSk�Γ�͊>,�k9u�lc��m�)�b{�	rz�q�~vf���o�1+2�z����6�I��a�ݧ�#V��>���؁�2a��������1����c&��p�2��e��D�n�:��4�-�
-BI�)�����n�b��P��y4�::g@u3���ª9A�h�I6i��;׀G"i�
+�ӥh4��Fl{�Yi�7�>z��p9T�@
+�F09�B$��t��va�/�����e���Q�����v���qc�Q١��U��R

data/lib/pxgraphviz.rb

@@ -9,20 +9,18 @@ require 'graphvizml'
 
 class PxGraphViz
 
-  attr_reader :doc
+  attr_reader :doc, :px
 
   def initialize(s, style: default_stylesheet())
 
-    px = s =~ /^<\?/ ? Polyrex.new.import(s) : Polyrex.new(s)
-    @doc = build(px, style)
+    @px = s =~ /^<\?/ ? Polyrex.new.import(s) : Polyrex.new(s)
+    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 = doc
     
-  end
-  
-  # this method will be deprecated in the near future. Use #doc instead
-  #
-  def to_doc()
-    @doc
-  end
+  end  
     
   def to_dot()
     GraphVizML.new(@doc).to_dot
@@ -45,108 +43,6 @@ class PxGraphViz
   end
   
   private
-
-  def build(px, style)
-
-    # The issue with 2 nodes having the same name has yet to be rectified
-    #jr020917 labels = @px.xpath('//records/item/summary/label/text()').uniq
-    
-    summary = px.xpath('//records/item/summary')
-    
-    labels = summary.map do |x|
-
-      a = [x.text('label'), x.text('shape') || 'box', x.text('url')]
-
-    end
-
-    ids = labels.length.times.map {|i| i+1}
-
-    labels_ids = labels.zip ids
-
-    # Create a document of the nodes
-
-    node_records = RexleBuilder.build do |xml|
-
-      xml.records do
-        
-        labels_ids.each do |x, i|
-          
-          label, shape, url = x
-          attr = {gid: i.to_s, shape: shape}
-          
-          if url then
-            xml.a({href: url}) do
-              xml.node(attr) { xml.label label }
-            end
-          else
-            xml.node(attr) { xml.label label }
-          end
-          
-        end
-      end
-
-    end
-
-    a_nodes = labels.map(&:first).zip(node_records[3..-1])
-    h_nodes = a_nodes.to_h
-
-
-    a_edges = []
-    px.each_recursive do |x, parent, level|
-
-      next if level <= 0
-      a_edges << [
-        parent.label,
-        x.label, 
-        x.respond_to?(:connection) ? x.connection : ''
-      ]
-
-    end
-
-    # Create a document of the nodes
-
-    edge_records = RexleBuilder.build do |xml|
-
-      xml.records do
-        
-        a_edges.each.with_index do |x, i|
-          
-          item1, item2, connection = x
-          
-          xml.edge gid: 'e' + (i+1).to_s do
-            
-            xml.summary { xml.label connection }           
-            elements = [h_nodes[item1], h_nodes[item2]]            
-            nodes = elements.map {|node| node[0] == 'a' ? node[3] : node }
-            
-            xml.records { RexleArray.new(nodes)}
-          end
-          
-        end
-      end
-
-    end    
-
-
-    h = {
-      style: style,
-      nodes: {summary: '', records: node_records[3..-1]},
-      edges: {summary: '', records: edge_records[3..-1]}
-    }
-
-    a = RexleBuilder.new(h).to_a
-    a[0] = 'gvml'
-
-    summary = px.summary.to_h
-    %i(recordx_type format_mask schema).each do |x| 
-      summary.delete x; summary.delete x.to_s
-    end
-
-    a[1] = summary
-
-    Domle.new(a)    
-
-  end
   
   def default_stylesheet()
 
@@ -179,4 +75,79 @@ STYLE
 
   end
 
+  
+  def xslt_stylesheet()
+    
+<<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" />
+
+<xsl:template match='items'>
+  <xsl:element name="nodes">
+    <xsl:if test="summary/type">
+      <xsl:attribute name="type">
+        <xsl:value-of select="summary/type"/>
+      </xsl:attribute>
+    </xsl:if>
+    <xsl:if test="summary/direction">
+      <xsl:attribute name="direction">
+        <xsl:value-of select="summary/direction"/>
+      </xsl:attribute>
+    </xsl:if>
+    <xsl:apply-templates select='records'/>
+  </xsl:element>
+</xsl:template>
+
+<xsl:template match='records/item'>
+
+  <xsl:if test="summary/url">
+    <xsl:element name="a">
+      <xsl:attribute name="href">
+        <xsl:value-of select="summary/url"/>
+      </xsl:attribute>
+    </xsl:element>
+  </xsl:if>
+  
+  <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:apply-templates select='summary'/>
+    <xsl:apply-templates select='records'/>
+
+  </xsl:element>
+</xsl:template>
+
+<xsl:template match='item/summary'>
+
+    <label><xsl:value-of select='label'/></label>
+
+</xsl:template>
+
+</xsl:stylesheet>
+
+XSLT
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pxgraphviz
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   AJ2kmROiYBLscpVrfyHxtEJluJwbid/KyR/BybHL7uezZ2/EbCxCYanOIbNyctTp
   CNgZvs+F41zO7g==
   -----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: polyrex
@@ -62,7 +62,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.5
 description: 
 email: james@jamesrobertson.eu
 executables: []