myoutline 0.4.2 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c4004c2ecb1afce40d2b3aa042578578bebba47
-  data.tar.gz: 0b56c3f9048ca5d40819ed1d96e795f854da0cb9
+SHA256:
+  metadata.gz: 6614e36ff7173aa1c349e602e06c6da38cad3131cd4b728002b749113b33d434
+  data.tar.gz: efebcbfbc31ea18c4dff00019885a085de2953054c936bf3b620e2d35e0a48a1
 SHA512:
-  metadata.gz: f6c0f793663fe9d98428f9e460347903031edbddde7731aa7f077aae511a1b8ff58f4407bce6930af2404d69ec06ba4de73d09a8b10a62317317d67e81e48d05
-  data.tar.gz: 5aac295a3314a04544c26dae80f9e5d5dc3acec2952234f69278da81b80d43ddd53ad92f67415c810238abbc6afe99a38bb246cd6bc5b3c0b5180b380569bee4
+  metadata.gz: 61019834b793cd3db0dad4c5d3be5eadde1647cd37f6a604e78832dc287bab795e6da3da2bb826d768d9ea2b565e1a7e1eec0e3ff02f545baa950b21aaaa5b4b
+  data.tar.gz: 5b16e5c117f62c53c9541bf930609e7d9b12403d14211fcf7c15e19bf8ff05444ced5993cba6b608a078eee9de639364ebf73fc0e7d30326940e5bff9bcf25d9

data.tar.gz.sig

@@ -1 +1 @@
-�����p��p��(�v��ݱ��Xb6ͬ~w������"(���(�\uVgcc'}���	嚄�5��:�_e�R�g1"cf
�{�Ƌ�$���Y^|W�e}^���*�r�2S��O�&�J_@��H�(w	���rú1��:�Yb����B�[xY6�;����ea�*2[J���֣Vĺ\��,Q\Np�����H
ti�a"QSd�C'<�z�^"�2p�_6� �Ÿ:��4F'�=�׍H]��8N�[��c��Ue
+3*4�hW���:�e�;P���>DW�q,�G��WO˨W���>�߶�B܎
�1�[�,��a�e����wPRD�W�����/��J�E[����)���Yȶ��uV��u�a��ϋ/ɭRxig�dT���.j���q{򄦤��Eo�`�}�>���G�

data/lib/myoutline.rb

@@ -11,142 +11,200 @@ require 'md_edit'
 
 class MyOutline
   
-  attr_reader :pxi, :links
+  attr_reader :outline
   attr_accessor :md
+  
+  class Outline
+    using ColouredText
+    
+    attr_reader :ftx, :links, :pxi
+    
+    def initialize(source, debug: false, allsorted: true, autoupdate: true)
+      
+      @debug, @source = debug, source
+      @allsorted, @autoupdate = allsorted, autoupdate
+      
+      build_index(source)
+
+    end
+    
+    def autosave(s=nil)
+      
+      puts ('inside autosave ; @autoupdate: ' + @autoupdate.inspect).debug if @debug
+      
+      if @autoupdate then
+        puts 'before save'.info if @debug
+        save() if s.nil? or self.to_s != s      
+      end
+      
+    end
+
+    def build_html(&blk)
+      @pxi.build_html(&blk)
+    end
+    
+    def locate(s)
+      @links.locate s
+    end
+      
+    def ls(path='.')
+      @ftx.ls(path).map(&:to_s)
+    end    
+    
+    def save(filename=nil)
+      
+      if filename.nil? then
+        filename = RXFHelper.writeable?(@source) ? @source : 'myoutline.txt'
+      end
+    
+      RXFHelper.write filename, self.to_s(declaration: true)
+      
+    end    
+    
+    def to_px()
+      @pxi.to_px
+    end
+    
+    def to_s(declaration: false)
+      
+      if declaration == true then
+        @pxi.to_s.sub(/(?<=^\<\?)([^\?]+)/,'myoutline')
+      else
+        @pxi.to_s.lines[1..-1].join.lstrip
+      end
+      
+    end    
+    
+    def to_tree
+      format_tree(alphabet: true, nourl: true)
+    end
+    
+    def to_treelinks
+      format_tree()
+    end    
+    
+    private
+    
+    def build_index(s)
+      
+      @pxi = PxIndex.new(debug: @debug, indexsorted: @indexsorted, 
+                         allsorted: @allsorted)
+      @pxi.import s
+      autosave(s)
+      read(self.to_treelinks)
+      
+    end
+
+    def format_tree(alphabet: false, nourl: false)
+      
+      a  = @pxi.to_s.lines
+      a.shift # remove the ph declaration
+      a.reject! {|x| x =~ /^(?:#[^\n]+|\n+)$/} unless alphabet
+      
+      if nourl then
+        # strip out the URLS?
+        a.map! {|x| r = x[/^.*(?= # )/]; r ? r + "\n" : x }
+      end
+      
+      a.join
+      
+    end      
 
-  def initialize(source, debug: false, allsorted: true, 
-                 autoupdate: true, topic_url: '$topic', md_path: '.')
+    def read(s)
+      
+      @links = PolyrexLinks.new.import(s, debug: @debug)
+      
+      s3 = s.lines.map {|x| x.split(/  | # /,2)[0]}.join("\n")
+      @ftx = FileTreeXML.new(s3, debug: @debug)    
+      
+    end    
+
+  end
+
+  def initialize(source, debug: false, allsorted: true, autoupdate: true, 
+                 topic_url: '$topic', md_path: '.', default_md: 'main.md')
     
-    @debug, @source, @topic_url = debug, source, topic_url
-    @allsorted, @autoupdate, @md_path = allsorted, autoupdate, md_path
+    @debug, @topic_url = debug, topic_url
+    @md_path = md_path
+    @default_md = default_md
+    @allsorted, @autoupdate = allsorted, autoupdate
 
-    raw_s, _ = RXFHelper.read(source)
-    build_index(raw_s)
+    @outline = Outline.new(source, debug: debug, 
+                           allsorted: allsorted, autoupdate: autoupdate)
 
   end
   
   def fetch(uri)
 
-    s, remaining = @links.locate uri
+    s, remaining = @outline.locate(uri)
     puts 'fetch() s: ' + s.inspect if @debug
     redirect = s =~ /^\[r\] +/i
     return s if redirect 
     
+    s ||= @default_md; remaining ||= ''
+    
     f = File.join(@md_path, s)
     puts 'f: ' + f.inspect if @debug
     @md = MdEdit.new f, debug: @debug
     r = edit(remaining.sub(/^\//,'').gsub(/\//,' > '))    
-    puts 'r: ' + r.inspect if @debug
+    puts 'fetch() r: ' + r.inspect if @debug
     @md.update r
     
     r
   end
-
-  
-  def ls(path='.')
-    @ftx.ls(path).map(&:to_s)
-  end
   
   def rebuild(s)
-    build_index(s)
+    @outline = Outline.new s
   end
   
   def update(section)
     @md.update section
-  end
+  end  
   
-  def save(filename=nil)
+  def update_tree(s)
     
-    if filename.nil? then
-      filename = RXFHelper.writeable?(@source) ? @source : 'myoutline.txt'
-    end
-  
-    RXFHelper.write filename, self.to_s(declaration: true)
+    mo2 = Outline.new(s, debug: @debug, 
+                           allsorted: @allsorted, autoupdate: @autoupdate)
     
-  end
-  
-  def to_html()
-
-    px = self.to_px
+    h = @outline.links.to_h
+    links = mo2.links
     
-    px.each_recursive do |x, parent|
+    mo2.links.to_h.each do |title, file|
       
-      if x.is_a? Entry then
-        
-        trail = parent.attributes[:trail]
-        s = x.title.gsub(/ +/,'-')
-        x.attributes[:trail] = trail.nil? ? s : trail + '/' + s
-        
+      if @debug then
+        puts 'title: ' + title.inspect
+        puts 'h[title]: ' + h[title].inspect
       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|      
-      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(/ +/,'-')
+     links.link(title).url = h[title] if h[title]
     end
     
-    doc.xml(pretty: true)
+    puts 'before Outline.new: ' + links.to_s(header: false).inspect if @debug
     
+    @outline  = Outline.new(links.to_s(header: false), debug: @debug, 
+                           allsorted: @allsorted, autoupdate: @autoupdate)
+    @outline.autosave
   end
   
-  def to_px()
-    @pxi.to_px
-  end
-  
-  def to_s(declaration: false)
+  def to_html()
     
-    if declaration == true then
-      @pxi.to_s.sub(/(?<=^\<\?)([^\?]+)/,'myoutline')
-    else
-      @pxi.to_s.lines[1..-1].join.lstrip
-    end
+    @outline.build_html do |e|
+      
+      e.attributes[:href] = @topic_url.sub(/\$topic/, e.text)\
+          .sub(/\$id/, e.attributes[:id]).sub(/\$trail/, e.attributes[:trail])\
+          .to_s.gsub(/ +/,'-')      
+      
+    end    
     
   end
   
-  
-  def to_tree
-    format_tree(alphabet: true, nourl: true)
+  def to_s()
+    @outline
   end
   
-  def to_treelinks
-    format_tree()
-  end
   
   private
   
-  def build_index(raw_s)
-    
-    # find the entries which aren't on the main index
-    s = raw_s.sub(/<[^>]+>\n/,'')
-    doc = LineTree.new(s, debug: @debug).to_doc(encapsulate: true)
-    a = doc.root.xpath('entry/text()')
-    puts 'doc: ' + doc.xml if @debug
-    a2 = doc.root.xpath('entry//entry/text()')
-    puts 'a2: ' + a2.inspect if @debug
-    a3 = a2 - a
-    puts 'a3:' + a3.inspect if @debug
-    
-    # add the new entries to the main index
-    s << "\n" + a3.join("\n")
-
-    s.prepend '<?ph schema="entries/section[heading]/entry[title, url]"?>
-
-    '
-    
-    @pxi = PxIndex.new(s, debug: @debug, indexsorted: true, 
-                       allsorted: @allsorted)
-    save() if @autoupdate and self.to_s != raw_s    
-    read(self.to_treelinks)
-  end
-  
   def edit(s)
 
     r = @md.find s
@@ -164,77 +222,7 @@ class MyOutline
 
     end
 
-  end    
-  
-  def format_tree(alphabet: false, nourl: false)
-    
-    a  = @pxi.to_s.lines
-    a.shift # remove the ph declaration
-    a.reject! {|x| x =~ /^(?:#[^\n]+|\n+)$/} unless alphabet
-    
-    if nourl then
-      # strip out the URLS?
-      a.map! {|x| r = x[/^.*(?= # )/]; r ? r + "\n" : x }
-    end
-    
-    a.join
-    
-  end  
-  
-  def read(s)
-    @links = PolyrexLinks.new.import(s, debug: @debug)
-    
-    s3 = s.lines.map {|x| x.split(/  | # /,2)[0]}.join("\n")
-    @ftx = FileTreeXML.new(s3, debug: @debug)    
   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.2
+  version: 0.5.1
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMzE2MDkzNzMyWhcN
-  MTkwMzE2MDkzNzMyWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmw8ez
-  0Fu54YodAyszPu1V/4n713Kj/PpK0ljLndPpYve04yZLTznWIgklk2iRSDhj1eco
-  r94LZm7c4Ev6nYqF5AGOcZRJE0/TbeOc8YijW19+epvYZDRXzxQBtl5m3N2tMx7o
-  TRDg2LARgEaGo1muHpJUeaIMHv/zHQf7wBTY31Pi/t6qE9GPlQzoDW5newihQ6PR
-  QgzHQaRgLW8JIjBi0b6EQjFC8MpXg+ZhLsgYPw+xqlLMrLyB9m02SqimIbek3hIF
-  Jy2kX+AOuQQ9dh+LRMdBLHHJyoIJk7CflwtpRNhsu/IaoDmoVgP0tqZo7R1IjTAi
-  S5l2XkJ/L4wuOtZDAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFMS1Y3RLQL7dg3mw6LVqg3BU4czgMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAJc2Wd+jJiB8pdwroE2e
-  cQCovaJIZnyK4FbTpOevdokOI2im0t2r6lhWhCQFRewbo4LX/XGGt22Z+5y5rT7q
-  1R18u75twc1BeZ4NkQYXoNVEbjPLndGEe9LCVEUYb2TWY0JsJ1IiqFVMpdf1Gz6k
-  abi7w/9EcIXEVg+GCgCgZdGbsL3bNBAfLzBMXrJQMigHa6fjfXHgNUKjoZDPTtk/
-  Y22/SEiQpELwc2kK/U150X4UGs9JmwI+9QkXXYYcld4S1SueK8gkqzS/FJ+fzdzT
-  DFhc5TDtqEkJYiaiznQFl34HUKeCAdeAHkmD8jP3fUC8O7zcLXq69EAXGMXw4efB
-  3Co=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwMTA4MTM1NDM1WhcN
+  MjIwMTA4MTM1NDM1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCg/byP
+  AZ1IfLIwdQfw1TvXxSqjjTOz2UELa3OXzT0+Q+i71FCh6+1jaIRY8BZfZ16MbSCr
+  93KtUGnvFbbmhMFWbm7Nbjv/BnnUXRGUZpjDLb90eV0AQmKhBbZ2mdvwF7Z6srSr
+  rnZ7U6o0EHqPCD+N9yD/DxUNhAC+LlFILVVBSXxqdKjOmV9Y1kG8GVvVf91uAe62
+  KuPvsnFR653yrvgKm46zgtmPkHbaCv9lbsjnT5N4EJumFeU2//B3jDn90KrPkbvK
+  +WT165y1iiulLuB2MI9feJvydUmHSmqO1OqFc4/5Ru0WO4nHPunt1EqbUY1XpLsK
+  JjKniI1706CxO9UyliQzbUx5j+IDPL9pldTATEpQKjcNAU0ocF45yo6ToSFSvar3
+  Fsc5JBJtTFdU9Jk64Lx1aO0PNmDKoFXFxk3FxZMfGNtscL4Ea8D8mS7JZRrDWZp2
+  kmkchqxsDxDN5LOQfnnoPNbR0Dxlx7BxfekinuxwB9yMlNQ5OW6xyNep8WkCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU46mMtONZ
+  ledzG9BdAwRk7f+anCUwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAJp3p1feQpxjMF/yXfb0CCcm9C4Yp243TjAf/ABgg
+  ANbrjPCcBmz3RWutZp/vXKaZ6uXmynWEfSYYryxWLux96mW7z/4g96L89xELSC3V
+  jj/o73UCMl2iN47zoe30HyQuVVFiAuiQlJvOkCaDzx+jFehw9SUttOHCEA/Synhs
+  XG+/ClCD0XGZel9roxo2adUZ/Rrhw+UYRHepS4ghRK2JXA523gAJqZZZi9Ou+qhx
+  iBtn22ypXSG+PFnJ+8m+HgRuUQhw3vwBPtSxgdPotAKnxvCmD4jrTGPNR/f0g5ia
+  YXxFLjCYQxtL4W0zCGNAorMl3OejJjxP63JO3jf4CyKPHT9ePYK486zYPbeMGMY6
+  PDihRV0tIV6bPPDEZmUX/a+tpncZR/nCGd8DQMZ4QDxlKnxEWtnq5kEhRi8HLUJD
+  RmpF1GU3b1rykHbNgsw/QI2gfMShVh2f1zceczUFr0SXwGzS0YYRpZoi4qyjgKeb
+  6srwVtKTp+GTywnYzfiE5J4u
   -----END CERTIFICATE-----
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pxindex
@@ -38,20 +43,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -96,22 +101,22 @@ dependencies:
   name: polyrex-links
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: md_edit
   requirement: !ruby/object:Gem::Requirement
@@ -158,8 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Helps build an outline from plain text.