event_nlp 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42e47f457a1e07759fc8b3de0ae3f85d35fc0679e252c9c52570457e5d389125
-  data.tar.gz: 58cabc06778bed4444a025092f47699089627145c06ab91befc1f02050e1a61a
+  metadata.gz: f046c9ebbe0ea0e05075a6eaa38d6b5cf053d5072fc6a0ea7ec93d695f5ea449
+  data.tar.gz: 51912d0dee9bf7c638ddb4b10946ad0f5ce560ed95398ab12a27ea417ae79391
 SHA512:
-  metadata.gz: e223d22b9a2404c8467fce4b9b8f58b9889dfffa15a3c83aaccc5c8d3912abaf50cf26bc46fbfc84744f345afa6905fbfcd7f27a49293d4b915c6cba72e49a47
-  data.tar.gz: b8f40f7a4168aaed947b00a2bbab9fd7864fc81388305cd8f6ede785bf84added0bef7fa3561f16400f35e2309eb0aefc0bdfab44ebef53df088058103eb3c19
+  metadata.gz: 5e093f418335b13bd36e811176d837caa7ad399d27f09f2d6f06cc057a08a91fd9c84bf19d6d7d8403b136f88ee37d99ee262c60df1285f96a3d205da83fc571
+  data.tar.gz: 1bae302d138066d0913dc3cc7e272d233421faf44a06846e39742c5f09d4fc3cbf0ebd128ac2c002d3e030f8a99ed8bcb94a740ff617cb2eae8697cc905afe49

data/lib/event_nlp.rb

@@ -108,7 +108,7 @@ class EventNlp
       end
       
       if @debug then
-        puts [0.2, input, title, recurring, time, raw_date, end_date].inspect.debug
+        puts ["0.2".highlight, input, title, recurring, time, raw_date, end_date].inspect.debug
       end
       
       {input: input, title: title, recurring: recurring, date: d, 
@@ -138,7 +138,7 @@ class EventNlp
         end
       end
       
-      puts [0.3, title, recurring, time, raw_date, end_date].inspect.debug if @debug
+      puts ['0.3'.highlight, title, recurring, time, raw_date, end_date].inspect.debug if @debug
       {input: input, title: title, recurring: recurring, date: d, end_date: 
                                                                       end_date}
       
@@ -161,15 +161,16 @@ class EventNlp
         start_date = Chronic.parse(raw_start_date, now: @now - 1, 
                                    :endian_precedence => :little)
 
+        puts ('recurring: ' + recurring.inspect).debug if @debug
         puts ('start_date: ' + start_date.inspect).debug if @debug
         
         if @now > start_date then
-          exp = ChronicCron.new(recurring, start_date).to_expression
+          exp = ChronicCron.new(recurring, start_date, debug: @debug).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
+          cf = CronFormat.new(exp, start_date, debug: @debug)
+          puts ('cf.to_time: '  + cf.to_time.inspect).debug if @debug
+          cf.next until cf.to_time > start_date
           
           new_date = cf.to_time
           input.gsub!(/(?<=starting )[^\)]+/, new_date\
@@ -193,7 +194,7 @@ class EventNlp
             recurring[/(?<=-)\d+(?::\d+)?(?:[ap]m)?/] 
       end
           
-      puts [0.5, title, recurring, d].inspect.debug if @debug
+      puts ['0.5'.highlight, title, recurring, d].join("\n").debug if @debug
       {input: input, title: title.rstrip, recurring: recurring, 
        date: d, end_date: end_date }
       
@@ -204,7 +205,7 @@ class EventNlp
     get /(.*)\s+(\w+ \w+day of (?:the|every) month at .*)/ do 
                                                              |title, recurring|
 
-      puts [1, title, recurring].inspect.debug if @debug
+      puts ['1'.highlight, title, recurring].inspect.debug if @debug
       { title: title, recurring: recurring }
 
     end
@@ -216,7 +217,7 @@ class EventNlp
       
       d = Chronic.parse(raw_day + ' ' + time)
       
-      puts [1.5, title, raw_day, time].inspect.debug if @debug
+      puts ['1.5'.highlight, title, raw_day, time].inspect.debug if @debug
       { title: title, date: d }
       
     end    
@@ -237,7 +238,7 @@ class EventNlp
         Chronic.parse(raw_date + ' '+ time2)
       end
       
-      puts [4, title, raw_date, date2, time2].inspect.debug if @debug
+      puts ['4'.highlight, title, raw_date, date2, time2].inspect.debug if @debug
       {title: title, date: d }
        
     end
@@ -268,7 +269,7 @@ class EventNlp
 
       d1, d2 = [t1, t2].map {|t| Chronic.parse([d.to_date.to_s, t].join(' ')) }
             
-      puts [4.65, input, title, raw_day, d1, d2].inspect.debug if @debug
+      puts ['4.65'.highlight, input, title, raw_day, d1, d2].inspect.debug if @debug
       
       {input: input, title: title, date: d1, end_date: d2 }
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_nlp
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwNzA1MTAxNjMyWhcN
-  MTkwNzA1MTAxNjMyWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVsMUO
-  uqAIaefnFUYjL01BM0IKcynSiGaen10C1l+mdb5L2u/qqmDlei+dhkROzdalv3I9
-  mzfM+gmypIghj96WuiJWFN0W3ktFvxo/GBt9H5va9e8osXAzIuMmU6XcPNHRJJ8a
-  l+++HBSeBylV0JGH3h+4Ia5fF8rsnUnhXnethMO4bEjERFVH8PO6qDnL28ua3r05
-  W964deP/xkSD2JCc9UEzmfa6+vXpT8EM00TEFsC0KWLC1tbNqQHknxW/JGFsvSrm
-  rtjUzYRg4D2JzBAvkofjPWhDcDwUg9HjEslqg0k4jzk8d7bCihmRDaeNLpmjFVeu
-  miMJkFxdCkRbFxkrAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFD6Oql0vDFt0//hJu95Y7ai3GlpdMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAEVbqAk47S/3aPeR4B7G
-  l875ptDSNkXUq0Y6/c7HLtCqO8J9WPGbNUoGT3EeYQblEcay816mbd3TLOgTdmo/
-  vJphzqk0LEHBYD2oC1G7Yzzq7BHkkoJN54e6b5ZzUHNctIGluMrjnNvIagHKfJlR
-  UAX6I2o4wL8qFLDxkEcv8FRc67xJBMdQljoYHO+mM8uz8Lsk5Go0xI6UvIZvAnXh
-  fJkRwzhE/iZ3kywtmmOnZthaWgHjUoY7bl8lyroUeFf1f3f1tNUKk7kfClyRVrka
-  hfzP67fp+s/TI6Tk+IvaEWBcfX7AV2XjfhS+q3uCBvQRjmbbRg3JO4XdjAQI3q8d
-  +P4=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwOTEwMjE1ODM4WhcN
+  MjAwOTA5MjE1ODM4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDIK9mI
+  2ehHbT3MWV/EVo9LjVfNUu90FCb3R2C80G73/zGCDQKg2QaV00GUEV3c6T9ylg87
+  p9k71VIoRrTzc4wkrwIKAQnJGWOd/6iDQIIoGd1VU2NYaE/ANfAiNTnktKyYu9U8
+  oWkC+jsuCFlgsf97LbV0a+SmMberl8G3dsL3kKAgwIEThpkIpkDLrJh/O+63lDBf
+  O5duzcH2jkpAOqyFSGaEaJU3qpE7PSX80mU5JErsfLwSI2YtHOvGtXBBmJ5X6j+T
+  4oGpsdYN1teC2w/KETuAbGiBCNmKY5mTMDSZTlfWkLLBWY1HHSQ20glc0e4iQKiF
+  T5BM4/1fI7N6DF1Aa9APKdF+ulyUchcpkxhUh8CAM/8pg3UYUgyf6deGkv+I/28f
+  IT9I9uFmRKAx/U12BCRaBdh5sZAMEuLt690IzGYD/BWK+ff/NB+t+hbZYSk9OMHC
+  3J0bfnuzR5CmlmZED5Sa0X9u5EjHQeYmfI6jMjxHRoIaD3jM3SPnyQvvjx8CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUE1kZqX7n
+  oLNWhIHQ7SJAZcuZRvcwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAfOeR8ABSrmM8+Mvgm+urusqQukPUyHKf71qYBY9d
+  2RyOGJc+WY76E4Y9O5QAeUyP8ib6er/A3bQefuMrIFBnygR3Wz0GV0cmnLoMhVlO
+  TqeU1Yt9bdDDMkS3/fhDWMimrkupnhhtjxHO2B4yJ0+OB47HLzMY1NrvUJI1Xuox
+  4SfDeNtYn7Wxb1oIMviDDZqzNTSojyIPSdokR3lQHntTyUA+Q5gPZct0SAOGnWSA
+  gqYmIGDrOpj3p5yV+7ChQAMDOq0qofpisAWHjdTkk9EBG7G9xRcAjG38baeWB843
+  a12bAgeEqsysvhmtF1SD5uIhB+w659QB7fjrX227HhdgXYQ8JvtdhXAZIBcmgJX3
+  63fI7WqlDHr5cuY9XdepWpQcu0k0HVa67S1oalCyc8Gbv4iBH+mV5iSWmSKBHFX7
+  Hp/xNpvPRmTW2ospJ7tp4UsgtLogM+hwp9H5Hs7fJiJpGlVFW91zEk8bnoiDXV2w
+  9tntfqektbvPs/grQCPIucls
   -----END CERTIFICATE-----
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_cron