event_nlp 0.6.0 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23d131080f1c648f569969cdd3af18a8ee585978b832c0822d47604a14968236
-  data.tar.gz: 173cff064a42e901bfb055f29f08d4d1273c5b0d7509ce1af54bb708593b3b23
+  metadata.gz: ed04654bfc6e7e852dcce5fc00c55b1428f2bb7468f1bd1934895dab9239403c
+  data.tar.gz: 9df3b5db5d7f473766b27efe0c2da3e599b4061e98fb5eec851c6570600f14a6
 SHA512:
-  metadata.gz: f0c92ec588966b972c2fc2d0816ca066d4c06ea98230d8d1fb811a06a7811d283d3626fd36f5229af2b11ebd5ecf4dcf69ee092af538e872ce3aa9ab8f519b88
-  data.tar.gz: bbb4f4a06419da51042a791dbc9fdbabd77c874c911f4c46ba1463e67162474804ad4fa1fc25b7297d448d7cd2bc7a70bae3a7e604657285231cd213a9c4032e
+  metadata.gz: 958c73c2bd2eed4a4937c8f8a269d758a92cc632ab366c78f00ee23cb19d6923bf99587fb53c649983397866bd5d55f2d34c7cb5d5656ebf61ace1e1ade83d4b
+  data.tar.gz: 6445772034c43de1489b0d8749ce53608554784f56d8bf20a7c58bf0938a87591d0ec80e4515a4bb787217bfd334d4f7844d1f39c2eddfc90c0b403eed0edd1e

data/lib/event_nlp.rb

@@ -7,12 +7,11 @@ require 'ostruct'
 require 'app-routes'
 
 
-
 module Ordinals
 
   refine Integer do
     def ordinal
-      self.to_s + ( (10...20).include?(self) ? 'th' :
+      self.to_s + ( self.between?(10,20) ? 'th' :
                     %w{ th st nd rd th th th th th th }[self % 10] )
     end
   end
@@ -37,7 +36,11 @@ class EventNlp
 
   end
 
-  def parse(s)
+  def parse(raws)
+
+    s = filter_irregular(raws)
+
+    #-----------------------------------------------------------
 
     @params[:input] = s
     r = run_route(s)
@@ -48,8 +51,60 @@ class EventNlp
 
   end
 
+  # returns an Array object of dates, projected from a recurring event
+  #
+  def project(s, year: Time.now.year)
+
+    r = parse s
+    dates = []
+    now = @now
+
+    while r.date.year == year.to_i do
+
+      dates << r.date
+      @now = r.date + 1
+      r = parse(r.input)
+
+    end
+
+    @now = now
+    return dates
+
+  end
+
   private
 
+  def filter_irregular(raws)
+
+    # catch irregular expressions and interpret them in advance
+    #
+    # e.g. Cafe meeting Thursday every 2 weeks =>
+    #                       Cafe meeting every 2nd Thursday
+    #
+    weekdays2 = (Date::DAYNAMES + Date::ABBR_DAYNAMES).join('|').downcase
+    pattern = /(?<day>#{weekdays2}) every (?<n>\d) weeks/i
+    found = raws.match(pattern)
+
+    if found then
+      s2 = "every %s %s" % [found[:n].to_i.ordinal, found[:day]]
+      s = raws.sub(pattern, s2)
+    end
+
+    # e.g.  "Cafe meeting 14th Monthly" =>
+    #                         Cafe meeting on the 14th of every month
+    #
+    found = raws.match(/(?<title>.*)\s+(?<day>\w+)(?:st|nd|rd|th) monthly/i)
+
+    if found then
+      s = "%s on the %s of every month" % [found[:title],
+                                           found[:day].to_i.ordinal]
+    end
+
+    puts 'filter_irregular - s: ' + s.inspect if @debug
+    return s || raws
+
+  end
+
   def expressions(params)
 
     starting = /(?:\(?\s*starting (\d+\w{2} \w+\s*\w*)(?: until (.*))?\s*\))?/
@@ -70,7 +125,7 @@ class EventNlp
 
    # e.g. electricity bill on the 28th of every month
 
-   get /(.*) on the (#{days}) of every (#{periods})/ do |title, day, recurring|
+   get /(.*) on the (#{days}) of every (#{periods})/i do |title, day, recurring|
 
 
       raw_d = Chronic.parse(day)
@@ -87,6 +142,7 @@ class EventNlp
 
     end
 
+    #
 
     get /^(.*)\s+(every \d\w+ \w+#{times}\s*#{starting})/ do \
                                    |title, recurring, time, raw_date, end_date|

metadata

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