reminders_txt 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdef8b14487344306d7c51cbca1b0c4762d84cca
-  data.tar.gz: 8a0834e882eff028e90948ee1578e6c47bd72eac
+  metadata.gz: 3b9339ce4b39359e3a81880f3ebd5c811b809a21
+  data.tar.gz: 1cf904cf2c0c51e93b18404f12e6ab69790ff3f4
 SHA512:
-  metadata.gz: 69c5d2c7f3d7894b3ab9092bebda0eef028ae0179f4574c89eda0b258ecc118b6088d046d53fc015302391340b3f70f38ac667373dc58003c0b83ea661a42d48
-  data.tar.gz: 3088b001e9cfa5aaaa13856f2265d1c2f862d1b49b992f74697dd56bf7e170a451353f9eccc9b9b75772cbab1052b21eb8cd91245f84e8a874e15e9ed69dbdf1
+  metadata.gz: 59290dc4cff2795294046bff630e66e01b51ed70e7752b5bf16af1db484fc41785c9ff4b48186bf85773f0b79f8d2d572a3f8a2986d52860f10f3c5a8617d47d
+  data.tar.gz: 2e04c0522eef08da8618b3072c0d722e2236c983af4b93fae1d8e2a5e412677ce76f4dadc8fdea4ec992bf277fddb5d96d64b90eb34cf47bad340a20df419d17

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-u�L[�sU
n�I�j�N>$��6}��s5��F��܆���G��{�]���G�T��ʖ}
+z�h�^���P?&����5N�t���R��Wy�

+�T�����d&���o\w���(bFA�U��|wE78E�.�x“qN��ٸת�R�u\3���UL+;Bz`�
�%�oL3�y��<���k��J�^�Vw�+ѧ��¡�:c�edNTI �k���O�C��Z:;��w�5�9�+��}��_����G����!����
+�q��p���

data/lib/reminders_txt.rb

@@ -91,7 +91,7 @@ class RemindersTxt
     end
 
     # delete expired non-recurring reminders
-    @reminders.reject! {|x|  x.date.to_time < @now if not x.recurring }
+    #@reminders.reject! {|x|  x.date.to_time < @now if not x.recurring }
     
     @reminders.sort_by!(&:date)
     
@@ -137,6 +137,7 @@ class RemindersTxt
 
 
     starting = /(?:\(?\s*starting (\d+\w{2} \w+\s*\w*)(?: until (.*))?\s*\))?/
+    weekday = Date::DAYNAMES.join('|').downcase
 
     get /^(.*)(every \w+ \w+(?: at (\d+am) )?)\s*#{starting}/ do \
                                    |title, recurring, time, raw_date, end_date|
@@ -160,19 +161,32 @@ class RemindersTxt
       end
       
 
+      #puts [0, title, recurring, time, raw_date, end_date].inspect
       OpenStruct.new input: input, title: title, recurring: recurring, 
                                                 date: d, end_date: end_date
-      #[0, title, recurring, time, date, end_date].inspect
+      
     end
     
     # some meeting 3rd thursday of the month at 7:30pm
     # some meeting First thursday of the month at 7:30pm
     get /(.*)\s+(\w+ \w+day of (?:the|every) month at .*)/ do |title, recurring|
-      
+
+      #puts [1, title, recurring].inspect      
       OpenStruct.new input: params[:input], title: title, recurring: recurring
-      #[1, title, recurring].inspect
-    end        
+
+    end
+    
+    # hall 2 friday at 11am
+    get /(.*)\s+(#{weekday})\s+at\s+(.*)/i do |title, raw_day, time|
+      
+      d = Chronic.parse(raw_day + ' ' + time)
+      
+      #puts [1.5, title, raw_day].inspect
+      OpenStruct.new input: params[:input], title: title, date: d
+      
+    end
  
+    # hall 2 friday at 11am
     # some important day 24th Mar
     get /(.*)\s+(\d+[^\*]+)(\*)?/ do |title, raw_date, annualar|
 
@@ -188,9 +202,9 @@ class RemindersTxt
         end
       end
       
+      #puts [2, title, raw_date].inspect
       OpenStruct.new input: params[:input], title: title, date: d, 
-                                                        recurring: recurring
-      #[2, title, date].inspect
+                                                        recurring: recurring      
     end
     
     # 27-Mar@1436 some important day
@@ -208,9 +222,9 @@ class RemindersTxt
       end
       
       
+      #puts [3, title, raw_date].inspect
       OpenStruct.new input: params[:input], title: title, date: d, 
-                                                    recurring: recurring
-      #[3, title, date].inspect
+                                                    recurring: recurring      
     end    
     
     # e.g. 04-Aug@12:34

metadata

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