myoutline 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 752b310a3ffc4f555e366c6a4b0f82a2377873b1
-  data.tar.gz: 7fb8965d9a4f5516f012cfbfe053f374c48c17f6
+  metadata.gz: efb9af4d7dcfa27f317ee3d832df291e617c10f0
+  data.tar.gz: eb9f2b405e4cc0d4a8a8eea37ef7a477917060dc
 SHA512:
-  metadata.gz: 2da3cacae84e95865054d059430f03810092841ec1ba4b925e85874623cdb4bc99bc17e9f8d6548879178810af509a8057c7f84651d792bc2e4c342acdc01441
-  data.tar.gz: 78906df6f38baae13d4b3482747ae3a204e0cc05e0e984b63884dca8e3f20de11d1de044e7e481d3ee01925e34122d5171dbc74e07a7a7e110164b6841b1bd37
+  metadata.gz: 6ff486f872144eecafa450529d20e034cfa72fb61de51b723e040ee71d458b1cdc7f6de7befd28fc8b362613f527dbb878b63af0bbf227833b7f37a772e45a18
+  data.tar.gz: f13de27b4ded08cad7452b1063c8ab0b67e853c10698516f495a0b6b362de572e1afbc56a952690b3b57cf4348fa406594d0535afd4cb1a195fabc75e37ba0b7

data/lib/myoutline.rb

@@ -4,40 +4,42 @@
 
 require 'pxindex'
 require 'nokogiri'
+require 'filetree_xml'
+require 'polyrex-links'
+
 
 
 class MyOutline
   
-  attr_reader :pxi
+  attr_reader :pxi, :links
 
   def initialize(source, debug: false, allsorted: true, 
                  autoupdate: true, topic_url: '$topic')
     
-    @debug, @source, @topic_url = debug, source, topic_url
+    @debug, @source, @topic_url, @allsorted, @autoupdate = debug, source, 
+        topic_url, allsorted, autoupdate
 
     raw_s, _ = RXFHelper.read(source)
-    
-    # find the entries which aren't on the main index
-    s = raw_s.sub(/<[^>]+>\n/,'')
-    doc = LineTree.new(s, debug: true).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 << a3.join("\n")
+    build_index(raw_s)
 
-    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
+  end
+  
+  def fetch(uri)
 
+    s, remaining = @links.locate uri
+    puts 'fetch() s: ' + s.inspect if @debug
+    redirect = s =~ /^\[r\] +/i
+    return s if redirect 
+    
+    # md_edit goes here
+    contents, _ = RXFHelper.read(s)
+    
+    return contents
+  end  
+  
+  def ls(path='.')
+    @ftx.ls(path).map(&:to_s)
   end
   
   def save(filename=nil)
@@ -96,18 +98,63 @@ class MyOutline
     
   end
   
-  def to_tree(alphabet: true)
+  
+  def to_tree
+    format_tree(alphabet: true, nourl: true)
+  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 << 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_s)
+  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
-    a.map! {|x| r = x[/^.*(?= # )/]; r ? r + "\n" : x } # strip out the URLS
+    
+    if nourl then
+      # strip out the URLS?
+      a.map! {|x| r = x[/^.*(?= # )/]; r ? r + "\n" : x }
+    end
     
     a.join
     
-  end
+  end  
   
-  private
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myoutline
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   DFhc5TDtqEkJYiaiznQFl34HUKeCAdeAHkmD8jP3fUC8O7zcLXq69EAXGMXw4efB
   3Co=
   -----END CERTIFICATE-----
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pxindex
@@ -72,6 +72,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.2
+- !ruby/object:Gem::Dependency
+  name: filetree_xml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: polyrex-links
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  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
 description: 
 email: james@jamesrobertson.eu
 executables: []