myoutline 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1b6e81f06399bb9e831e88a29c6467a5ded9dfd61bbfce42f57d6a1a7fb620c
-  data.tar.gz: 3a769e535de5132b480e89b1eaa190e7803173c53f1d59b04878f9fb5a152230
+  metadata.gz: 24d6fa7d167581e1e30ee892e60a3801f7386d59e40d32101ee15bcf3943c9e3
+  data.tar.gz: e1861d417ceb0e21b92b3fe0393bae2857dd1a859790582a28b6031df0215068
 SHA512:
-  metadata.gz: 8d2986b96ef7c4f28e23a7289a5796c727a8351eb42ad1a4b373e109d2ef13244734de0de82316230a0bc57a04ca38fc09afbd48afbf6e1799323ec9ea032492
-  data.tar.gz: 5436100739b574c27d1da15e6e0a960591d46444aa2d2bb9f53f7b6e57d8c3e7f901f828771eee1e7003b584de53725d00c98607b2fc6edc65d4c06e9c792bc5
+  metadata.gz: d7ed8d838eaaf1d5c2b5033a5dd51cc63ab66c2e0d3797d7b2472104fd00160555d131d4adb8a6e1f3d42ee27fa781ab99bd19d9cbb6c44e65aa9f3e7380c3c8
+  data.tar.gz: ff51e98d9bc6292e74f88e62b985e20d304430e04fba31b3f4b8a446aa38df0b4d5ce36d6eacb04a24ad43de7153bc25c7176fded43f8ee64f454a70a480e484

data/lib/myoutline.rb

@@ -38,6 +38,10 @@ class MyOutline
       end
       
     end
+
+    def build_html(&blk)
+      @pxi.build_html(&blk)
+    end
     
     def locate(s)
       @links.locate s
@@ -183,41 +187,14 @@ class MyOutline
   end
   
   def to_html()
-
-    px = self.outline.to_px
     
-    px.each_recursive do |x, parent|
+    @outline.build_html do |e|
       
-      if x.is_a? Entry then
-        
-        trail = parent.attributes[:trail]
-        s = x.title.gsub(/ +/,'-')
-        x.attributes[:trail] = trail.nil? ? s : trail + '/' + s
-        
-      end
+      e.attributes[:href] = @topic_url.sub(/\$topic/, e.text)\
+          .sub(/\$id/, e.attributes[:id]).sub(/\$trail/, e.attributes[:trail])\
+          .to_s.gsub(/ +/,'-')      
       
-    end
-
-    doc  = Nokogiri::XML(px.to_xml)
-    xsl  = Nokogiri::XSLT(xslt())
-
-    html_doc = Rexle.new(xsl.transform(doc).to_s)
-        
-    html_doc.root.css('.atopic').each do |e|      
-      
-      puts 'e: ' + e.parent.parent.xml.inspect if @debug
-      
-      href = e.attributes[:href]
-      if href.empty? or href[0] == '!' then
-        
-        e.attributes[:href] = @topic_url.sub(/\$topic/, e.text)\
-            .sub(/\$id/, e.attributes[:id]).sub(/\$trail/, e.attributes[:trail])\
-            .to_s.gsub(/ +/,'-')
-        
-      end
-    end
-    
-    html_doc.xml(pretty: true, declaration: false)
+    end    
     
   end
   
@@ -242,54 +219,6 @@ class MyOutline
     end
 
   end
-  
-  def xslt()
-<<EOF
-<?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='entries'>
-  <ul>
-    <xsl:apply-templates select='summary'/>
-    <xsl:apply-templates select='records'/>
-  </ul>
-</xsl:template>
-
-<xsl:template match='entries/summary'>
-</xsl:template>
-
-<xsl:template match='records/section'>
-  <li><h1><xsl:value-of select="summary/heading"/></h1><xsl:text>
-      </xsl:text>
-
-    <xsl:apply-templates select='records'/>
-
-<xsl:text>
-    </xsl:text>
-  </li>
-</xsl:template>
 
 
-<xsl:template match='records/entry'>
-    <ul id="{summary/title}">
-  <li><xsl:text>
-          </xsl:text>
-          <a href="{summary/url}" class='atopic' id='{@id}' trail='{@trail}'>
-          <xsl:value-of select="summary/title"/></a><xsl:text>
-          </xsl:text>
-
-    <xsl:apply-templates select='records'/>
-
-<xsl:text>
-        </xsl:text>
-  </li>
-    </ul>
-</xsl:template>
-
-
-</xsl:stylesheet>    
-EOF
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myoutline
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   DFhc5TDtqEkJYiaiznQFl34HUKeCAdeAHkmD8jP3fUC8O7zcLXq69EAXGMXw4efB
   3Co=
   -----END CERTIFICATE-----
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pxindex
@@ -41,7 +41,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement