myoutline 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4a0da8fbdd54aa465b6b42d98b0d5a7efb6612b
-  data.tar.gz: fbc5c84534132fa2a9b9bf67e3332e74f572b43e
+  metadata.gz: 752b310a3ffc4f555e366c6a4b0f82a2377873b1
+  data.tar.gz: 7fb8965d9a4f5516f012cfbfe053f374c48c17f6
 SHA512:
-  metadata.gz: 70f5d5ac636616fbacdb6056fb92c7eb789b9cb58bcaae203e9a13124a53312090eea39bf4695a83db88c14d6246250e769138387fed1144b86229f37892a561
-  data.tar.gz: 3b1512d0cfe823326387b8e142db482b1c2592e3e241ae6cb27cf16c7825891191424cbbb5828eb5819aab8d0bb18cac1786b67b620475fb7e4fb628704e7cc5
+  metadata.gz: 2da3cacae84e95865054d059430f03810092841ec1ba4b925e85874623cdb4bc99bc17e9f8d6548879178810af509a8057c7f84651d792bc2e4c342acdc01441
+  data.tar.gz: 78906df6f38baae13d4b3482747ae3a204e0cc05e0e984b63884dca8e3f20de11d1de044e7e481d3ee01925e34122d5171dbc74e07a7a7e110164b6841b1bd37

data/lib/myoutline.rb

@@ -7,6 +7,8 @@ require 'nokogiri'
 
 
 class MyOutline
+  
+  attr_reader :pxi
 
   def initialize(source, debug: false, allsorted: true, 
                  autoupdate: true, topic_url: '$topic')
@@ -28,7 +30,7 @@ class MyOutline
     # add the new entries to the main index
     s << a3.join("\n")
 
-    s.prepend '<?ph schema="entries/entry[title]"?>
+    s.prepend '<?ph schema="entries/section[heading]/entry[title, url]"?>
 
     '
     
@@ -49,14 +51,31 @@ class MyOutline
   end
   
   def to_html()
+
+    px = self.to_px
     
-    doc   = Nokogiri::XML(self.to_px.to_xml)
+    px.each_recursive do |x, parent|
+      
+      if x.is_a? Entry then
+        
+        trail = parent.attributes[:trail]
+        s = x.title.gsub(/ +/,'-')
+        x.attributes[:trail] = trail.nil? ? s : trail + '/' + s
+        
+      end
+      
+    end
+
+    doc   = Nokogiri::XML(px.to_xml)
     xsl  = Nokogiri::XSLT(xslt())
 
     doc = Rexle.new(xsl.transform(doc).to_s)
         
-    doc.root.css('.atopic').each do |e|
-      e.attributes[:href] = @topic_url.sub(/\$topic/, e.text)
+    doc.root.css('.atopic').each do |e|      
+      puts 'e: ' + e.parent.parent.xml.inspect if @debug
+      e.attributes[:href] = @topic_url.sub(/\$topic/, e.text)\
+          .sub(/\$id/, e.attributes[:id]).sub(/\$trail/, e.attributes[:trail])\
+          .to_s.gsub(/ +/,'-')
     end
     
     doc.xml(pretty: true)
@@ -77,11 +96,12 @@ class MyOutline
     
   end
   
-  def to_tree
+  def to_tree(alphabet: true)
     
     a  = @pxi.to_s.lines
     a.shift # remove the ph declaration
-    a.reject! {|x| x =~ /^(?:#[^\n]+|\n+)$/}
+    a.reject! {|x| x =~ /^(?:#[^\n]+|\n+)$/} unless alphabet
+    a.map! {|x| r = x[/^.*(?= # )/]; r ? r + "\n" : x } # strip out the URLS
     
     a.join
     
@@ -105,8 +125,8 @@ class MyOutline
 <xsl:template match='entries/summary'>
 </xsl:template>
 
-<xsl:template match='records/entry'>
-  <li><h1><xsl:value-of select="summary/title"/></h1><xsl:text>
+<xsl:template match='records/section'>
+  <li><h1><xsl:value-of select="summary/heading"/></h1><xsl:text>
       </xsl:text>
 
     <xsl:apply-templates select='records'/>
@@ -117,10 +137,12 @@ class MyOutline
 </xsl:template>
 
 
-<xsl:template match='records/entry/records/entry'>
+<xsl:template match='records/entry'>
     <ul id="{summary/title}">
   <li><xsl:text>
-          </xsl:text><a href="{summary/title}" class='atopic'><xsl:value-of select="summary/title"/></a><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'/>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myoutline
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   DFhc5TDtqEkJYiaiznQFl34HUKeCAdeAHkmD8jP3fUC8O7zcLXq69EAXGMXw4efB
   3Co=
   -----END CERTIFICATE-----
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pxindex