chronic_between 0.2.21 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f3d968ce9b2f81737fb89d9d5d1724e4d86d2bcd
-  data.tar.gz: ad2fb0eee29e9de621c73a2e5d7709d8417c7278
+SHA256:
+  metadata.gz: cd466f4f19e9f874988e0329cf2a23e65dae616e89a43cc6adc96fbb226c7f4a
+  data.tar.gz: a73e8db3600949810dcc188a1b93f38dea023a4b1af71149e507462dad63d860
 SHA512:
-  metadata.gz: 962205a48171d76ec5bcf0a07a22bdf21972de0d2e1b45b5c4b5cedcdb76edc1962de6ad019a63e7d5bc843e289678dcd9082b2567d936965fdf3ba252cda9a7
-  data.tar.gz: efbcd8fd96296877cbd93d0fd95f55cb61208d46535828c64846bd3c36bd4ac91bb317bb7b05e47d3ab3265549b3c49ec27a52da3579f5c22744244cb14c2bc4
+  metadata.gz: dcff7e1534de947ebecf54b4f99bd4ae256e58010e25ddc403329af1369c72c79d9637d516f02a7572912bc84d643feee078d830bf7b32ccba33b21696181ab5
+  data.tar.gz: 0e84a667249e165e9a59a82b12bead1d1e08e8c3e216988fc4f0a9122fbcb09f27db1244e6fd0d534ab039c4cf5b0bb4936262c48e15f8bb46fc14a4ec0edffb

data/lib/chronic_between.rb

@@ -9,8 +9,9 @@ require 'app-routes'
 class ChronicBetween
   include AppRoutes
   
-  def initialize(x)    
+  def initialize(x, debug: false)    
     
+    @debug = debug
     @times = x.is_a?(String) ? x.split(/[,;&]/).map(&:strip) : x
     super()
   end
@@ -19,6 +20,7 @@ class ChronicBetween
     
     date = raw_date.respond_to?(:to_datetime) ? raw_date.to_datetime : raw_date
     @timezone = date.strftime("%z")
+    @params[:timezone] = @timezone
     @year = date.year
     dates = []
     
@@ -88,43 +90,27 @@ class ChronicBetween
     end
 
     # e.g. 3:45-5:15
-    get %r{^(\d[\w:]*)-(\d[\w:]*)(?=\s*(daily|every day)?)} do
+    get %r{^(\d[\w:]*)\s*(?:-|to|and)\s*(\d[\w:]*)(?=\s*(daily|every day)?)} do
       t1, t2 = params[:captures]        
       time_range(date, t1, t2)
     end
     
-    # e.g. 3:45 to 5:15
-    get %r{^(\d[\w:]*)\s+to\s+(\d[\w:]*)(?=\s*(daily|every day)?)} do
-      t1, t2 = params[:captures]        
-      time_range(date, t1, t2)
-    end    
 
     # e.g. Mon 3:45-5:15
-    get %r{^(\w+)\s+(\d[\w:]*)-(\d[\w:]*)$} do                                                    
+    get %r{^(\w+)\s+(\d[\w:]*)\s*(?:-|to|and)\s*(\d[\w:]*)$} do                                                    
       d1, t1, t2 = params[:captures]        
       cdatetime_range(date, d1, t1, t2)
     end
-    
-    # e.g. Mon 3:45 to 5:15
-    get %r{^(\w+)\s+(\d[\w:]*)\s+to\s+(\d[\w:]*)$} do                                                    
-      d1, t1, t2 = params[:captures]        
-      cdatetime_range(date, d1, t1, t2)
-    end    
-    
+        
     # e.g. 3:45-5:15 Mon
-    get %r{^(\d[\w:]*)-(\d[\w:]*)\s+(\w+)$} do                                                    
+    get %r{^(\d[\w:]*)\s*(?:-|to|and)\s*(\d[\w:]*)\s+(\w+)$} do
       t1, t2, d1 = params[:captures]        
       cdatetime_range(date, d1, t1, t2)
     end
     
-    # e.g. 3:45 to 5:15 Mon 
-    get %r{^(\d[\w:]*)\s+to\s+(\d[\w:]*)\s+(\w+)$} do                                                    
-      t1, t2, d1 = params[:captures]        
-      cdatetime_range(date, d1, t1, t2)
-    end        
 
     # e.g. Mon-Wed
-    get %r{^(\w+)-(\w+)$} do                                                    
+    get %r{^(\w+)\s*(?:-|to|and)\s*(\w+)$} do                                                    
       d1, d2 = params[:captures]        
       cdate2, n_days = latest_date_and_ndays(date, d1, d2)
       
@@ -133,17 +119,17 @@ class ChronicBetween
     end
     
     # e.g. after 6pm
-    get %r{^after\s+(\d[\w:]*)$} do                                                    
+    get /^after\s+(\d[\w:]*)$/i do                                                    
       t1 = params[:captures].first
-      date1 = DateTime.parse(date.strftime("%d-%b-%y ") + t1)
+      date1 = DateTime.parse(date.strftime("%d-%b-%y ") + t1 + ' ' + params[:timezone])
       date2 = DateTime.parse((date + 1).strftime("%d-%b-%y ") + '00:00')      
       [date1, date2]
     end            
 
     # e.g. before 9pm
-    get %r{^before\s+(\d[\w:]*)$} do                                                    
+    get /^before\s+(\d[\w:]*)$/i do                                                    
       t1 = params[:captures].first
-      date2 = DateTime.parse(date.strftime("%d-%b-%y ") + t1)
+      date2 = DateTime.parse(date.strftime("%d-%b-%y ") + t1 + ' ' + params[:timezone])
       date1 = DateTime.parse(date.strftime("%d-%b-%y") + ' 00:00')
       [date1, date2]
     end
@@ -161,12 +147,15 @@ class ChronicBetween
     
     # e.g. April 5th - April 9th
     get %r{^(.*)\s+-\s+(.*)$} do                                                    
+      
+      puts 'route 600' if @debug
       d1, d2 = params[:captures]        
       cdate1, cdate2 = [d1,d2].map {|d| Chronic.parse(d, :now => Time.local(@year))}
       n_days = ((cdate2 - cdate1) / 86400).to_i
       
       date1 = DateTime.parse(cdate1.strftime("%d-%b-%y") + ' 00:00')
-      [date1, date1 + n_days + 1]
+      date2 = DateTime.parse(cdate1.strftime("%d-%b-%y") + ' 23:59:59')
+      [date1, date2 + n_days]
     end
 
     # e.g. April 5th
@@ -174,12 +163,14 @@ class ChronicBetween
       day = params[:captures].first
       cdate1 = Chronic.parse(day, :now => Time.local(@year))
       date1 = DateTime.parse(cdate1.strftime("%d-%b-%y") + ' 00:00')
-      [date1, date1 + 1]
+      date2 = DateTime.parse(cdate1.strftime("%d-%b-%y") + ' 23:59:59')
+      [date1, date2]
     end
 
   end
 
   def build(times)
+    
     times.inject([]) do |result, x|
       r = run_route(x.strip)
       r.first.is_a?(Array) ? result + r : result << r
@@ -215,4 +206,4 @@ class ChronicBetween
   
   alias datetime_range time_range
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic_between
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,59 +10,75 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE0MDIyMjIyNDYyMFoXDTE1MDIyMjIyNDYyMFowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAO+p5KofHi+Ouh5y5nvDf+D6IybatY/ZMGPKRRYlfdK6p3yWe2HpGJfvsI10
-  zwynkn77MNBwoubvZs6MktrDnD6pKndXyRL9mo7LNEFdy7JESnEqwnMCdenkvYaq
-  aOz3V/p9k6p58qmJSWRci4md782oWikXkpZpOEXNIw7JktlnEwrzvBm9L/p4UjMc
-  fnkRYOBPoPuAmf22zk8JUuT/BLcIcsdzbIxmr8biC06WZFiCj7888KWJcu30zumP
-  uA0zPhZXj6SvDbMBdxdwVYT7T9/rWf3B4ORv5qKo4dijk6d9yR/hGVgKgI6vnMFD
-  PPUvpmBpR7V4lUpkKOjex3/RWmkCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUEzVnKVvMvzuGUaZQw8kEw5PbQOswJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAq7Rwmt3C
-  fIuAhHaxqclZiNjspQ7vB3F6Ho+VlvxAiIWQRfPgwCxqaM5Dd7pwabSEiKs2YRI6
-  tEIWCVW/aRsmQYhql7KjD5uuHs5uvddB5JAVFhGQE2tLQXRPSgj2hUanowdgjeW6
-  Zho1KpmdNLG6OEt8PeNRHuBzZHL3WtW84FfP5A0/ecF9uH5I4jBNiFr1ORCszUz3
-  QDISRoKmRySefCbhCbNuXL+IueFoCHdJVJGZKVGzr9CkPd3PMlHbjnmC+AcNtpRR
-  I870z1YQbTdYpNu9J7zuZ7R7+mfH0TXYJg+XV5og7Pv389oFYfWxJ9pVnA6pljor
-  tjkfTn3muJQ0Fw==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwODE4MTcwMTA1WhcN
+  MjEwODE4MTcwMTA1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDVMMq9
+  bgpnqDVGlYkpENsJAe7YvoI2RgZJFIuyQud5EdIAzf0jCBf8Y07BGN2CHl4A4uIN
+  b3R/WassouzLuRwIvOOQnqMgpvLtUhatIhjTEIp7xXWPpIg+PDjo63+7UVIemldU
+  tVvSDr5GTDYa/+MjnWjhVfn+oJxKKFguVgxj8PNxqoWWlB0oRUI3/+4YlV96rvT8
+  xqbZTWe3fiVdmwZNcPClZmQX5hzy7ahdHhJKC2oM72L+xQeVTiLaidgFvk76L9Dd
+  axRNBVJBMEADB/xx9XpLPhfnB7bs4G4eotEq8Q0yeF5bInTAw6fEVptexYFLpeiU
+  tOqE+9zr8Qx4H/RhANudEmiauAiXllmWN3JnJLS/a1fVcAVLadONuuzD73aJlHm4
+  HvA06lDZhIf8CPsN6kpPydee3pSaBdmWd/lUc/f5a/qQvowbrk10iIp1wImQojWB
+  r08W/Lz4TMUqW6GJuENHJ1WSEjUa32irHtzyl856pIgpwdYGCDAknNh3xUsCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUL3JwC0U0
+  NTEBIRAU2/5NHLyBfIUwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAYB9IpIiU4GuRdfRAhm312QppI9QVUhaKdHB+Vaz+
+  Lkjm2T+twfrsSysLFzuNQ2DFK82VL7l8MP9rybUPpUgY0EbNbLmzBJQeHjUQJAyb
+  4YSXeAXgsGXi3KXZRKwr76hIsuy+1/lX5SMyfGFrRxeZZbj4kBX2J7ro78zFUCFx
+  755lm8NO/33fxzhoQ1KyooiJE+hWCFfUmKfxdDmj6ufWnTz39O2vTHxLV9ErmyiP
+  uVWUHcbLoUUwD9lDzC8sfgywpVK+wMTX3KoIbxWDbLV7T0YYwXPipNNao6YVjg3c
+  6YAndyTrY7nytVYX0phechPNprMvacxKtHvyWPTOY3JxgfW/drVSQfBeQH2Urezn
+  qYLkS0jCgesFuRz6AbSvvufxl8sJUwRwoyEy6BGP/iY6TxWq6g7VyuNdHlMwAiZ6
+  Ne+ahcHAtwCL3/OPMC7V9VQfw400l8Gx8gnhXY+vg37QXrdjt1Aq6cSlHhdnQJkr
+  +UWA0LSKYjup6Y8u3MMD7/Lf
   -----END CERTIFICATE-----
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2021-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: app-routes
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.19
 description: 
-email: james@r0bertson.co.uk
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -80,15 +96,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: chronic_between