reminders_txt 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4386e9d7d9e6263ecbe4143ac790eb5af542f6a
-  data.tar.gz: 985174c50753c0bc67ab75836dc89339f5bf2a8c
+  metadata.gz: 1092a4de1fbdc34444d6d9dcb92bea5e4fbf73d4
+  data.tar.gz: 5f1f05c6a3c8b8d0b744c39b14cdae771f24eb5b
 SHA512:
-  metadata.gz: b57665a159e8bdf3c1f110451168c8c8cc7bdad0c468e6f564681b8d0e5ae2e68b1396c50688187f0e006a94c04e8d54f89ffa4e1cb3b5725b51f748ee6aed86
-  data.tar.gz: 72453bcca75aa687f7942d458a64c0c441812574d6c42e24e750f745f6ab9aa18cbebd61dd7f969508a3b90273eefee8e55cffbf7261d49466d0b1c373f7ffed
+  metadata.gz: e2a84c28265f0c7e9c038927e4e0aafde74a6f625797efb24397ed6148ea6d0990754420bc2c82c55e2a3b11514c009b7651121f990e9b40aae7f319aa0a42f6
+  data.tar.gz: bd863d4f8fd03ec2bb558ed0190c88d938936c0939b81926570130e1ca9940ba424fccc51eacbfe3afa7cc8e3e574af086451f6c19bc37fe66ba3d4c02aeb793

data/lib/reminders_txt.rb

@@ -27,101 +27,38 @@ class RemindersTxt
   
   attr_reader :reminders
   
-  def initialize(filename='reminders.txt', now: Time.now, 
-                 dxfilepath: 'reminders.xml')
-    
-    
-    s = File.read filename
-    @file_contents, @filename = s, filename
-    @now = now
-    
-    Dir.chdir File.dirname(filename)
-    
-    @dxfilepath = dxfilepath
-    
-    super()
-    @params = {}
-    expressions(@params)
-    buffer = s.lines[2..-1]
+  def initialize(filepath='reminders.txt', now: Time.now)
 
-    @reminders = buffer.inject([]) do |r, x|  
-      if (x.length > 1) then
-        @params[:input] = x.strip
-        rx = find_expression(x) 
-        r << rx
-      end
-      r
-    end
-    
-    @updated = false
-    
-    update()
-  end
-  
-  def save_dx()
+    super()
     
-    dx = Dynarex.new(
-      'reminders/reminder(input, title, recurring, date, end_date)')
-    @reminders.each {|x| dx.create x.to_h}
-    dx.save @dxfilepath
+    @now = now    
+    @filepath = filepath
     
-  end
-  
-  def refresh()
-
-    # synchronise with the XML file
-    # if XML file doesn't exist, create it
-    
-    if File.exists? @dxfilepath then
-
-      dx = Dynarex.new @dxfilepath
-      
-      @reminders.each do |reminder|
-        s = reminder.input
-        r = dx.find_by_input s
-        
-        # it is on file and it's not an annual event?
-        # use the date from file if the record exists
-        
-        reminder.date = (r and not s[/\*$/]) ? Date.parse(r.date) : \
-                                                    reminder.date.to_date
-        
-      end
-            
+    if File.extname(filepath) == '.txt' then
+      import_txt(filepath)
+      refresh()
+    else
+      @dx = Dynarex.new filepath
     end
+  end
 
-    # delete expired non-recurring reminders
-    @reminders.reject! {|x|  x.date.to_time < @now if not x.recurring }
-    
-    @reminders.sort_by!(&:date)
-    
-
-    # did the reminders change?
-    
-    h1 = (Digest::MD5.new << self.to_s).to_s
-    h2 = (Digest::MD5.new << @file_contents).to_s
-
-    b = h1 != h2
-        
-    if b then
-      
-      save_dx()      
-      File.write @filename, self.to_s 
-      @updated = true
-    end
-    
-    [:refresh, b]
-        
+  def upcoming(ndays=5, days: ndays)
+    @dx.filter {|x| Date.parse(x.date) <= Date.today + days}
   end
+    
+  def updated?()
+    @updated
+  end  
   
   def to_s()
-    @file_contents.lines[0..2].join + @reminders.map(&:input).join("\n")
+
+    filename = File.basename(@filepath).sub(/\.xml$/, '.txt')
+    [filename,  '=' * filename.length, '', *@dx.all.map(&:input)].join("\n")
+
   end
   
-  alias update refresh
-  
-  def updated?()
-    @updated
+  def to_xml()
+    @dx.to_xml pretty: true
   end
     
   protected
@@ -238,4 +175,94 @@ class RemindersTxt
   
   alias find_expression run_route
   
+  private
+  
+  def import_txt(filepath)
+
+    s = File.read filepath
+    @file_contents, @filename = s, File.basename(filepath)
+    
+    #Dir.chdir File.dirname(filename)
+    
+    @dxfilepath = filepath.sub(/.txt$/,'.xml')
+    
+
+    @params = {}
+    expressions(@params)
+    buffer = s.lines[2..-1]
+
+    @reminders = buffer.inject([]) do |r, x|  
+      if (x.length > 1) then
+        @params[:input] = x.strip
+        rx = find_expression(x) 
+        r << rx
+      end
+      r
+    end
+    
+    @updated = false
+    
+    refresh()
+    
+  end
+  
+  # synchronise with the XML file and remove any expired dates
+  #
+  def refresh()
+
+
+    # if XML file doesn't exist, create it
+    
+    if File.exists? @dxfilepath then
+
+      @dx = Dynarex.new @dxfilepath
+      
+      @reminders.each do |reminder|
+        s = reminder.input
+        r = @dx.find_by_input s
+        
+        # it is on file and it's not an annual event?
+        # use the date from file if the record exists
+        
+        reminder.date = (r and not s[/\*$/]) ? Date.parse(r.date) : \
+                                                    reminder.date.to_date
+        
+      end
+            
+    end
+
+    # delete expired non-recurring reminders
+    @reminders.reject! {|x|  x.date.to_time < @now if not x.recurring }
+    
+    @reminders.sort_by!(&:date)
+    
+
+    # did the reminders change?
+    
+    h1 = (Digest::MD5.new << self.to_s).to_s
+    h2 = (Digest::MD5.new << @file_contents).to_s
+
+    b = h1 != h2
+        
+    if b then
+      
+      save_dx()      
+      File.write @filename, self.to_s 
+      @updated = true
+    end
+    
+    [:refresh, b]
+        
+  end  
+  
+  def save_dx()
+    
+    @dx = Dynarex.new(
+      'reminders/reminder(input, title, recurring, date, end_date)')
+    @reminders.each {|x| @dx.create x.to_h}
+    @dx.save @dxfilepath
+    
+  end
+  
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reminders_txt
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   n+SSd9dm8JjhZ2pqHtX+bgMZ18hrN06xfR+UPtk5BKC8v1PC0FWxaVR4lom39rFU
   seDxJNsJgamAKg==
   -----END CERTIFICATE-----
-date: 2016-11-19 00:00:00.000000000 Z
+date: 2016-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex