event_nlp 0.6.8 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1200231cc34b803c923b8b4f83b03a7f9d4f97e5459b8ad0b28d90a8140bd024
-  data.tar.gz: af0a750f75290c985454611f61004df0e31b73be38f58857af60d8ef7ba62e25
+  metadata.gz: 8cdc8db5361075d76541559dda4b9541afbef4af1f530fb1076d1a2e73b2bb2a
+  data.tar.gz: ab4558673af5119af70185d2b19f75d4d8757cd4afec2d0b5495935b4ce8d26b
 SHA512:
-  metadata.gz: aa698ae6633855f0dbc21244c57283aa9bb0155aba6f2e43fc17d9d76a1aa0bbf520e1edf4cee2940738bdedee4ec1f01a52b61b98257e9ab974319e4ad36192
-  data.tar.gz: 83d534cda5ab96200952401ebde246701b30ce40fa8133f8badcb948f5edf9dbd7bdf6d209e718c32aa893cfcd227788a39c05163c0232492c6e261fa0142b35
+  metadata.gz: a72a9209568969b91a85cb019440d8704ba34a6e5b3cf531353c60106f18fdbd4715d0beb5cd1f10023e1e379698631377287fca70471af25a5b9c2c7c7e3ce4
+  data.tar.gz: 5f581d752bd427cc347cde61e5776be7c47ac7f19440c2609d1721688af7d1f8aeebd8df0e5c8be88cdcf82a3f9b367680de2972ada5ea9e0bcb38a801e41734

data/lib/event_nlp.rb

@@ -2,10 +2,18 @@
 
 # file: event_nlp.rb
 
-require 'chronic_cron'
+
+#require 'chronic_cron'
 require 'ostruct'
-require 'app-routes'
+require 'requestor'
+
+code = Requestor.read('http://a0.jamesrobertson.me.uk/rorb/r/ruby') do |x|
+  x.require 'app-routes'
+  x.require 'chronic_cron'
+end
 
+eval code
+#require 'app-routes'
 
 module Ordinals
 
@@ -150,6 +158,8 @@ class EventNlp
     weekdays = "(%s)" % weekdays2
     months = "(%s)" % (Date::MONTHNAMES[1..-1] + Date::ABBR_MONTHNAMES[1..-1])\
                                                         .join('|').downcase
+    years = /(20[0-9]{2})/
+
     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+)?)/
@@ -536,12 +546,40 @@ class EventNlp
       { title: title, date: d1 }
     end
 
+    # Some event (10 Woodhouse Lane) 30th Nov at 9:15-10:00
+
+    get /^(.*) #{days} #{months} #{years}(?: at)? (#{times2})/i do \
+        |title, day, month, years, xtimes|
+
+      t1, t2 = xtimes.split(/-/,2)
+      puts '[title, years, day, month, t1] ' + [title, years, day, month, t1].inspect if @debug
+      d1 = Chronic.parse([month, day, years, t1].join(' '), now: @now)
+      d2 = Chronic.parse([month, day, years, t2].join(' '), now: @now)
+
+      puts [4.655, title, d1].inspect.debug if @debug
+
+      { title: title.sub(/ on$/,''), date: d1, end_date: d2 }
+    end
+
+    # Some event (10 Woodhouse Lane) 30th Nov at 9:15
+
+    get /^(.*) #{days} #{months} #{years}(?: at)? (#{times})/i do \
+        |title, day, month, years, t1|
+
+      puts '[title, years, day, month, t1] ' + [title, years, day, month, t1].inspect if @debug
+      d1 = Chronic.parse([month, day, years, t1].join(' '), now: @now)
+
+      puts [4.66, title, d1].inspect.debug if @debug
+
+      { title: title.sub(/ on$/,''), date: d1 }
+    end
+
     # Some event (10 Woodhouse Lane) 30th Nov at 9:15-
 
     get /^(.*) #{days} #{months}(?: at)? (#{times})/i do \
         |title, day, month, t1|
 
-
+      puts '[title, day, month, t1] ' + [title, day, month, t1].inspect if @debug
       d1 = Chronic.parse([month, day, t1].join(' '), now: @now)
 
       puts [4.7, title, d1].inspect.debug if @debug

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_nlp
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   w8lJ+I6Lqqr5GpsweOnEHW4w200sMRD40u8qmGHrqirihL2KrwTD6A9UObvA5AxZ
   4Z4EPvKg+3jsK9Gv3GGSLdrD
   -----END CERTIFICATE-----
-date: 2022-05-04 00:00:00.000000000 Z
+date: 2022-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_cron
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: 'Parses a calendar event for date, time, and description e.g. hall 2 friday