event_nlp 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23d131080f1c648f569969cdd3af18a8ee585978b832c0822d47604a14968236
-  data.tar.gz: 173cff064a42e901bfb055f29f08d4d1273c5b0d7509ce1af54bb708593b3b23
+  metadata.gz: c4ec4582a9a97efbf6e4b24803edb1675c8cc8bbcdff692b90472502bfd71c1e
+  data.tar.gz: 63226f49c9ad8b5f2219cc8506152c5ddaed21e97e0e7c6e55c017bc83d3e644
 SHA512:
-  metadata.gz: f0c92ec588966b972c2fc2d0816ca066d4c06ea98230d8d1fb811a06a7811d283d3626fd36f5229af2b11ebd5ecf4dcf69ee092af538e872ce3aa9ab8f519b88
-  data.tar.gz: bbb4f4a06419da51042a791dbc9fdbabd77c874c911f4c46ba1463e67162474804ad4fa1fc25b7297d448d7cd2bc7a70bae3a7e604657285231cd213a9c4032e
+  metadata.gz: eab396db7a03c0416d71eb911d4bd35d573f33a265c8aa773dcbbf45368a8702df0f695701ee3f2472c084106de6c60d3aee5826e68ec8c032770be191db7a76
+  data.tar.gz: b70f2239f852026b7b3559c0814c331be502a47410ecdf8808646faec727c5adc17e282d8d9159c2bf4658d2ce03ddf161d0b84433b95cbe529658cf965b0b29

data/lib/event_nlp.rb

@@ -12,7 +12,7 @@ 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 +37,25 @@ class EventNlp
 
   end
 
-  def parse(s)
+  def parse(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)
+
+    s = if found then
+      s2 = "every %s %s" % [found[:n].to_i.ordinal, found[:day]]
+      raws.sub(pattern, s2)
+    else
+      raws
+    end
+
+    #-----------------------------------------------------------
 
     @params[:input] = s
     r = run_route(s)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_nlp
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 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-01 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