reminders_txt 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd44103bf515012691e2fff7378b81a326d9e08f
-  data.tar.gz: 7678b3c9318816e426fcc9dae236982a99cb35e7
+  metadata.gz: cdef8b14487344306d7c51cbca1b0c4762d84cca
+  data.tar.gz: 8a0834e882eff028e90948ee1578e6c47bd72eac
 SHA512:
-  metadata.gz: b48d45ea0f0f09c7587ca73ea1f1d1bfbc57cb9038598532ff0b25edd8547948301491f1776a55212a86b66ef42a1a8a4d62c0075d411a32e2939b4ef2e93f88
-  data.tar.gz: cd794f5ace08b52c1f5bab72d87a3d47acfd30c67e950fe79e91080e1e6ea54fc4b10cd02ba74bdf9c00972454a1bdf84d78a6aa3ed76bbbf4fc3a92dcf313ae
+  metadata.gz: 69c5d2c7f3d7894b3ab9092bebda0eef028ae0179f4574c89eda0b258ecc118b6088d046d53fc015302391340b3f70f38ac667373dc58003c0b83ea661a42d48
+  data.tar.gz: 3088b001e9cfa5aaaa13856f2265d1c2f862d1b49b992f74697dd56bf7e170a451353f9eccc9b9b75772cbab1052b21eb8cd91245f84e8a874e15e9ed69dbdf1

checksums.yaml.gz.sig

@@ -1,2 +1 @@
-V/�g�C��DHtb�fFWy��1�������9HW�%z�*�i6�+���	�a���gm]z�(�J�]#sH�h"g�>�<N�
1�?
-�q��6j��	2$�]N���{��4d�A�����Z6[@l�d��������vk|.6D�'ũ��b���F�=Y�>��l�գ,���B�7a�����Rx�\Tf
+u�L[�sU
n�I�j�N>$��6}��s5��F��܆���G��{�]���G�T��ʖ}

data/lib/reminders_txt.rb

@@ -25,9 +25,10 @@ class RemindersTxt
   include AppRoutes
   using Ordinals
   
-  attr_reader :expressions
+  attr_reader :reminders
   
-  def initialize(filename='reminders.txt', now: Time.now, dxfilepath: 'reminders.xml')
+  def initialize(filename='reminders.txt', now: Time.now, 
+                 dxfilepath: 'reminders.xml')
     
     
     s = File.read filename
@@ -59,7 +60,8 @@ class RemindersTxt
   
   def save_dx()
     
-    dx = Dynarex.new('reminders/reminder(input, title, recurring, date, end_date)')
+    dx = Dynarex.new(
+      'reminders/reminder(input, title, recurring, date, end_date)')
     @reminders.each {|x| dx.create x.to_h}
     dx.save @dxfilepath
     
@@ -74,22 +76,22 @@ class RemindersTxt
 
       dx = Dynarex.new @dxfilepath
       
-      @reminders.map do |reminder|
+      @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
+        reminder.date = (r and not s[/\*$/]) ? Date.parse(r.date) : \
+                                                    reminder.date.to_date
         
-        reminder
       end
             
     end
 
     # delete expired non-recurring reminders
-    @reminders.reject! {|x|  x.date.to_time < @now }
+    @reminders.reject! {|x|  x.date.to_time < @now if not x.recurring }
     
     @reminders.sort_by!(&:date)
     
@@ -137,7 +139,7 @@ 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, raw_date, end_date|
+                                   |title, recurring, time, raw_date, end_date|
       
       input = params[:input]
       
@@ -148,15 +150,18 @@ class RemindersTxt
         
         if d < @now then
           
-          new_date = CronFormat.new(ChronicCron.new(recurring).to_expression, d).to_time
-          input.gsub!(raw_date, new_date.strftime("#{new_date.day.ordinal} %b %Y"))        
+          new_date = CronFormat.new(ChronicCron.new(recurring)\
+                                    .to_expression, d).to_time
+          input.gsub!(raw_date, new_date\
+                      .strftime("#{new_date.day.ordinal} %b %Y"))        
           d = new_date
           
         end
       end
       
 
-      OpenStruct.new input: input, title: title, recurring: recurring, date: d, 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
     
@@ -173,11 +178,18 @@ class RemindersTxt
 
       d = Chronic.parse(raw_date)
       
-      if annualar and d < @now then
-        d = Chronic.parse(raw_date, now: Time.local(@now.year + 1, 1, 1)) 
+      recurring = nil
+      
+      if annualar then
+        
+        recurring = 'yearly'
+        if d < @now then
+          d = Chronic.parse(raw_date, now: Time.local(@now.year + 1, 1, 1)) 
+        end
       end
-
-      OpenStruct.new input: params[:input], title: title, date: d
+      
+      OpenStruct.new input: params[:input], title: title, date: d, 
+                                                        recurring: recurring
       #[2, title, date].inspect
     end
     
@@ -185,13 +197,19 @@ class RemindersTxt
     get /(\d[^\s]+)\s+([^\*]+)(\*)?/ do |raw_date, title, annualar|
 
       d = Chronic.parse(raw_date)
+      recurring = nil
       
-      if annualar and d < @now then
-        d = Chronic.parse(raw_date, now: Time.local(@now.year + 1, 1, 1)) 
+      if annualar then
+        
+        recurring = 'yearly'
+        if d < @now then
+          d = Chronic.parse(raw_date, now: Time.local(@now.year + 1, 1, 1)) 
+        end
       end
       
       
-      OpenStruct.new input: params[:input], title: title, date: d
+      OpenStruct.new input: params[:input], title: title, date: d, 
+                                                    recurring: recurring
       #[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.3
+  version: 0.3.4
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   n+SSd9dm8JjhZ2pqHtX+bgMZ18hrN06xfR+UPtk5BKC8v1PC0FWxaVR4lom39rFU
   seDxJNsJgamAKg==
   -----END CERTIFICATE-----
-date: 2016-11-12 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex