jstreebuilder 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f98c98e0ff99dffced50db848f6f9ce57845c10c097bef510a26ceb1b3c8dcb8
-  data.tar.gz: 3dae6f056654e23b0ae5c77f59a616702675fdaf9cb66e63fc4ad0b6f60c454b
+  metadata.gz: 1fb6216a6db3b1fa2cea22ff31e25ef0011e781ad32733f72db72868274480d4
+  data.tar.gz: 68790d57575371e35df2c3e30fde0d4ac46202e7d56a84dcf41796c4e1eaf210
 SHA512:
-  metadata.gz: 3aef11d3b58a5b25b70ad72f9101ec95c8de4d55c8dbf42e765f9fed3999e142befdb5b3eb29d13595ba1a222de571dd16ef7c0213ce1adf3f930477c4b36d86
-  data.tar.gz: def0b33e5777d7b780f9d5805cc3f57cee0b2ba5cb82faf697fc71fa02286d1982e5248f80f174e72bc73d9da3f921230a39ec3f9ec7849049c94dfec1fc8628
+  metadata.gz: bcec7abd75392b28dba2693978032e2b94b3ed6987672c24a725af7861793957c6f7f9b4ca28eede154088eff9fba6c920d76461b48627e00a1b7fa3f4321228
+  data.tar.gz: eae3a2574424004193df4d30b9cfa304eeb61847d82faa9f9aa990d9502aa27f55125873cf2c7c8cd4adf09d67bdf149ece43d4710a1944836adfd2cc5fc915f

data/lib/jstreebuilder.rb

@@ -11,6 +11,7 @@ require 'polyrex'
 XSLT = %q[
 <xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
   <xsl:output method="xml" indent="yes" omit-xml-declaration="yes" />
+
   <xsl:template match='entries'>
 
     <xsl:element name='ul'>
@@ -36,7 +37,17 @@ XSLT = %q[
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name='li'>      
+          <xsl:choose>
+            <xsl:when test='summary/url != ""'>
+            <xsl:element name='a'>
+              <xsl:attribute name='href'><xsl:value-of select='summary/url'/></xsl:attribute>
+              <xsl:value-of select='summary/title'/>      
+            </xsl:element>
+            </xsl:when>
+            <xsl:otherwise>
           <xsl:value-of select='summary/title'/>      
+            </xsl:otherwise>
+          </xsl:choose>
         </xsl:element>
       </xsl:otherwise>
       </xsl:choose>
@@ -190,15 +201,23 @@ EOF
 
   def tree(opt={})
 
-    tree = opt[:xml]  
+    tree = opt[:src]  
     
-    schema = 'entries/entry[title]'
-    xslt_schema = 'tree/item[@title:title]'
-
-    # transform the tree xml into a polyrex document
-    pxsl = PolyrexXSLT.new(schema: schema, xslt_schema: xslt_schema).to_xslt
-    puts 'pxsl: ' + pxsl if @debug
-    px = Polyrex.new(Rexslt.new(pxsl, tree).to_s)
+    s = if tree =~ /<tree>/ then
+      
+      schema = 'entries/entry[title]'
+      xslt_schema = 'tree/item[@title:title]'
+
+      # transform the tree xml into a polyrex document
+      pxsl = PolyrexXSLT.new(schema: schema, xslt_schema: xslt_schema).to_xslt
+      puts 'pxsl: ' + pxsl if @debug
+      Rexslt.new(pxsl, tree).to_s
+      
+    elsif tree =~ /<?polyrex / 
+      tree
+    end
+    
+    px = Polyrex.new(s)
 
     # transform the polyrex xml into a nested HTML list
     #@ul = Rexslt.new(px.to_xml, XSLT).to_xml
@@ -211,4 +230,3 @@ EOF
   end
 
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jstreebuilder
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   /YHvF368/KpwUw6rBLVUbFvCsNvDTe+bPAG72P5om2g/aope7mb9Qc4kATQgWiys
   rqRI7UAQ3N9ojGSXl6KSySfi
   -----END CERTIFICATE-----
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri