event_nlp 0.6.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a841e6980bb14291c3a224491b761e57f6966260c3b11e6e8a78eb121c37220b
-  data.tar.gz: 9d7686cde4d18d14bfb9b35d29ae2a268423c396c4decb6a5bf4c8e9541df8a1
+  metadata.gz: 8cdc8db5361075d76541559dda4b9541afbef4af1f530fb1076d1a2e73b2bb2a
+  data.tar.gz: ab4558673af5119af70185d2b19f75d4d8757cd4afec2d0b5495935b4ce8d26b
 SHA512:
-  metadata.gz: a000f3bcffe7f4388a75e3aab7de09fa6f01bf63bf673c3c6faca9a041603dd2ccd21af608008493d8f2c6c3b9547bc6aad7e45b79ef882740f195ddd8b0b2c1
-  data.tar.gz: ac5744ba228a291483b2bf52a2688d07d3516d46ca951edf982fa5e4ca8fde6e7cb53647d723f5067c807a03a765bf5d2a93ad0e901962b6c2283ecc6c490b11
+  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
 
@@ -53,7 +61,7 @@ class EventNlp
 
   # returns an Array object of dates, projected from a recurring event
   #
-  def project(s, year: Time.now.year)
+  def project(s, year: @now.year)
 
     r0 = parse s
     r = parse r0.input
@@ -67,18 +75,19 @@ class EventNlp
           EventNlp.new(r.date+1).parse(r.input).date.inspect
     end
 
-    return [r.date] if (r.date == EventNlp.new(r.date+1).parse(r.input).date)
+    return [r.date] if (r.date == EventNlp.new(r.date+1, debug: @debug).parse(r.input).date)
 
     while r.date.year == year.to_i do
 
       dates << r.date
       @now = if r.recurring == 'month' then
-       (r.date.to_datetime >> 1).to_time
+       (r.date.to_date >> 1).to_time
       #elsif r.recurring == 'weekly'
 
       else
         r.date + 1
       end
+      puts '@now: ' + @now.inspect if @debug
       #@now = r.date + 1
       r = parse(r.input)
 
@@ -107,6 +116,18 @@ class EventNlp
       s = raws.sub(pattern, s2)
     end
 
+    months = (Date::MONTHNAMES + Date::ABBR_MONTHNAMES).join('|').downcase
+
+    # the following would be ambiguous input, but we will assume they
+    # meant the 14th day of every month
+    # e.g. "Cafe meeting 14th May Monthly"
+    found = raws.match(/(?<title>.*)\s+(?<day>\w+(?:st|nd|rd|th)) (#{months}) monthly/i)
+
+    if found then
+      s = "%s on the %s of every month" % [found[:title],
+                                           found[:day].to_i.ordinal]
+    end
+
     # e.g.  "Cafe meeting 14th Monthly" =>
     #                         Cafe meeting on the 14th of every month
     #
@@ -137,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+)?)/
@@ -523,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.6
+  version: 0.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   w8lJ+I6Lqqr5GpsweOnEHW4w200sMRD40u8qmGHrqirihL2KrwTD6A9UObvA5AxZ
   4Z4EPvKg+3jsK9Gv3GGSLdrD
   -----END CERTIFICATE-----
-date: 2022-04-03 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