jstreebuilder 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d776f9c33266197c777807bd162beb3c2415b82686fe2fa8c1a8a2ba4d33dfab
-  data.tar.gz: b2df7d91ba2d3365089f952ec7817183e194c2c62ed9b706acbc1ca2fa1fcea2
+  metadata.gz: 78cae4a1eca195d5911489593cd19215b7ff070f3a64dda3d335d475e204ffa3
+  data.tar.gz: 9eaeee9e2f4ed52fa14d3f84a32fae4cd451e7f13c46601e2fa01a7a61cf0dad
 SHA512:
-  metadata.gz: 45ee0172a25404b048847b43a6c61ecb2ed8f568c7c79ca2949864c68a80a34a1b3b45b487467b2537f4c4b3ee5cb2dd6dcba6aa6bafddcb86bd74e891e1ac32
-  data.tar.gz: 7e64e35b0fbfdbc91769b45698f305adbea9acd115f0e09ecc53543f728d740b81a51618c6bc4ce172d2f953ff9e2f5a03ac159658a329c2c8a18abb121118e2
+  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>
 
@@ -70,6 +70,66 @@ XSLT = %q[
 </xsl:stylesheet>
 ]
 
+PLAIN = %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'>
+      <xsl:attribute name='id'>myUL</xsl:attribute>
+      <xsl:apply-templates select='records/link' />
+    </xsl:element>
+
+  </xsl:template>
+
+  <xsl:template match='link'>
+
+    <xsl:choose>
+      <xsl:when test='records/link'>
+
+        <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>
+        <ul>
+          <xsl:apply-templates select='records/link' />
+        </ul>
+
+
+      </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>
+
+  </xsl:template>
+
+</xsl:stylesheet>
+]
+
 
 class JsTreeBuilder
   using ColouredText
@@ -128,6 +188,8 @@ body {
   z-index: 1;
   top: 20px;
   left: 10px;
+  height: 90%;
+  overflow: auto;
   background: #eee;
   overflow-x: hidden;
   padding: 12px 0;
@@ -157,6 +219,18 @@ body {
 }
 ]
 
+PLAIN_CSS = "
+ul {
+  list-style-type: none; 
+  background-color: transparent; 
+  margin: 0.1em 0.1em; padding: 0.3em 1.3em
+}
+ul li {
+  background-color: transparent; 
+  margin: 0.1em 0.1em; padding: 0.3em 0.3em
+}
+"
+
 TREE_JS =<<EOF
 var toggler = document.getElementsByClassName("caret");
 var i;
@@ -171,14 +245,16 @@ EOF
 
 SIDEBAR_JS = TREE_JS
 
+PLAIN_JS = ''
+
   class TreeBuilder
     using ColouredText
 
     attr_reader :to_tree
 
-    def initialize(s, debug: false)
+    def initialize(s, hn: 1, debug: false)
 
-      @debug = debug
+      @debug, @hn = debug, hn
       html = Kramdown::Document.new(s).to_html
       puts ('html: ' + html.inspect) if @debug
       a = scan_headings(html)
@@ -204,7 +280,7 @@ SIDEBAR_JS = TREE_JS
 
     end
     
-    def make_tree(a, indent=0, hn=1)
+    def make_tree(a, indent=0, hn=@hn)
       
       if @debug then
         puts 'inside make_tree'.debug 
@@ -235,7 +311,7 @@ SIDEBAR_JS = TREE_JS
 
     end    
 
-    def scan_headings(s, n=1)
+    def scan_headings(s, n=@hn)
       
       s.split(/(?=<h#{n})/).map do |x| 
         x.include?('<h' + (n+1).to_s) ? scan_headings(x, n+1) : x
@@ -259,7 +335,7 @@ SIDEBAR_JS = TREE_JS
     
     @debug = options[:debug]
 
-    @types = %i(tree sidebar)
+    @types = %i(tree sidebar plain)
     
     build(type, options) if type
 
@@ -324,14 +400,14 @@ SIDEBAR_JS = TREE_JS
     @html = s.gsub(/<\/div>/,'\0' + "\n").strip.lines[1..-2]\
       .map {|x| x.sub(/^  /,'') }.join
     
-    @css = Object.const_get 'JsTreeBuilder::' + type.to_s.upcase + '_CSS'
-    @js = Object.const_get 'JsTreeBuilder::' + type.to_s.upcase + '_JS'        
+    @css = type.to_s.upcase + '_CSS'
+    @js = type.to_s.upcase + '_JS'        
   
   end
   
   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
@@ -342,29 +418,44 @@ SIDEBAR_JS = TREE_JS
   end
   
 
-  def tree(opt={})
+  def tree(opt={}, xslt=XSLT)
 
-    src = opt[:src]  
+    raw_src = opt[:src]
     
-    s = if src =~ /<tree>/ then
+    px = if raw_src.is_a? String then
+    
+      src, _ = RXFHelper.read raw_src
+      
+      header = "<?polyrex schema='entries[title]/link[title,url]' \
+            delimiter=' # '?>\n\n"
+      
+      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
       
-      build_px(src)
+      puts ('s: ' + s.inspect).debug if @debug
+      Polyrex.new(s)
       
-    elsif src =~ /<?polyrex / 
-      src
-    else
-      build_px(TreeBuilder.new(src, debug: @debug).to_tree)
+    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
     puts ('px.to_xml: ' + px.to_xml.inspect).debug if @debug
     doc   = Nokogiri::XML(px.to_xml)
-    xslt  = Nokogiri::XSLT(XSLT)
+    xslt  = Nokogiri::XSLT(xslt)
 
     @ul = xslt.transform(doc).to_s.lines[1..-1].join
 
@@ -375,5 +466,9 @@ SIDEBAR_JS = TREE_JS
     doc.root.attributes[:class] = 'sidenav'
     @ul = doc.xml(declaration: false)
   end
+  
+  def plain(opt={})
+    tree opt, PLAIN
+  end  
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jstreebuilder
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwODA1MjExNDQ4WhcN
-  MjAwODA0MjExNDQ4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCxe/SK
-  P63fEkWwc5zLyS7cQUh1CpPliXajuIL1pUxMyF0FBxs+GId3IZhCF8/3+RMVnz/e
-  Gs0J9nDBrCctAHSi6VsjFocmiXqu96sx9Fxfs5wTqyT4fD22LoTBNVUZ0pZfxaBm
-  G6ztBF1dmnrmsSCtLnqioX2rQFyrbIty+y0GkKGbqiV2CMKheQXvfg/4TOElklND
-  jGe1sMwfvOKKR0Xrwfp6V/AU4ecf9jLqVttS+cPspdDowzhDrHmWBGhIEo0ccRXb
-  OpTN30OrA+q/WVZBUIiySYcpW1W8JJFhLDi0WMfoPoQ5C2D91adRaQKHwZT4iDen
-  usRE9oHWuebCV8wW/I2MqexyBrbDu2k9qQryhufDxeRZT1dbx7meNPSHQ1Ktm21D
-  qOOPYpl7OlSr+UP7NwPBWxXB3jLxhe5onyIXKTP/vUQ19Swo2Kx2YJyWpOfrNOOA
-  ODSx83g/N/FdgI+dUkAPvtefU9+IQuCRWsQAk1XycafEFcTkNVD5D0Hqp6sCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU54E03Y+Y
-  1F5Sszs2IG3vqhesBXYwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwNTI1MTEyMTAzWhcN
+  MjIwNTI1MTEyMTAzWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDObxCX
+  EZwr753Md0Kcfa5QIMA3vdEBwOSu8MxOvfopBtFh68Vs0NA9BUAyyBiKIpJOjpBi
+  Qiv82JXyc5UBkBU8pqGYWTMaYgmyJVKyCjxZMYxgeqqYz0aZHuCHXsisaDMz7i5z
+  2992PlPD+4nKZArT9spj6JzVK+yEm2ijjS+oscpxhUNPARv4UzKOdSlAnYzxWooH
+  uoaEwzcPoVSWsj/vDCWwkAGUZCDmn1Z6oLxVXK3BaFxxSyo4hVZro0Zgk1Y4qjeK
+  HHe9navqDWye9dS0nuHX3/PwgLStvJ7IQs+tyjYb8ytuKO+uKU9I4Sr+gx8YlFKd
+  OrS+RLaCNJjfh6elNG81CUWZwSe06fFxFywz2RXrp0ZeI0QJ4I0oxk1LgTl20M4Z
+  nXLVhqSr1Yb1EEcp/L7A5cuQ0pbz6PvN/5F+cUyTMrRCBWsywZ2Ht5lfgjwPKjcT
+  h5h62DaZ9epUm/YUFzQQTxOGZY2xivpH54FMIcqGjmrHB2ASNzKo+6WtEyMCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU8tcAulKV
+  0dnJjCElomHr44nHGPMwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAW1T6VR0ML0Xu0ryrjPVwPa3x5h2tj/YcHEmWDre+
-  7nN5I8Rrgg76JYkjBWIf3Dr2WYPsga4w5NK0wPScphv5U9cwfIA5r0gFroflcug+
-  DlC5yiNmOyih46eCeoLfyzmIORM0Ejn0Vq2pqcyEW+vEUB1EFvqMKgfcdRfplKil
-  qT2TvvEPSatX8dBwGXEEE03ID2NA4xU/fXEfLu22zO1aMKuwSNJm1wnJAcErkVnF
-  ddfalc7UNj3/gt2eE3EZo1x1U7Gbnwzix6AU2XFAzjMhlVgg+iCW4ie2tkaEF52z
-  3JGvpw6sa5K3VjrnW146I3D1yhCuCToLwLZ4evDjS9HWifxzwWBQmAMhvZf4YOCv
-  uBJ1bPJvkq1hhYuPfw6FEXgyodyKcU98x77XUgJk7leb6jN1nXiWx5Ox1/TQL8WX
-  /YHvF368/KpwUw6rBLVUbFvCsNvDTe+bPAG72P5om2g/aope7mb9Qc4kATQgWiys
-  rqRI7UAQ3N9ojGSXl6KSySfi
+  BgkqhkiG9w0BAQsFAAOCAYEAK2zu4AMtsc4SyemYdrxWU+H7mq8f7DOGxBLLmyvr
+  4nrXLRtXIXyLh5A+PSZZYo4yPMTWBceu9llFl/DQz6LAy3DWhrJeIkQLhjr2yMcj
+  2AYCywZoz21O4ZAD/VWGVBXoiwBKgGVHKH5Tg0YP+rPamQpTx/R504XJtsyDDl8c
+  8Dkxnyujqc5uhuRYzTdg2uB8tN/yGLjxp4TserAddrAXmT4eyX2pz5wLw3T4QnUM
+  M5Rbh265lM2dto4oF8l99nEqzjizaTYSqW/QUez+H+8LBuUL3vOZiLJVWpouE2q4
+  RRwa4taVOEYrfq15x2CCvAGTyAmVemNhMNKd1iQEbf0CCzlC9iUlhy71/7OwkFgP
+  Ylqv2eiEKke192rff7eV/rDZhR70zordGPaRHgkuRRs6Ld9yeKS0CduK9YiMeoaf
+  8XaALSKxr3idyvVbBK920Fok7uGfchqJrIU5aP7qDogCmzHHHbiKzd+2arCbxISY
+  +eOXFHOtwvjBqRlX2zAMEukI
   -----END CERTIFICATE-----
-date: 2019-09-15 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -43,40 +43,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.11.5
 - !ruby/object:Gem::Dependency
   name: polyrex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: polyrex-xslt
   requirement: !ruby/object:Gem::Requirement
@@ -101,24 +101,24 @@ dependencies:
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.1
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Generates an HTML tree from XML or Markdown.