event_nlp 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 124158eaa2d190a018ac080544f817c23aa5b204a2077bcf9c6b763384be0c68
-  data.tar.gz: ce967c58f45480fbb66462f6cf9bac6445c82a4a2d6b69d95654262f794b3b2b
+  metadata.gz: 42e47f457a1e07759fc8b3de0ae3f85d35fc0679e252c9c52570457e5d389125
+  data.tar.gz: 58cabc06778bed4444a025092f47699089627145c06ab91befc1f02050e1a61a
 SHA512:
-  metadata.gz: 734b60be3195c82512801cb0680a3c7965afefd567722f2870c0efc2ad030dc4b348d81e5672c489c64b3c9150f5d5b1746f1e8c998f9592eecc9a517c0297e6
-  data.tar.gz: 744bc3868f73a02a28b88b040c11beeb2af9d374e33f6427ae31ef29ce332110b3a1a79be5344cf0a4c12e29b05c05e1bf29bcdca1f9a5c7097113a7cce70614
+  metadata.gz: e223d22b9a2404c8467fce4b9b8f58b9889dfffa15a3c83aaccc5c8d3912abaf50cf26bc46fbfc84744f345afa6905fbfcd7f27a49293d4b915c6cba72e49a47
+  data.tar.gz: b8f40f7a4168aaed947b00a2bbab9fd7864fc81388305cd8f6ede785bf84added0bef7fa3561f16400f35e2309eb0aefc0bdfab44ebef53df088058103eb3c19

data.tar.gz.sig

@@ -1,2 +1 @@
-em�s�*4D�a5.�CO��
-��&� 1T2��-��D�A$�)y*|0eV�7k�4��
+.��)�?�ª܋� �5�	֌a���'�M

data/lib/event_nlp.rb

@@ -53,17 +53,19 @@ class EventNlp
   def expressions(params)     
 
     starting = /(?:\(?\s*starting (\d+\w{2} \w+\s*\w*)(?: until (.*))?\s*\))?/
-    weekdays2 = Date::DAYNAMES.join('|').downcase    
+    weekdays2 = (Date::DAYNAMES + Date::ABBR_DAYNAMES).join('|').downcase    
     weekdays = "(%s)" % weekdays2
     months = "(%s)" % (Date::MONTHNAMES[1..-1] + Date::ABBR_MONTHNAMES[1..-1])\
                                                         .join('|').downcase
     times = /(?: *(?:at |@ |from )?(\d+(?::\d+)?(?:[ap]m|\b)) *)/
     times2 = /\d+(?::\d+)?[ap]m-\d+(?::\d+)?[ap]m|\d+(?::\d+)?-\d+(?::\d+)?/
+    times3 = /(\d+(?::\d+)?[ap]m-\d+(?::\d+)?[ap]m|\d+(?::\d+)?-\d+(?::\d+)?)/    
     days = /(\d+(?:st|nd|rd|th))/
     periods = /day|week|month/
     
     #weekdays = Date::DAYNAMES.join('|').downcase
     #
+    
     #times = /(?: *at )?\d[ap]m/
 
    # e.g. electricity bill on the 28th of every month    
@@ -223,7 +225,7 @@ class EventNlp
     # some event Wednesday 11am
     
     relative_day = '|today|tomorrow|tonight'
-    get /^(.*)\s+(#{weekdays2+relative_day})(?: \(([^\)]+)\)) (at \d{1,2}(?::\d{2})?(?:[ap]m)?)/i \
+    get /^(.*)\s+(#{weekdays2+relative_day}\b)(?: \(([^\)]+)\)) (at \d{1,2}(?::\d{2})?(?:[ap]m)?)/i \
                                                            do |title, raw_date, date2, time2|
       puts ('time2: ' + time2.inspect).debug if @debug
       puts ('date2: ' + date2).debug if @debug
@@ -241,7 +243,7 @@ class EventNlp
     end
         
     # Group meeting Red Hall 2pm-4pm on Monday (4th Dec 2017)
-    get /^(.*)\s+(#{times2})(?: on) +#{weekdays}(?: \(([^\)]+)\))?/i \
+    get /^(.*)\s+(#{times2})(?: on) +#{weekdays}\b(?: \(([^\)]+)\))?/i \
         do |title, xtimes, raw_day, actual_date|
       
       if @debug then
@@ -256,7 +258,7 @@ class EventNlp
         d = Chronic.parse actual_date
       else
         d = Chronic.parse(raw_day)        
-        input.sub!(/#{weekdays}/i,
+        input.sub!(/#{weekdays}\b/i,
                    %Q(#{raw_day} (#{d.strftime("#{d.day.ordinal} %b %Y")})))        
       end
 
@@ -274,7 +276,7 @@ class EventNlp
     
     # hall 2 friday at 11am
 
-    get /^(.*)\s+#{weekdays}(?: \(([^\)]+)\))?(#{times})?/i \
+    get /^(.*)\s+#{weekdays}\b(?: \(([^\)]+)\))?(#{times})?/i \
         do |title, raw_day, actual_date, time|
       
       if @debug then
@@ -328,9 +330,10 @@ class EventNlp
     end       
     
     # friday hall 2 11am
-    get /^#{weekdays}\s+(.*)\s+(\d+(?::\d{2})?[ap]m)$/i do \
+    get /^#{weekdays}\b\s+(.*)\s+(\d+(?::\d{2})?[ap]m)$/i do \
         |raw_day, title, time|
       
+      puts [raw_day, title, time].inspect if @debug
       venue = title[/^at +(.*)/,1]
       d = Chronic.parse(raw_day + ' ' + time)
       
@@ -340,7 +343,7 @@ class EventNlp
     end    
 
     # Tuesday 10th July hall 2 at 11am
-    get /#{weekdays}\s+#{days}\s+#{months}\s+(?:at )?(.*)\s+at\s+(#{times})/i \
+    get /#{weekdays}\b\s+#{days}\s+#{months}\s+(?:at )?(.*)\s+at\s+(#{times})/i \
         do |wday, day, month, title,  time|
       
       d = Chronic.parse([day, month, time].join(' '))
@@ -392,10 +395,26 @@ class EventNlp
 
       { title: title, date: d1, end_date: d2 }
     end
+    
+    # Some event (10 Woodhouse Lane) 30th Nov from 9:15-17:00
+
+    get /^#{weekdays}\b #{months} #{days} #{times3} (.*)/i do \
+        |wday, month, day, xtimes, title|
+
+      puts [month, day, xtimes, title].inspect if @debug
+      t1, t2 = xtimes.split(/-/,2)
+
+      d1 = Chronic.parse([month, day, t1 + ':00'].join(' '))
+      d2 = Chronic.parse([month, day, t2 + ':00'].join(' '))
+
+      puts [4.55, title, d1, d2].inspect.debug if @debug
+
+      { title: title, date: d1, end_date: d2 }
+    end    
 
     # e.g. Wednesday 30th Nov at 9:15 10 Woodhouse Lane
 
-    get /^(?:#{weekdays2}) #{days} #{months}(?: at)? #{times}(.*)/i do \
+    get /^(?:#{weekdays2}\b) #{days} #{months}(?: at)? #{times}(.*)/i do \
         |day, month, t1, title|
 
       d1 = Chronic.parse([month, day, t1].join(' '))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_nlp
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   hfzP67fp+s/TI6Tk+IvaEWBcfX7AV2XjfhS+q3uCBvQRjmbbRg3JO4XdjAQI3q8d
   +P4=
   -----END CERTIFICATE-----
-date: 2019-03-10 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_cron