event_nlp 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed04654bfc6e7e852dcce5fc00c55b1428f2bb7468f1bd1934895dab9239403c
-  data.tar.gz: 9df3b5db5d7f473766b27efe0c2da3e599b4061e98fb5eec851c6570600f14a6
+  metadata.gz: 006b95206123489efd7a4af7281c94cf04f9c87e2767b66f64ac8dfabf997935
+  data.tar.gz: c24fa71f8468feea1740737afa65c1f37b338601a2bb483705f55ea636b7a6da
 SHA512:
-  metadata.gz: 958c73c2bd2eed4a4937c8f8a269d758a92cc632ab366c78f00ee23cb19d6923bf99587fb53c649983397866bd5d55f2d34c7cb5d5656ebf61ace1e1ade83d4b
-  data.tar.gz: 6445772034c43de1489b0d8749ce53608554784f56d8bf20a7c58bf0938a87591d0ec80e4515a4bb787217bfd334d4f7844d1f39c2eddfc90c0b403eed0edd1e
+  metadata.gz: c27fc480731c2eb471bc80933f460a18c62ae6512b82336cd455c0733d267704959de4c0e37ee7a59d1918d8fd5971a3966bf15dd87886feff9dd48aacfaf472
+  data.tar.gz: ab4d7de64261e1dfd3afd0ea29c4d84184ed8be70d6120340ba4959738838bbbd73126a8de992eb99809887ffe355c089628b426066a5603ddaa3ef1d886303b

data/lib/event_nlp.rb

@@ -55,14 +55,27 @@ class EventNlp
   #
   def project(s, year: Time.now.year)
 
-    r = parse s
+    r0 = parse s
+    r = parse r0.input
     dates = []
     now = @now
 
+    if @debug then
+      puts 'r.date: ' + r.date.inspect
+      puts 'r.input: ' + r.input.inspect
+    end
+
+    return [r.date] if (r.date == EventNlp.new(r.date+1).parse(r.input).date)
+
     while r.date.year == year.to_i do
 
       dates << r.date
-      @now = r.date + 1
+      @now = if r.recurring == 'month' then
+       (r.date.to_datetime >> 1).to_time
+      else
+        r.date + 1
+      end
+      #@now = r.date + 1
       r = parse(r.input)
 
     end
@@ -125,10 +138,11 @@ class EventNlp
 
    # e.g. electricity bill on the 28th of every month
 
-   get /(.*) on the (#{days}) of every (#{periods})/i do |title, day, recurring|
+   get /(.*) on the #{days} of every (month)/i do |title, day, recurring|
 
 
-      raw_d = Chronic.parse(day)
+      puts 'day: ' + day.inspect if @debug
+      raw_d = Chronic.parse(day + ' ' + Date::MONTHNAMES[@now.month])
 
       # if the date is less than now then increment it by a month
       d = raw_d < @now ? (raw_d.to_date >> 1).to_time : raw_d
@@ -349,10 +363,11 @@ class EventNlp
 
     # hall 2 friday at 11am
 
-    get /^(.*)\s+#{weekdays}\b(?: \(([^\)]+)\))?(#{times})?/i \
-        do |title, raw_day, actual_date, time|
+    get /^(.*)\s+#{weekdays}\b(?: \(([^\)]+)\))?(?:#{times})? *(weekly)?/i \
+        do |title, raw_day, actual_date, time, recurring|
 
       if @debug then
+        puts ('recurring: ' + recurring.inspect).debug
         puts ('actual_date: ' + actual_date.inspect).debug
         puts ('raw_day: ' + raw_day.inspect).debug
         puts ('time: ' + time.inspect).debug
@@ -360,9 +375,9 @@ class EventNlp
 
       input = params[:input].clone
 
-      if actual_date then
-        d = Chronic.parse(raw_day + ' ' + time.to_s)
-      else
+      d = Chronic.parse(raw_day + ' ' + time.to_s)
+
+      if recurring.nil?
         d = Chronic.parse(raw_day + ' ' + time.to_s)
         input.sub!(/#{weekdays}/i,
                    %Q(#{raw_day} (#{d.strftime("#{d.day.ordinal} %b %Y")})))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_nlp
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - James Robertson