myoutline 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdaac78cb5087754de66fe05c22dd070d6cdb9f7
-  data.tar.gz: a62c01bd4784c867d40538c68683c41129c545a3
+  metadata.gz: 8a3df25ba19223d3630612441c9c157b05b0b1aa
+  data.tar.gz: f1e325e49cd1f8a16215f446b712dd94b5367b47
 SHA512:
-  metadata.gz: 21906e0f2104bb483a7bac41235b2a91597cefd49a553ccd09a25a863db05bbaf40b3f89e2e5842aa271d0bc3078dc696281b198393c0870da27eba9911e395b
-  data.tar.gz: cf931109ea97b3c9fb92793693e6292b3164fa9b725592edbfb965d3b25a7624de46a9958cf9e6acbbd4d4dd1827b213ef6f32e2d97bcba76a1736537868f953
+  metadata.gz: b108ce8f581ae7be0eba62ea3246bdbaa85703acdb4a2f6443ae869bc2dc7c2725b056dafeb6e5623e06e0dbfa59a9963167c312d2898dbac474b8381d09e803
+  data.tar.gz: 954539f6c9df906323a4a072bfcc02a784459ce6e183e602a0b592c04f59ced91c22b33401131826e089f08adcd228885239e8decf4601e287a37c1ccc665818

data/lib/myoutline.rb

@@ -11,24 +11,127 @@ require 'md_edit'
 
 class MyOutline
   
-  attr_reader :pxi, :links
+  attr_reader :outline
   attr_accessor :md
+  
+  class Outline
+    
+    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 if @debug
+      
+      if @autoupdate then
+        puts 'before save' if @debug
+        save() if s.nil? or self.to_s != s      
+      end
+      
+    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 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 
@@ -39,33 +142,43 @@ class MyOutline
     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)
+    
+    mo2 = Outline.new(s, debug: @debug, 
+                           allsorted: @allsorted, autoupdate: @autoupdate)
     
-    if filename.nil? then
-      filename = RXFHelper.writeable?(@source) ? @source : 'myoutline.txt'
+    h = @outline.links.to_h
+    links = mo2.links
+    
+    mo2.links.to_h.each do |title, file|
+      
+      if @debug then
+        puts 'title: ' + title.inspect
+        puts 'h[title]: ' + h[title].inspect
+      end
+      
+     links.link(title).url = h[title] if h[title]
     end
-  
-    RXFHelper.write filename, self.to_s(declaration: 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_html()
@@ -100,39 +213,9 @@ class MyOutline
     
   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: true, allsorted: @allsorted)
-    @pxi.import s
-    save() if @autoupdate and self.to_s != s    
-    read(self.to_treelinks)
-  end
-  
   def edit(s)
 
     r = @md.find s
@@ -150,30 +233,6 @@ 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()

metadata

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