reminders_txt 0.3.13 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3df1d27dc11d59331c7ecdefd6c42860705c690
-  data.tar.gz: 3c0583364d5ee423b2e32111ecbbafcdfc590ea5
+  metadata.gz: 917ca91a5de6794a7b57b13f44dea851eafc03b5
+  data.tar.gz: 41d7a19a41e0ae8d32e418d2def6f4bc55e329a6
 SHA512:
-  metadata.gz: fae4a5163466b2f4e02fe4cd2ca092549946dc1a1e16116087d50d82f5904941931f57b2a539c4647f25f118e35b268a090ce3748a6fe4ff0fac3f3606235506
-  data.tar.gz: d9c94efc0fa03c3b0ccb93e9bf537fb72c47607bf2178ac8f33e269ba1497fd00d9604701e2cce4fb6ee795519ad68adbf4ac7b06e1e31bfd0fb88eb5271a4d0
+  metadata.gz: 1031d7a36f643df92f9bfc7858faaad7e7135873303a4e5878456e191ec22d791da02a1e6d377fb8d18f6829abf575adb7275d8f83a85b93f82a9345e891dc2a
+  data.tar.gz: 775d899e265f0c0aecbbb45b6637a118ea128eab67618b8232bb38b46cef64b7c409d9d7911415d22fb4e67a211e87d13cfa810283b9c4752587d12888df4ee3

data/lib/reminders_txt.rb

@@ -111,6 +111,9 @@ class RemindersTxt
 
     starting = /(?:\(?\s*starting (\d+\w{2} \w+\s*\w*)(?: until (.*))?\s*\))?/
     weekday = Date::DAYNAMES.join('|').downcase
+    months = (Date::MONTHNAMES[1..-1] + Date::ABBR_MONTHNAMES[1..-1])
+      .join('|').downcase
+
 
     get /^(.*)(every \w+ \w+(?: at (\d+am) )?)\s*#{starting}/ do \
                                    |title, recurring, time, raw_date, end_date|
@@ -142,7 +145,8 @@ class RemindersTxt
     
     # 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|
+    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
@@ -158,13 +162,29 @@ class RemindersTxt
       OpenStruct.new input: params[:input], title: title, date: d
       
     end
+    
+    # e.g. 21/05/2017 Forum meetup at Roundpeg from 2pm
+    get /^(\d+\/\d+\/\d+)\s+(.*)(?: from|at)\s+(\d+[ap]m)/ do 
+                                                    |raw_date, title, raw_time|
+      
+      d = Chronic.parse(raw_date + ' ' + 
+                        raw_time, :endian_precedence => :little)
+      recurring = nil            
+      
+      #puts [3, title, raw_date].inspect
+      OpenStruct.new input: params[:input], title: title, date: d
+    end        
  
     # hall 2 friday at 11am
     # some important day 24th Mar
-    get /([^\d]+)\s+(\d+[^\*]+)(\*)?/ do |title, raw_date, annualar|
+    
+    with_date = "(.*)\\s+(\\d\+\s*(?:st|nd|rd|th)?\\s+(?:#{months}))"
+    alt_pattern = '([^\d]+)\s+(\d+[^\*]+)(\*)?'
+    
+    get /#{with_date}|#{alt_pattern}\s*(\*)$/i do |title, raw_date, annualar|
 
       d = Chronic.parse(raw_date)
-      
+
       recurring = nil
       
       if annualar then
@@ -200,9 +220,12 @@ class RemindersTxt
                                                     recurring: recurring      
     end    
     
-    # e.g. 04-Aug@12:34
-    get '*' do
 
+        
+    
+    # e.g. 04-Aug@12:34
+    get '*' do |s|
+      puts 's: ' + s.inspect
       'pattern unrecognised'
     end
 
@@ -230,7 +253,7 @@ class RemindersTxt
     end
     
     @updated = false
-    
+
     refresh()
     
   end
@@ -265,7 +288,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)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reminders_txt
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   n+SSd9dm8JjhZ2pqHtX+bgMZ18hrN06xfR+UPtk5BKC8v1PC0FWxaVR4lom39rFU
   seDxJNsJgamAKg==
   -----END CERTIFICATE-----
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex