myoutline 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c4004c2ecb1afce40d2b3aa042578578bebba47
-  data.tar.gz: 0b56c3f9048ca5d40819ed1d96e795f854da0cb9
+  metadata.gz: fdaac78cb5087754de66fe05c22dd070d6cdb9f7
+  data.tar.gz: a62c01bd4784c867d40538c68683c41129c545a3
 SHA512:
-  metadata.gz: f6c0f793663fe9d98428f9e460347903031edbddde7731aa7f077aae511a1b8ff58f4407bce6930af2404d69ec06ba4de73d09a8b10a62317317d67e81e48d05
-  data.tar.gz: 5aac295a3314a04544c26dae80f9e5d5dc3acec2952234f69278da81b80d43ddd53ad92f67415c810238abbc6afe99a38bb246cd6bc5b3c0b5180b380569bee4
+  metadata.gz: 21906e0f2104bb483a7bac41235b2a91597cefd49a553ccd09a25a863db05bbaf40b3f89e2e5842aa271d0bc3078dc696281b198393c0870da27eba9911e395b
+  data.tar.gz: cf931109ea97b3c9fb92793693e6292b3164fa9b725592edbfb965d3b25a7624de46a9958cf9e6acbbd4d4dd1827b213ef6f32e2d97bcba76a1736537868f953

data/lib/myoutline.rb

@@ -14,11 +14,12 @@ class MyOutline
   attr_reader :pxi, :links
   attr_accessor :md
 
-  def initialize(source, debug: false, allsorted: true, 
-                 autoupdate: true, topic_url: '$topic', md_path: '.')
+  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
+    @default_md = default_md
 
     raw_s, _ = RXFHelper.read(source)
     build_index(raw_s)
@@ -27,11 +28,13 @@ class MyOutline
   
   def fetch(uri)
 
-    s, remaining = @links.locate uri
+    s, remaining = @links.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
@@ -122,28 +125,11 @@ class MyOutline
   
   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
+  def build_index(s)
     
-    # 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    
+    @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
   
@@ -182,10 +168,12 @@ class MyOutline
   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.2
+  version: 0.4.3
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   DFhc5TDtqEkJYiaiznQFl34HUKeCAdeAHkmD8jP3fUC8O7zcLXq69EAXGMXw4efB
   3Co=
   -----END CERTIFICATE-----
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pxindex
@@ -38,20 +38,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.2.0
   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.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -98,20 +98,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: md_edit
   requirement: !ruby/object:Gem::Requirement