event_nlp 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34bd0366a4fd2bc97bf23dfaa4811bbf7b1add8b682c4a12133bacad71fe1126
-  data.tar.gz: d55983a0b2b70f388d1e1d06b0bf884d38c907c80045afe79c5542f346ecf864
+  metadata.gz: ed04654bfc6e7e852dcce5fc00c55b1428f2bb7468f1bd1934895dab9239403c
+  data.tar.gz: 9df3b5db5d7f473766b27efe0c2da3e599b4061e98fb5eec851c6570600f14a6
 SHA512:
-  metadata.gz: be80fc3036e3944e2dd50bfa4efa8d63ddd0bc09093b10fd8d8504f79da261d59a020b0277d679142c6bd185faa9f18e16bddd89da11c7123a649de73aad57dc
-  data.tar.gz: d050f6ab6363fe62b40240a821ab4a6aaa554b78fba9d2ed9126581dc705bcf799cbce42cc24c8bdd6a8778c07d40762c457a460090e5f661f5af1c9c47b3e79
+  metadata.gz: 958c73c2bd2eed4a4937c8f8a269d758a92cc632ab366c78f00ee23cb19d6923bf99587fb53c649983397866bd5d55f2d34c7cb5d5656ebf61ace1e1ade83d4b
+  data.tar.gz: 6445772034c43de1489b0d8749ce53608554784f56d8bf20a7c58bf0938a87591d0ec80e4515a4bb787217bfd334d4f7844d1f39c2eddfc90c0b403eed0edd1e

data/lib/event_nlp.rb

@@ -38,21 +38,7 @@ class EventNlp
 
   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
+    s = filter_irregular(raws)
 
     #-----------------------------------------------------------
 
@@ -88,6 +74,37 @@ class EventNlp
 
   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*\))?/
@@ -108,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)
@@ -125,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.2
+  version: 0.6.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   w8lJ+I6Lqqr5GpsweOnEHW4w200sMRD40u8qmGHrqirihL2KrwTD6A9UObvA5AxZ
   4Z4EPvKg+3jsK9Gv3GGSLdrD
   -----END CERTIFICATE-----
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2022-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_cron