event_nlp 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d972a790cf8f12b7e4adf3c017cf3d9efa2c5b93ecd5b56f6586b3e4df08d59
-  data.tar.gz: c4d11104ecefb85cf637dfcc9f7146494fab0263c64225719067a0c4b274212c
+  metadata.gz: b8f102397207d428e347bb308b05ec13a95816e3e6c6e8d83eab6d95ba50619f
+  data.tar.gz: 3c90203fe7a732e3877119b6986fbe63da8534555b692761f01ca50eed3ef52e
 SHA512:
-  metadata.gz: 42c10bd659a54a757537a9a882603e92f25c5dfe1e077903ebd9086fa6dd7d580a8806801ae42ef7d72b78fb4c1a8507945cb3351b4e39e6c3b860b0ceb7b355
-  data.tar.gz: 716474dcbe4691014bea9164d623746ca5cb6031174792c81c6fc2ec66fcc164869f04e1efea90793bd4f22b0420540498fea83b6f908b35aeac5bcfc0d2eae9
+  metadata.gz: ff2e3d465256a32fb5a03be23690f6a8115d5bf3045d59b621eb43dfc856d0efb018b4fcf8ed5fef766dc37f0a417607e02bd1ef2e25149be7e6b502a199af67
+  data.tar.gz: 2f1c21235b869ce0815b4f5881c3f15dec7a070adf29a162a956bc166fedb1176d062b3f7c14452b671fa4359245637800ba5877eca5f821b713f1809db86e18

data/lib/event_nlp.rb

@@ -70,7 +70,10 @@ class EventNlp
    get /(.*) on the (#{days}) of every (#{periods})/ do |title, day, recurring|
 
 
-      d = Chronic.parse(day)
+      raw_d = Chronic.parse(day)
+      
+      # 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
       
       
       if @debug then
@@ -386,6 +389,7 @@ class EventNlp
     end
 
     # hall 2 at 11am
+    #
     get /(.*)\s+at\s+(#{times})/i do |title,  time|
       
       d = Chronic.parse(time)
@@ -396,8 +400,33 @@ class EventNlp
     end         
     
     
-    # Tuesday 3rd October gas service at Barbara's house morning 9am-1pm
+    # Council Tax on the last day of the month
+    #
+    get /^(.*) (?:o[nf] the)\s*last day of the month/i do |title|
+      
+      td = @now.to_date
+      d = Date.civil(td.year, td.month, -1).to_time
+      
+      puts [5, title].inspect if @debug
+      { title: title, date: d }
+      
+    end        
     
+    # Council Tax last day of the month
+    #
+    get /^(.*) +last day of the month/i do |title|
+      
+      td = @now.to_date
+      d = Date.civil(td.year, td.month, -1).to_time
+      
+      puts [5.1, title].inspect if @debug
+      { title: title, date: d }
+      
+    end        
+    
+    
+    # Tuesday 3rd October gas service at Barbara's house morning 9am-1pm
+    #
     get '*' do
       
       s = params[:input]
@@ -435,7 +464,7 @@ class EventNlp
         end
       end      
       
-      puts [5, title, raw_date, time1].inspect if @debug
+      puts [6, title, raw_date, time1].inspect if @debug
       { title: title, date: d, end_date: end_date, recurring: recurring }
     end    
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_nlp
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   hfzP67fp+s/TI6Tk+IvaEWBcfX7AV2XjfhS+q3uCBvQRjmbbRg3JO4XdjAQI3q8d
   +P4=
   -----END CERTIFICATE-----
-date: 2018-08-19 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_cron