event_nlp 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54ba784176824a213dcdbd4ca421b388687fba9f
-  data.tar.gz: ed2a521afa3726671c01ecb62977c0b9b48ce203
+  metadata.gz: 73cd65c68a6459b464bc21d5d91f925fdfb776c7
+  data.tar.gz: 524ccb60d5660fd2c99520e3915ab672519ea4e0
 SHA512:
-  metadata.gz: d6b8bbe02b6a14f5a5b8f918995bae07aac3a867721570706a08572989a1bd6bb5014a965c8efd5b386046ac06292f24610c1d08c5a76409ed9e996e8351f083
-  data.tar.gz: b735297f5f76c702e6c9c177fc5a486926457dc2c33c288c452de2672a167517afa1d5769b6b31058d71bc4dabd836264c334dff7bd365ad574b42c25b3dc834
+  metadata.gz: 5810a9e49803482d1b2ee43f9f03e45848b06fb20b4ded4e75303dfa2c7a955683b527bea1699d0d1f7bf054821ec9b5611a1f2fabfe7652ab03f73c1796143c
+  data.tar.gz: 6df966634ca2c75075a93df62f509e123db9b7c79234cebe5379d98ce73965775bfc04d6715fd46519aa38a69c4bc6ec11e3286232207096e79dac42198be714

data/lib/event_nlp.rb

@@ -52,12 +52,13 @@ class EventNlp
   def expressions(params)     
 
     starting = /(?:\(?\s*starting (\d+\w{2} \w+\s*\w*)(?: until (.*))?\s*\))?/
-    weekdays = Date::DAYNAMES.join('|').downcase
-    months = (Date::MONTHNAMES[1..-1] + Date::ABBR_MONTHNAMES[1..-1])\
-                                                            .join('|').downcase
+    weekdays2 = Date::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+)?/
-    days = /\d+(?:st|nd|rd|th)/
+    days = /(\d+(?:st|nd|rd|th))/
     periods = /day|week|month/
     
     #weekdays = Date::DAYNAMES.join('|').downcase
@@ -187,7 +188,8 @@ class EventNlp
       end
           
       puts [0.5, title, recurring, d].inspect if @debug
-      {input: input, title: title.rstrip, recurring: recurring, date: d, end_date: end_date }
+      {input: input, title: title.rstrip, recurring: recurring, 
+       date: d, end_date: end_date }
       
     end    
     
@@ -203,7 +205,8 @@ class EventNlp
     
     
     # 7th Oct Euston Station (meet at Timothy's house at 7pm)
-    get /^(\d(?:st|nd|rd|th) \w+) *(.*)\s+at\s+(\w+)/i do |raw_day, title, time|
+    get /^(\d(?:st|nd|rd|th) \w+) *(.*)\s+at\s+(\w+)/i do \
+        |raw_day, title, time|
       
       d = Chronic.parse(raw_day + ' ' + time)
       
@@ -216,7 +219,7 @@ class EventNlp
     # some event Wednesday 11am
     
     relative_day = '|today|tomorrow|tonight'
-    get /^(.*)\s+(#{weekdays+relative_day})(?: \(([^\)]+)\)) (at \d{1,2}(?::\d{2})?(?:[ap]m)?)/i \
+    get /^(.*)\s+(#{weekdays2+relative_day})(?: \(([^\)]+)\)) (at \d{1,2}(?::\d{2})?(?:[ap]m)?)/i \
                                                            do |title, raw_date, date2, time2|
       puts 'time2: ' + time2.inspect if @debug
       puts 'date2: ' + date2 if @debug
@@ -234,7 +237,8 @@ class EventNlp
     end
         
     # Group meeting Red Hall 2pm-4pm on Monday (4th Dec 2017)
-    get /^(.*)\s+(#{times2})(?: on) +(#{weekdays})(?: \(([^\)]+)\))?/i do |title, xtimes, raw_day, actual_date|
+    get /^(.*)\s+(#{times2})(?: on) +#{weekdays}(?: \(([^\)]+)\))?/i \
+        do |title, xtimes, raw_day, actual_date|
       
       puts 'actual_date: ' + actual_date.inspect if @debug
       puts 'raw_day: ' + raw_day.inspect if @debug
@@ -246,7 +250,8 @@ class EventNlp
         d = Chronic.parse actual_date
       else
         d = Chronic.parse(raw_day)        
-        input.sub!(/#{weekdays}/i,%Q(#{raw_day} (#{d.strftime("#{d.day.ordinal} %b %Y")})))        
+        input.sub!(/#{weekdays}/i,
+                   %Q(#{raw_day} (#{d.strftime("#{d.day.ordinal} %b %Y")})))        
       end
 
       t1, t2 = xtimes.split(/-/,2)
@@ -263,7 +268,8 @@ class EventNlp
     
     # hall 2 friday at 11am
 
-    get /^(.*)\s+(#{weekdays})(?: \(([^\)]+)\))?(#{times})?/i do |title, raw_day, actual_date, time|
+    get /^(.*)\s+#{weekdays}(?: \(([^\)]+)\))?(#{times})?/i \
+        do |title, raw_day, actual_date, time|
       
       puts 'actual_date: ' + actual_date.inspect if @debug
       puts 'raw_day: ' + raw_day.inspect if @debug
@@ -275,7 +281,8 @@ class EventNlp
         d = Chronic.parse(raw_day + ' ' + time.to_s)
       else
         d = Chronic.parse(raw_day + ' ' + time.to_s)        
-        input.sub!(/#{weekdays}/i,%Q(#{raw_day} (#{d.strftime("#{d.day.ordinal} %b %Y")})))        
+        input.sub!(/#{weekdays}/i,
+                   %Q(#{raw_day} (#{d.strftime("#{d.day.ordinal} %b %Y")})))        
       end
         
       puts 'd: ' + d.inspect if @debug
@@ -301,7 +308,8 @@ class EventNlp
     end        
     
     # friday hall 2 11am
-    get /^(#{weekdays})\s+(.*)\s+(\d+(?::\d{2})?[ap]m)$/i do |raw_day, title, time|
+    get /^#{weekdays}\s+(.*)\s+(\d+(?::\d{2})?[ap]m)$/i do \
+        |raw_day, title, time|
       
       d = Chronic.parse(raw_day + ' ' + time)
       
@@ -309,7 +317,17 @@ class EventNlp
       { title: title, date: d }
       
     end    
-    
+
+    # Tuesday 10th July hall 2 at 11am
+    get /#{weekdays}\s+#{days}\s+#{months}\s+(?:at )?(.*)\s+at\s+(#{times})/i \
+        do |wday, day, month, title,  time|
+      
+      d = Chronic.parse([day, month, time].join(' '))
+      
+      puts ['1.44.5', day, month, title].inspect if @debug
+      { title: title, date: d }
+      
+    end       
     
     # hall 2 at 11am
     get /(.*)\s+at\s+(#{times})/i do |title,  time|
@@ -325,8 +343,8 @@ class EventNlp
     # 27-Mar@1436 some important day
     # 25/07/2017 11pm some important day
     #
-    get /^(\d+\/\d+\/\d+)\s*(\d+(?:\:\d+)?[ap]m)?\s+([^\*]+)(\*)?/ do |raw_date,
-        time, title, annualar|
+    get /^(\d+\/\d+\/\d+)\s*(\d+(?:\:\d+)?[ap]m)?\s+([^\*]+)(\*)?/ \
+        do |raw_date, time, title, annualar|
 
       d = Chronic.parse(raw_date + ' ' + time.to_s, 
                         :endian_precedence => :little)
@@ -349,7 +367,8 @@ class EventNlp
     
     # Some event (10 Woodhouse Lane) 30th Nov from 9:15-17:00
 
-    get /^(.*) (#{days}) (#{months})(?: from)? (#{times2})/i do |title, day, month, xtimes|
+    get /^(.*) #{days} #{months}(?: from)? (#{times2})/i do \
+        |title, day, month, xtimes|
 
       t1, t2 = xtimes.split(/-/,2)
 
@@ -407,4 +426,4 @@ class EventNlp
     
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_nlp
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,27 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MDUwNzE0NTg0OVoXDTE4MDUwNzE0NTg0OVowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMw2O2U81njedJwOBUx2jysPRiQCPeRo3z866CWS38+gUjuoyWhxqpU7oFmf
-  ZU8qBW3IAt9dDF6YYej0D1pjUGQB3Q9tGG+9JAgrVk9A9v6EDe2OlJw+kBq3df8c
-  rlBxpaoW5Cs4l0NPvS0YxkiNcVNF+5+5w5P/oG/rQtwYe5qjgL8dnR3wCzbpLEJx
-  ffB9IO8GywixKbsVo+azM95eEXqftzTEZTvNl9/fXdmDxxBjQ840cga0cbo8/l3r
-  QDCdLV4tr4QxoJUWr2WuF9eA4Z2LNeNiKV2QpnPJSJ8oGmLSOhBx/QsIHt/JGnAZ
-  iWrign+OUU/ZhLpZxWdMtho2lwUCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUxmLhcuks1axpInwjUKF+v8jP89gwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAya7GTAGy
-  KQx5tB2Dugmt+7zMYMR2DXiLbtRnfA5sbtgERjf/wxIp+eXKPNUuUy19R6srwaVB
-  KMvT4fo30u4r+JS0jU50xr6YH9BgJmcjf9PVboo2Rmy6ndylXjta24tzCOEz9+Tt
-  JwZIT4fJigwslfEQFtTyPizu+kUMugdOwmk8WUeJdla0LpnMmIaDuh9BdIbydmMv
-  /N+gM0MWTN2a4JSEPzFK6C7H8aI/pzcffTuhqspk6a1XtgFcqVdF1expUm8Hse1Z
-  /WtgKLMzCAKTHZ2OpN3OTs6j+vsUBIwCb/Ki17Z4YULtRaGg7I8nTjTrHIIJ0yNm
-  kbRihMTezaC+4A==
+  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwNzA1MTAxNjMyWhcN
+  MTkwNzA1MTAxNjMyWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVsMUO
+  uqAIaefnFUYjL01BM0IKcynSiGaen10C1l+mdb5L2u/qqmDlei+dhkROzdalv3I9
+  mzfM+gmypIghj96WuiJWFN0W3ktFvxo/GBt9H5va9e8osXAzIuMmU6XcPNHRJJ8a
+  l+++HBSeBylV0JGH3h+4Ia5fF8rsnUnhXnethMO4bEjERFVH8PO6qDnL28ua3r05
+  W964deP/xkSD2JCc9UEzmfa6+vXpT8EM00TEFsC0KWLC1tbNqQHknxW/JGFsvSrm
+  rtjUzYRg4D2JzBAvkofjPWhDcDwUg9HjEslqg0k4jzk8d7bCihmRDaeNLpmjFVeu
+  miMJkFxdCkRbFxkrAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFD6Oql0vDFt0//hJu95Y7ai3GlpdMCYGA1UdEQQfMB2BG2dlbW1h
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
+  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAEVbqAk47S/3aPeR4B7G
+  l875ptDSNkXUq0Y6/c7HLtCqO8J9WPGbNUoGT3EeYQblEcay816mbd3TLOgTdmo/
+  vJphzqk0LEHBYD2oC1G7Yzzq7BHkkoJN54e6b5ZzUHNctIGluMrjnNvIagHKfJlR
+  UAX6I2o4wL8qFLDxkEcv8FRc67xJBMdQljoYHO+mM8uz8Lsk5Go0xI6UvIZvAnXh
+  fJkRwzhE/iZ3kywtmmOnZthaWgHjUoY7bl8lyroUeFf1f3f1tNUKk7kfClyRVrka
+  hfzP67fp+s/TI6Tk+IvaEWBcfX7AV2XjfhS+q3uCBvQRjmbbRg3JO4XdjAQI3q8d
+  +P4=
   -----END CERTIFICATE-----
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2018-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_cron
@@ -39,20 +38,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: app-routes
   requirement: !ruby/object:Gem::Requirement