reminders_txt 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5f2a37608ad9d46e3adcc3a01d5008cf8e77231
-  data.tar.gz: 75a75d8bcedea94551146b8ea767c27c1abe1237
+  metadata.gz: 4f20103f70752f7787daa661d392a2ae68ba5cb0
+  data.tar.gz: 2e3572e91d46a26858a81f62a88440d13d0d2767
 SHA512:
-  metadata.gz: 46744e545870d608e9867f8eafd29e3525e8e987773a1db0f7a3beffd3e959fc5e6560ac78f98269727704935fe6537f2b9f949d8096aa2fe0d2f2946bf69c04
-  data.tar.gz: 291ce8551dd33f96a87de068e9024ca6f12675db65645fecada3cc0bc10f7de95d486371a69d2a49af788779629207e1f7508d1bb3ae53584dad343cd0106a4d
+  metadata.gz: f40d167ca858715279d9a216b3e45c079bd50a06c844e018e7dcba7d04b1ede53375921721b5c5425ba12d54b7c6b8cdfd091527e4ac3c06accc1d6ebe644352
+  data.tar.gz: ef0292802c578f9ccb68854e89f853c5def2e23bf9e443c6ead347a50ea608514a022e28510a210d7a748fef9a707efd56d8a3def283221722b2edd0085d4763

data/lib/reminders_txt.rb

@@ -65,10 +65,10 @@ class RemindersTxt
   
   def refresh()
     
-    @reminders.map! do |x|
-       x.date = x.date.is_a?(Time) ? x.date : Chronic.parse(x.date)
-       x
-    end
+    #@reminders.map! do |x|
+    #   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
@@ -78,9 +78,11 @@ class RemindersTxt
       dx = Dynarex.new @dxfilepath
       
       @reminders.map do |reminder|
+        s = reminder.input
+        r = dx.find_by_input s
         
-        r = dx.find_by_input reminder.input
-        reminder.date = r ? Date.parse(r.date) : reminder.date.to_date
+        # it is on file and it's not an annual event?
+        reminder.date = (r and not s[/\*$/]) ? Date.parse(r.date) : reminder.date.to_date
         
         reminder
       end
@@ -132,25 +134,26 @@ class RemindersTxt
     starting = /(?:\(?\s*starting (\d+\w{2} \w+\s*\w*)(?: until (.*))?\s*\))?/
 
     get /^(.*)(every \w+ \w+(?: at (\d+am) )?)\s*#{starting}/ do \
-                                                |title, recurring, time, date, end_date|
+                                                |title, recurring, time, raw_date, end_date|
       
       input = params[:input]
       
+      d = Chronic.parse(raw_date)
+      
       if recurring =~ /day|week/ then
+                
         
-        start_date = Chronic.parse(date)
-        
-        if start_date <= @now then
+        if d < @now then
           
-          new_date = CronFormat.new(ChronicCron.new(recurring).to_expression, start_date).to_time
+          new_date = CronFormat.new(ChronicCron.new(recurring).to_expression, d).to_time
           input.gsub!(date, new_date.strftime("#{new_date.day.ordinal} %b %Y"))        
-          date = new_date
+          d = new_date
           
         end
       end
       
 
-      OpenStruct.new input: input, title: title, recurring: recurring, date: date, end_date: end_date
+      OpenStruct.new input: input, title: title, recurring: recurring, date: d, end_date: end_date
       #[0, title, recurring, time, date, end_date].inspect
     end
     
@@ -163,16 +166,29 @@ class RemindersTxt
     end        
  
     # some important day 24th Mar
-    get /(.*)\s+(\d+.*)/ do |title, date|
+    get /(.*)\s+(\d+[^\*]+)(\*)?/ do |title, raw_date, annualar|
+
+      d = Chronic.parse(raw_date)
       
-      OpenStruct.new input: params[:input], title: title, date: date
+      if annualar and d < @now then
+        d = Chronic.parse(raw_date, now: Time.local(@now.year + 1, 1, 1)) 
+      end
+
+      OpenStruct.new input: params[:input], title: title, date: d
       #[2, title, date].inspect
     end
     
     # 27-Mar@1436 some important day
-    get /(\d[^\s]+)\s+(.*)/ do |date, title|
+    get /(\d[^\s]+)\s+([^\*]+)(\*)?/ do |raw_date, title, annualar|
 
-      OpenStruct.new input: params[:input], title: title, date: date
+      d = Chronic.parse(raw_date)
+      
+      if annualar and d < @now then
+        d = Chronic.parse(raw_date, now: Time.local(@now.year + 1, 1, 1)) 
+      end
+      
+      
+      OpenStruct.new input: params[:input], title: title, date: d
       #[3, title, date].inspect
     end    
     

metadata

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