event_nlp 0.2.17 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0b3289870f21858812ccdaf45ab5ec26736eee9
-  data.tar.gz: 51f33ba988ee15567cf8bf28dfcfcd0ea200012e
+  metadata.gz: 53e08647b8e240d081ace6865f4cd49ff1195cc6
+  data.tar.gz: 765a6dddc50561c1b6533c422a9f5ec0ba83dd1f
 SHA512:
-  metadata.gz: 6834d3422ac16b5af9552dcea6be8543fa5572a20520fc2629d25fa5eac80f48d3b2fc1dd2da7d38a32c872ab7a122d996098964e629b5a74fcd325f3fef6c9e
-  data.tar.gz: fa1cdf7c2cca71723979d82efc8576e2cc22d01c9f4e2b9be106eff0f707e444d40aaa7a5f8004924173c4c71d2729a3216ee5548b9019157b1f6ecf6a224517
+  metadata.gz: e95368e97d7c8ffdfaf13384b9da4e6b3bfa0aac91d119ad41379a124bb3537ac1a6e50d9b3163182fad1825763dfec06bb5f46ea814becefc247c913db9864c
+  data.tar.gz: 56901f3d50338cb0b5a93198aff0c04b6eb94d55fd4675a978ebabee677b3fb42ec4b967ae80803e9495fbe613c161f0627f529b4cc9ab12a49fc291a182eaef

data/lib/event_nlp.rb

@@ -311,7 +311,8 @@ class EventNlp
           d = Chronic.parse(raw_date, now: Time.local(@now.year + 1, 1, 1)) 
         end
       end
-            
+      
+      
       puts [3, title, raw_date, time].inspect if @debug
       { title: title, date: d, recurring: recurring }
     end
@@ -320,7 +321,7 @@ 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)
 
@@ -378,4 +379,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.2.17
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   /WtgKLMzCAKTHZ2OpN3OTs6j+vsUBIwCb/Ki17Z4YULtRaGg7I8nTjTrHIIJ0yNm
   kbRihMTezaC+4A==
   -----END CERTIFICATE-----
-date: 2017-12-03 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_cron