myoutline 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8a3df25ba19223d3630612441c9c157b05b0b1aa
-  data.tar.gz: f1e325e49cd1f8a16215f446b712dd94b5367b47
+SHA256:
+  metadata.gz: d1b6e81f06399bb9e831e88a29c6467a5ded9dfd61bbfce42f57d6a1a7fb620c
+  data.tar.gz: 3a769e535de5132b480e89b1eaa190e7803173c53f1d59b04878f9fb5a152230
 SHA512:
-  metadata.gz: b108ce8f581ae7be0eba62ea3246bdbaa85703acdb4a2f6443ae869bc2dc7c2725b056dafeb6e5623e06e0dbfa59a9963167c312d2898dbac474b8381d09e803
-  data.tar.gz: 954539f6c9df906323a4a072bfcc02a784459ce6e183e602a0b592c04f59ced91c22b33401131826e089f08adcd228885239e8decf4601e287a37c1ccc665818
+  metadata.gz: 8d2986b96ef7c4f28e23a7289a5796c727a8351eb42ad1a4b373e109d2ef13244734de0de82316230a0bc57a04ca38fc09afbd48afbf6e1799323ec9ea032492
+  data.tar.gz: 5436100739b574c27d1da15e6e0a960591d46444aa2d2bb9f53f7b6e57d8c3e7f901f828771eee1e7003b584de53725d00c98607b2fc6edc65d4c06e9c792bc5

data/lib/myoutline.rb

@@ -15,6 +15,7 @@ class MyOutline
   attr_accessor :md
   
   class Outline
+    using ColouredText
     
     attr_reader :ftx, :links, :pxi
     
@@ -29,10 +30,10 @@ class MyOutline
     
     def autosave(s=nil)
       
-      puts 'inside autosave ; @autoupdate: ' + @autoupdate.inspect if @debug
+      puts ('inside autosave ; @autoupdate: ' + @autoupdate.inspect).debug if @debug
       
       if @autoupdate then
-        puts 'before save' if @debug
+        puts 'before save'.info if @debug
         save() if s.nil? or self.to_s != s      
       end
       
@@ -183,7 +184,7 @@ class MyOutline
   
   def to_html()
 
-    px = self.to_px
+    px = self.outline.to_px
     
     px.each_recursive do |x, parent|
       
@@ -197,19 +198,26 @@ class MyOutline
       
     end
 
-    doc   = Nokogiri::XML(px.to_xml)
+    doc  = Nokogiri::XML(px.to_xml)
     xsl  = Nokogiri::XSLT(xslt())
 
-    doc = Rexle.new(xsl.transform(doc).to_s)
+    html_doc = Rexle.new(xsl.transform(doc).to_s)
         
-    doc.root.css('.atopic').each do |e|      
+    html_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(/ +/,'-')
+      
+      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
     
-    doc.xml(pretty: true)
+    html_doc.xml(pretty: true, declaration: false)
     
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myoutline
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   DFhc5TDtqEkJYiaiznQFl34HUKeCAdeAHkmD8jP3fUC8O7zcLXq69EAXGMXw4efB
   3Co=
   -----END CERTIFICATE-----
-date: 2018-04-15 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pxindex
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Helps build an outline from plain text.