event_nlp 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d5bbf4a56bcfe0d8bbc9ca0c85161017a4f8974
-  data.tar.gz: f0c27a31ea7f6336e9ab2b2246ad72ca78fc2e8c
+  metadata.gz: 947e5f9695c93cc625ad9007c61ff80afa8191ff
+  data.tar.gz: 9199d0152c313cc0fdbfd11a8b68c020e6398f82
 SHA512:
-  metadata.gz: f0224cf316e4c22dfa784c9586f26a3f8c47e89769fa0a19b8b34f167aa99f3c6711a82789624c10bcad7603afd9dfa3fd6ac55543a13d2f899ecd9877e7e782
-  data.tar.gz: 8271a2e8d337d5c3389bcc93187b72a3590620b706645c41700277724bf08d13ca2498f9ce73bbeca6571fa2541e15ce3e6936373d25544bee89c17104b431ec
+  metadata.gz: 8caf2256f0923e0a33ba35a14e648023a39dd1eb9300b0b1d00cf30d911c02073ec1a0e313ab7d9590f8fa4b801d48a11795d9657f12649106e2b6151db85d50
+  data.tar.gz: 3be7a1c81e86f5a664e0678865b9cc97cba0e4eacc602a12f46db7085a976aa097281f7fa0b5162119a3f52bb4fe6bf0ecc20626798b3b784cf0f8257d5d3844

data/lib/event_nlp.rb

@@ -146,6 +146,8 @@ class EventNlp
     # some event every 2nd Monday (starting 7th Nov 2016)
     # some event every 2nd Monday (starting 7th Nov until 3rd Dec)    
     # some event every 2 weeks (starting 02/11/17)
+    # some event every Wednesday 1pm-4pm
+    #
     get /^(.*)(every .*)/ do |title, recurring|
 
       raw_start_date = recurring[/(?<=starting )[^\)]+/]
@@ -159,12 +161,19 @@ class EventNlp
         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)
       end
+      
       d = cf.to_time
       
+      if recurring =~ /-/ then
+        end_date = Chronic.parse d.to_date.to_s + ' ' + 
+            recurring[/(?<=-)\d+(?::\d+)?(?:[ap]m)?/] 
+      end
+          
       puts [0.5, title, recurring, d].inspect if @debug
-      {title: title.rstrip, recurring: recurring, date: d }
+      {title: title.rstrip, recurring: recurring, date: d, end_date: end_date }
       
     end    
     
@@ -277,6 +286,7 @@ class EventNlp
 
     get /^(.*) (#{days}) (#{months}) from (#{times2})/i do |title, day, month, xtimes|
 
+      puts 'before xtimes : ' + xtimes.inspect
       t1, t2 = xtimes.split(/-/,2)
 
       d1 = Chronic.parse([month, day, t1].join(' '))
@@ -291,6 +301,7 @@ class EventNlp
     
     get '*' do
       
+      puts 'or else'
       s = params[:input]
       
       time1, time2, month, weekday, day, end_date, annualar  = nil, nil, nil, 

metadata

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