event_nlp 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3cd4994fbaf38dc524a289a4d4bf77041d40770
-  data.tar.gz: 8ee5abd06c78d59c9c0a55162ade03d48483001a
+  metadata.gz: ba0f8e4e430e1dcf876f92d500785c5af853d662
+  data.tar.gz: 80da93ba1cdbc038cbeaee46a4224a8038756d52
 SHA512:
-  metadata.gz: 93fcbafdc9a7667c642c7c093748f46b7fffb842e5442b3be6c4404f55faae8221f6eb6e6e9b63bed20b5e00fe72a2e90e65e29a0e12c2f8288ee799ead6f603
-  data.tar.gz: 62e4f05a211799d7e198909a6cb5ee8851b9d178ba1a42fdf79f5c0e420f60b4244d58699d5d4081982f4913e777d423ed0ceaaa75026fe7ac359932b62fe13f
+  metadata.gz: af88fbad1dc4133d6ac672ef09d2d1d27d7254c7aa4ca061e87e3476e78c89fc12cc5c559f190d25fb31c7791c0fa364cfbbcf3728e0b7ed1c1e1d1391d53d47
+  data.tar.gz: 93804f0cda7818444a0b7c2cd81d2e7f4c514e500e8449b874fa0d59bb644e2db2216a655bf46d293a68397182f48decb39f125593c3a3ba358bfff295830359

data/lib/event_nlp.rb

@@ -62,7 +62,7 @@ class EventNlp
     weekdays = Date::DAYNAMES.join('|').downcase
     months = (Date::MONTHNAMES[1..-1] + Date::ABBR_MONTHNAMES[1..-1])\
                                                             .join('|').downcase
-    times = /(?: *(?:at )?(\d+(?::\d+)?[ap]m) *)/
+    times = /(?: *(?:at |@ |from )?(\d+(?::\d+)?[ap]m) *)/
     days = /\d+(?:st|nd|rd|th)/
     
     #weekdays = Date::DAYNAMES.join('|').downcase
@@ -202,10 +202,11 @@ class EventNlp
       
     end        
  
+    
     # 27-Mar@1436 some important day
     # 25/07/2017 11pm some important day
     #
-    get /^(\d[^\s]+)\s*(\d+(?:\:\d+)?[ap]m)?\s+([^\*]+)(\*)?/ do |raw_date,
+    get /^(\d+\/\d+\/\d+)\s*(\d+(?:\:\d+)?[ap]m)?\s+([^\*]+)(\*)?/ do |raw_date,
         time, title, annualar|
 
       d = Chronic.parse(raw_date + ' ' + time.to_s, 
@@ -254,7 +255,7 @@ class EventNlp
       s5 = s4.sub(/ *#{months} */i) {|x| month = x; ''}
       s6 = s5.sub(/ *#{days} */i) {|x| day = x; ''}
       s7 = s6.sub(/\*$/) {|x| annualar = true; ''}
-      title = s6
+      title = s7.strip
 
       raw_date = [day, month].compact.join(' ')
       raw_date = weekday if raw_date.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_nlp
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   /WtgKLMzCAKTHZ2OpN3OTs6j+vsUBIwCb/Ki17Z4YULtRaGg7I8nTjTrHIIJ0yNm
   kbRihMTezaC+4A==
   -----END CERTIFICATE-----
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_cron