reminders_txt 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7833e42aea7e1c22ce822a700b512ce739bda483
-  data.tar.gz: 47908e11f918d4d85f429d24e58f3bd8ca3cb05e
+  metadata.gz: f5f2a37608ad9d46e3adcc3a01d5008cf8e77231
+  data.tar.gz: 75a75d8bcedea94551146b8ea767c27c1abe1237
 SHA512:
-  metadata.gz: ced8f17dd7096cfe9b7d92a1925ad3c9257f3c5f4a707242d1d7efbf0926abd0faf471ee30288104bc953ff994c267b2587896f8397fd55caba909958b680e0e
-  data.tar.gz: 329aba39a779adfa91c9eb0e98e9192023b9ec0452e73bfbfa5e6a2f2e3f555a7ce9368046a99b6d76c1180fa736b6ccb498104fedc6a5e1f98ace2e41f54c24
+  metadata.gz: 46744e545870d608e9867f8eafd29e3525e8e987773a1db0f7a3beffd3e959fc5e6560ac78f98269727704935fe6537f2b9f949d8096aa2fe0d2f2946bf69c04
+  data.tar.gz: 291ce8551dd33f96a87de068e9024ca6f12675db65645fecada3cc0bc10f7de95d486371a69d2a49af788779629207e1f7508d1bb3ae53584dad343cd0106a4d

data/lib/reminders_txt.rb

@@ -5,6 +5,7 @@
 
 require 'dynarex'
 require 'app-routes'
+require 'digest/md5'
 require 'chronic_cron'
 
 
@@ -26,25 +27,26 @@ class RemindersTxt
   
   attr_reader :expressions
   
-  def initialize(s, now: Time.now, dxfilepath: 'reminders.xml')
+  def initialize(filename='reminders.txt', now: Time.now, dxfilepath: 'reminders.xml')
     
-    @raw_input = s
+    
+    s = File.read filename
+    @file_contents, @filename = s, filename
     @now = now
     
-    Dir.chdir File.dirname(dxfilepath) if dxfilepath
+    Dir.chdir File.dirname(filename)
     
     @dxfilepath = dxfilepath
     
     super()
-    @params = {input: s}
+    @params = {}
     expressions(@params)
-    buffer = s[2..-1]
+    buffer = s.lines[2..-1]
 
     @reminders = buffer.inject([]) do |r, x|  
       if (x.length > 1) then
         @params[:input] = x.strip
         rx = find_expression(x) 
-        rx.input = x.strip
         r << rx
       end
       r
@@ -53,7 +55,7 @@ class RemindersTxt
     update()
   end
   
-  def create_dx()
+  def save_dx()
     
     dx = Dynarex.new('reminders/reminder(input, title, recurring, date, end_date)')
     @reminders.each {|x| dx.create x.to_h}
@@ -67,36 +69,50 @@ class RemindersTxt
        x.date = x.date.is_a?(Time) ? x.date : Chronic.parse(x.date)
        x
     end
-     
+
     # synchronise with the XML file
     # if XML file doesn't exist, create it
     
     if File.exists? @dxfilepath then
-      
+
       dx = Dynarex.new @dxfilepath
       
       @reminders.map do |reminder|
         
         r = dx.find_by_input reminder.input
-        reminder.date = Date.parse r.date
+        reminder.date = r ? Date.parse(r.date) : reminder.date.to_date
         
         reminder
       end
-      
-    else
-      create_dx()
+            
     end
-    
 
     # delete expired non-recurring reminders
     @reminders.reject! {|x|  x.date.to_time < @now }
     
     @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 
+
+    end
+    
+    [:refresh, b]
+        
   end
   
   def to_s()
-    @raw_input[0..2].join + @reminders.map(&:input).join("\n")
+    @file_contents.lines[0..2].join + @reminders.map(&:input).join("\n")
   end
   
   alias update refresh
@@ -122,10 +138,15 @@ class RemindersTxt
       
       if recurring =~ /day|week/ then
         
-        earlier_date = Chronic.parse(date)
-        new_date = CronFormat.new(ChronicCron.new(recurring).to_expression, earlier_date).to_time
-        input.gsub!(date, new_date.strftime("#{new_date.day.ordinal} %b %Y"))        
-        date = new_date
+        start_date = Chronic.parse(date)
+        
+        if start_date <= @now then
+          
+          new_date = CronFormat.new(ChronicCron.new(recurring).to_expression, start_date).to_time
+          input.gsub!(date, new_date.strftime("#{new_date.day.ordinal} %b %Y"))        
+          date = new_date
+          
+        end
       end
       
 
@@ -137,21 +158,21 @@ class RemindersTxt
     # some meeting First thursday of the month at 7:30pm
     get /(.*)\s+(\w+ \w+day of (?:the|every) month at .*)/ do |title, recurring|
       
-      OpenStruct.new input: '', title: title, recurring: recurring
+      OpenStruct.new input: params[:input], title: title, recurring: recurring
       #[1, title, recurring].inspect
     end        
  
     # some important day 24th Mar
     get /(.*)\s+(\d+.*)/ do |title, date|
       
-      OpenStruct.new input: '', title: title, date: date
+      OpenStruct.new input: params[:input], title: title, date: date
       #[2, title, date].inspect
     end
     
     # 27-Mar@1436 some important day
     get /(\d[^\s]+)\s+(.*)/ do |date, title|
 
-      OpenStruct.new input: '', title: title, date: date
+      OpenStruct.new input: params[:input], title: title, date: date
       #[3, title, date].inspect
     end    
     
@@ -166,4 +187,4 @@ class RemindersTxt
   
   alias find_expression run_route
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reminders_txt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson