jstreebuilder 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: becee86e064c7f3cc2c1f85d276181bf4b4e8fbf5452c12653984c1bc1c18ea1
-  data.tar.gz: eaad9031c261b926b2bf5356dcc8aa915a096ab1277fcb562463d8df8667bc7d
+  metadata.gz: 78cae4a1eca195d5911489593cd19215b7ff070f3a64dda3d335d475e204ffa3
+  data.tar.gz: 9eaeee9e2f4ed52fa14d3f84a32fae4cd451e7f13c46601e2fa01a7a61cf0dad
 SHA512:
-  metadata.gz: 161ef34be304b151fb0ea7a3a796cf681b9b1d2b93edbbd43a5e055bcac2730feae245256ac95c5e1aeb33e5ced23ea500882f00c1e0e52e9015a4fe064f95ed
-  data.tar.gz: ebc9f22165fc91925d568dcb55423bc7986bc68189477c24a5223226c504d40b19c484dbc1d6295580525b01852149d61034adbf6cbdd8360c4cab30b66544bf
+  metadata.gz: e3bdc4fcc00377c1acebf131867c6c221549f0193430c97026f745398cadaa60d348e7dd4002f3defe59e79733a7f1eab0a977d4a6779f51ea6227702448b5b5
+  data.tar.gz: 6ddaf977fdeeb5dc201ec701ca06db70bae1cfa9fbc3ec22665559b57b41feceb58c762a10343816b48eb2a6694e656b53788b8f53cf6bdf8723010b1ecd440d

data/lib/jstreebuilder.rb

@@ -16,15 +16,15 @@ XSLT = %q[
 
     <xsl:element name='ul'>
       <xsl:attribute name='id'>myUL</xsl:attribute>
-      <xsl:apply-templates select='records/entry' />
+      <xsl:apply-templates select='records/link' />
     </xsl:element>
 
   </xsl:template>
 
-  <xsl:template match='entry'>
+  <xsl:template match='link'>
 
     <xsl:choose>
-      <xsl:when test='records/entry'>
+      <xsl:when test='records/link'>
 
         <xsl:element name='li'>
 
@@ -43,7 +43,7 @@ XSLT = %q[
             </xsl:choose>
           </xsl:element>
           <ul class='nested'>
-            <xsl:apply-templates select='records/entry' />
+            <xsl:apply-templates select='records/link' />
           </ul>
         </xsl:element>
 
@@ -78,15 +78,15 @@ PLAIN = %q[
 
     <xsl:element name='ul'>
       <xsl:attribute name='id'>myUL</xsl:attribute>
-      <xsl:apply-templates select='records/entry' />
+      <xsl:apply-templates select='records/link' />
     </xsl:element>
 
   </xsl:template>
 
-  <xsl:template match='entry'>
+  <xsl:template match='link'>
 
     <xsl:choose>
-      <xsl:when test='records/entry'>
+      <xsl:when test='records/link'>
 
         <xsl:element name='li'>
 
@@ -103,7 +103,7 @@ PLAIN = %q[
           </xsl:choose>
         </xsl:element>
         <ul>
-          <xsl:apply-templates select='records/entry' />
+          <xsl:apply-templates select='records/link' />
         </ul>
 
 
@@ -407,7 +407,7 @@ PLAIN_JS = ''
   
   def build_px(tree)
     
-    schema = 'entries/entry[title, url]'
+    schema = 'entries/link[title, url]'
     xslt_schema = 'tree/item[@title:title, @url:url]'
 
     # transform the tree xml into a polyrex document
@@ -420,30 +420,36 @@ PLAIN_JS = ''
 
   def tree(opt={}, xslt=XSLT)
 
-    raw_src = opt[:src]  
+    raw_src = opt[:src]
     
-    src, _ = RXFHelper.read raw_src
+    px = if raw_src.is_a? String then
     
-    header = "<?polyrex schema='entries[title]/entry[title,url]' \
-          delimiter=' # '?>\n\n"
-    
-    s = if src =~ /<tree>/ then
+      src, _ = RXFHelper.read raw_src
       
-      build_px(src)
+      header = "<?polyrex schema='entries[title]/link[title,url]' \
+            delimiter=' # '?>\n\n"
       
-    elsif src =~ /<\?polyrex-links\?>/ 
-      header + src.sub(/<\?polyrex-links\?>/,'').lstrip
-    elsif src =~ /<\?polyrex / 
-      src      
-    elsif src =~ /^#+/
-      build_px(TreeBuilder.new(src, hn: opt[:hn],debug: @debug).to_tree)
-    else
-      header + src.lstrip
+      s = if src =~ /<tree>/ then
+        
+        build_px(src)
+        
+      elsif src =~ /<\?polyrex-links\?>/ 
+        header + src.sub(/<\?polyrex-links\?>/,'').lstrip
+      elsif src =~ /<\?polyrex / 
+        src      
+      elsif src =~ /^#+/
+        build_px(TreeBuilder.new(src, hn: opt[:hn],debug: @debug).to_tree)
+      else
+        header + src.lstrip
+      end
+      
+      puts ('s: ' + s.inspect).debug if @debug
+      Polyrex.new(s)
+      
+    elsif raw_src.is_a?(Polyrex) # detects PolyrexLinks as Polyrex too
+      raw_src
     end
     
-    puts ('s: ' + s.inspect).debug if @debug
-    px = Polyrex.new(s)
-
     # transform the polyrex xml into a nested HTML list
     #@ul = Rexslt.new(px.to_xml, XSLT).to_xml
     puts ('px: ' + px.inspect).debug if @debug

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jstreebuilder
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson