myoutline 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8258400ef4430aa04a5ec1fca4cc3580f4fba368
-  data.tar.gz: cd2343be059248a0295224b94e401c6135b7899b
+  metadata.gz: bba6a21b45a42f6e257c31fef82d4ab2a20803fb
+  data.tar.gz: 2d7add1ea6c98c095fcd353ed45dabdcfddcdbe9
 SHA512:
-  metadata.gz: 46f86265c6d89cd9c40a6ab6018c65fea6955f74d67ae3541b8d394e7d7c01d9f1876e16f2d9d37260915544df392100e9373ac8dc4608e446eecf2817850766
-  data.tar.gz: bc7c29638ef35efbaab31724ab2ad1560c6900235930561a3f3cbb4c5ef613bdfae4a913ce8eff36789eafe122b491780a619380d86c6d102fd584c2ec535f43
+  metadata.gz: 5d09c61a8fa9570988404c147695a6949fb0d5364d33d3773bf0714a87cf5a1330293061e1c8bd79074a8d793262e52a91e2b26ea810013b59bc0890aba5a187
+  data.tar.gz: 3a3284c309886933e13b64dffa28c3c823fdc3c27b0debd08b35e203e447bb927b24112def5c3a60b6a2c5b7ddce605098d6015902d255d71ea7dcf7838c3b52

data/lib/myoutline.rb

@@ -7,14 +7,21 @@ require 'pxindex'
 
 class MyOutline
 
-  def initialize(raw_s, debug: false, allsorted: true)
+  def initialize(source, debug: false, allsorted: true, autoupdate: true)
+    
+    @debug, @source = debug, source
 
+    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")
@@ -25,16 +32,38 @@ class MyOutline
     
     @pxi = PxIndex.new(s, debug: debug, indexsorted: true, 
                        allsorted: allsorted)
-    @px = @pxi.to_px
+    save() if autoupdate and self.to_s != raw_s
 
   end
   
-  def save(filename=myoutline.txt)
-    File.write filename, @pxi.to_s
+  def save(filename=nil)
+    
+    if filename.nil? then
+      filename = RXFHelper.writeable?(@source) ? @source : 'myoutline.txt'
+    end
+  
+    RXFHelper.write filename, self.to_s
+    
+  end
+  
+  def to_s(declaration: true)
+    
+    if declaration == true then
+      @pxi.to_s.sub(/(?<=^\<\?)([^\?]+)/,'myoutline')
+    else
+      @pxi.to_s.lines[1..-1].join.lstrip
+    end
+    
   end
   
-  def to_s()
-    @pxi.to_s
+  def to_tree
+    
+    a  = @pxi.to_s.lines
+    a.shift # remove the ph declaration
+    a.reject! {|x| x =~ /^(?:#[^\n]+|\n+)$/}
+    
+    a.join
+    
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myoutline
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   DFhc5TDtqEkJYiaiznQFl34HUKeCAdeAHkmD8jP3fUC8O7zcLXq69EAXGMXw4efB
   3Co=
   -----END CERTIFICATE-----
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pxindex
@@ -41,7 +41,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.6
 description: 
 email: james@jamesrobertson.eu
 executables: []