event_nlp 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75ea86b27b76ab7ef5c6854745d2a69ac6a42cc8
-  data.tar.gz: 6dce89724cd451c3e846ee7ed8a8b192cee5c05b
+  metadata.gz: 9765f56a2cdca51484e63883fe5b1999074570b8
+  data.tar.gz: d9c5b776cdeaa3aa6ad915b4de05366073f16572
 SHA512:
-  metadata.gz: 0be76dd0f761dc0e8ff426f0b01cbc39f2bc0a8299e4efee10b61bc1c6a97a4ab878116e4cec6dfd3d03f7cc1acc87466df5fc56d4b951ac54fa4231a0b909b5
-  data.tar.gz: 5028caf7b3887fc59a35bb4439759b93da0ab49fa36eca6fb7abc46709c12c37eae8a7c55c534bf9e0db514db0a4221c43791a193bcc3acee501bdb123acf5fb
+  metadata.gz: eb3dbed493d2946b933fa16d2bd8a94698bc4744ff6b094d01c5801d5aed720f391cb4f9b1fc4eb44e9df0a226035e515638e787eaed83b0941b9d0265ff84fc
+  data.tar.gz: 208d2d5aee1a109e1e2e546b29ccd10aa7ab931e307ec30720c366e16b204d013daf84951cadf833771ac5145eab3c6d0a0a70caf5a078fa3a543353d6ee326e

data/lib/event_nlp.rb

@@ -150,22 +150,39 @@ class EventNlp
     #
     get /^(.*)(every .*)/ do |title, recurring|
 
+      input = params[:input].clone
       raw_start_date = recurring[/(?<=starting )[^\)]+/]
       
-      if raw_start_date then
+      d = if raw_start_date then
         start_date = Chronic.parse(raw_start_date, now: @now - 1, 
                                    :endian_precedence => :little)
 
-        exp = ChronicCron.new(recurring, start_date).to_expression
+        puts 'start_date: ' + start_date.inspect if @debug
+        
+        if @now > start_date then
+          exp = ChronicCron.new(recurring, start_date).to_expression
+          puts 'exp: ' + exp.inspect if @debug
+          
+          cf = CronFormat.new(exp, start_date)
+          puts cf.to_time if @debug
+          #cf.next until cf.to_time >= start_date
+          
+          new_date = cf.to_time
+          input.gsub!(/(?<=starting )[^\)]+/, new_date\
+                      .strftime("#{new_date.day.ordinal} %b %Y"))
+          new_date
+
+        else
+          start_date
+        end
         
-        cf = CronFormat.new(exp, start_date - 1)
-        #cf.next until cf.to_time >= start_date
       else
         exp = ChronicCron.new(recurring).to_expression
         cf = CronFormat.new(exp, @now)
+        cf.to_time
       end
       
-      d = cf.to_time
+
       
       if recurring =~ /-/ then
         end_date = Chronic.parse d.to_date.to_s + ' ' + 
@@ -173,7 +190,7 @@ class EventNlp
       end
           
       puts [0.5, title, recurring, d].inspect if @debug
-      {title: title.rstrip, recurring: recurring, date: d, end_date: end_date }
+      {input: input, title: title.rstrip, recurring: recurring, date: d, end_date: end_date }
       
     end    
     
@@ -341,4 +358,4 @@ class EventNlp
     
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_nlp
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   /WtgKLMzCAKTHZ2OpN3OTs6j+vsUBIwCb/Ki17Z4YULtRaGg7I8nTjTrHIIJ0yNm
   kbRihMTezaC+4A==
   -----END CERTIFICATE-----
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2017-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_cron