jstreebuilder 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98ce236d808f41da975ffe805ae3d50535f73395e875d1f51aaaec7eb981044a
-  data.tar.gz: fbbfdeacf84b7dd83c721051336b79002772aa17ec75aeab1db66108b150c0e0
+  metadata.gz: a34efda76d17c49fe344f4cbdf3ac4e1e12f0ea04015838f51fdba695fe8c6fb
+  data.tar.gz: 7d7748ad8a279fe205c0832b610463b26d7f5223235da94e5ed8d0a0c264fd92
 SHA512:
-  metadata.gz: 8390cee9564d3164fb91a1ee16f2390b4c18a85f0bc9ec4d99bcc5b6dbe915fadc2f76f2abf664a8bc19a1c0a581dab690639b963346c0fc9c188e3af88281a7
-  data.tar.gz: 138552607bff3a5d7142c68302df4c413dd69a0056cbd8fba31d1c3f10b4dabeb8806e9765a31ada1a2f6b8407b748e303a43f24ed5808575690a3041248425b
+  metadata.gz: e93d1ed1bfb1d5607f2a7b41dea63503fbdf6bfc45a4d1a6c7b45922ebfefeb36b52346af29eda10d600f286ab578ef1653150447dcc79164c8fecb737156505
+  data.tar.gz: 1851f88fd3da5fde59ec8d91ff9e6815b3037cc6562167644f7be0fef9407d57c6079d221113a60512e0181906b1a5edb3029004195f709130d87d3fc781a010

data/lib/jstreebuilder.rb

@@ -5,7 +5,7 @@
 require 'nokogiri'
 require 'polyrex-xslt'
 require 'polyrex'
-
+require 'kramdown'
 
 
 XSLT = %q[
@@ -28,7 +28,20 @@ XSLT = %q[
 
         <xsl:element name='li'>
 
-          <span class="caret"><xsl:value-of select='summary/title'/></span>
+          <xsl:element name='span'>      
+            <xsl:attribute name="class">caret</xsl:attribute>
+            <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 class='nested'>
             <xsl:apply-templates select='records/entry' />
           </ul>
@@ -115,15 +128,90 @@ for (i = 0; i < toggler.length; i++) {
 }
 EOF
 
+  class TreeBuilder
+    using ColouredText
+
+    attr_reader :to_tree
+
+    def initialize(s, debug: false)
+
+      @debug = debug
+      html = Kramdown::Document.new(s).to_html
+      puts ('html: ' + html.inspect) if @debug
+      a = scan_headings(html)
+      puts ('a: ' + a.inspect) if @debug
+      
+      s2 = make_tree(a)
+      puts ('s2: ' + s2.inspect) if @debug
+      tree = LineTree.new(s2).to_tree
+      
+      puts ('tree: ' + tree.inspect).debug if @debug
+      
+      doc = Rexle.new(tree)
+      doc.root.each_recursive do |node|
+        
+        h = node.attributes        
+        puts ('h: ' + h.inspect).debug if @debug
+        h[:url] = '#' + h[:title].strip.downcase.gsub(' ', '-')
+        
+      end
+      puts ('doc.xml: ' + doc.xml.inspect) if @debug
+      
+      @to_tree = doc.xml pretty: true
+
+    end
+    
+    def make_tree(a, indent=0, hn=1)
+      
+      if @debug then
+        puts 'inside make_tree'.debug 
+        puts ('a: ' + a.inspect).debug
+      end
+      
+      a.map.with_index do |x, i|
+        
+        puts ('x: ' + x.inspect).debug if @debug
+        
+        if x.is_a? Array then
+
+          puts 'before make_tree()'.info if @debug
+          
+          make_tree(x, indent+1, hn)
+
+        else
+
+          next unless x =~ /<h[#{hn}-4]/
+          space = i == 0 ? indent-1 : indent
+          heading = ('  ' * space) + x[/(?<=\>)[^<]+/]
+          puts ('heading: ' + heading.inspect).debug if @debug
+          heading
+
+        end
+
+      end.compact.join("\n")
+
+    end    
+
+    def scan_headings(s, n=1)
+      
+      s.split(/(?=<h#{n})/).map do |x| 
+        x.include?('<h' + (n+1).to_s) ? scan_headings(x, n+1) : x
+      end
+
+    end
+
+  end
+
 
   attr_reader :html, :css, :js
 
   def initialize(unknown=nil, options={})
     
     if unknown.is_a? String or unknown.is_a? Symbol then
-      type = unknown.to_sym
+      type = unkown.to_sym
     elsif unknown.is_a? Hash
-      options = unknown
+      options = {type: :tree}.merge(unknown)
+      type = options[:type]
     end
     
     @debug = options[:debug]
@@ -198,30 +286,40 @@ EOF
   
   end
   
+  def build_px(tree)
+    
+    schema = 'entries/entry[title, url]'
+    xslt_schema = 'tree/item[@title:title, @url:url]'
+
+    # 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    
+    
+  end
+  
 
   def tree(opt={})
 
-    tree = opt[:src]  
+    src = opt[:src]  
     
-    s = if tree =~ /<tree>/ then
+    s = if src =~ /<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
+      build_px(src)
       
-    elsif tree =~ /<?polyrex / 
-      tree
+    elsif src =~ /<?polyrex / 
+      src
+    else
+      build_px(TreeBuilder.new(src, debug: @debug).to_tree)
     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)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jstreebuilder
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -97,6 +97,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.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'
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -126,5 +146,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Generates an HTML tree from XML.
+summary: Generates an HTML tree from XML or Markdown.
 test_files: []