chronic_between 0.2.20 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8e782325343267b23052adc75dde54165a8961a9
-  data.tar.gz: aa6118e0926baea1beb55a8cab889a93b1826487
+SHA256:
+  metadata.gz: 7e2865012a80e1f1b4a3fcaf61ff9fe58dbc4e78a5a3d0d7b3f11fbfe77c9fc5
+  data.tar.gz: 24917faa9f82dd24a0bb77d69ad634a848fd2ab7f591543683c267b07a37cff2
 SHA512:
-  metadata.gz: de9153ee83dabd245c10a5f65a0b078bf9618f43bc1b06648a44339b7d9657a5f071af362d7c923d1a6db16ae04d0128d20113826e37c7cfe4526a36ab845889
-  data.tar.gz: 162ddac873e84971150116ce6ce92c6b9de41a72c1adafd33ceb7dafa4a8a2409591ad6f96b48d04830fe2f83f756bc23ad3ff9425fa4ca0e18535883c851900
+  metadata.gz: 8ae97ebee98bd804fb629e19cb43f43b89454524e3c352ad164358c734743f319588d4e29f9f075f633644e3a6278681843956e8e6489246c61b1946493e0f34
+  data.tar.gz: 84b766228dbeace64509714a112e470c70b68c139265f3165f0121970ab2be9804324e3ca8a7c2008cb95c364059a6019c3fd77369a176a90808fe85159eb1bf

data/lib/chronic_between.rb

@@ -12,13 +12,14 @@ class ChronicBetween
   def initialize(x)    
     
     @times = x.is_a?(String) ? x.split(/[,;&]/).map(&:strip) : x
-    @routes = {}; @params = {}
+    super()
   end
     
   def within?(raw_date)
     
     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 +89,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 +118,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
@@ -174,7 +159,8 @@ 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
@@ -215,4 +201,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.20
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,57 +10,75 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDRDCCAiygAwIBAgIBADANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTEzMDIwNjIwNTQzM1oXDTE0MDIwNjIwNTQzM1owSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBALCDCM7cQgz250itocNfx3a2gC0dnY0HczGIpWGkZBm40xgJ43x6LUko0Rm2
-  sQKbVRCB/eoDz3pNLgyEUSMMOqTsODe4qta8mN89l8qr2/4YZe2mX0MX5713uwVX
-  +n4D606WDHJwABC8sn8MFyCfbJkwfaajrCv/B23QReo1zhIF/Xg4c9ECTBvz3dpT
-  dh4/ToF/lUUfgmxNYHtcVJJftYWS+c1azkKHoD6OhSjZrnElckOJdcLvqzg9F4R0
-  m1HFVEZObb9S6BmfZBHf9ffBspDa9FEBxc7gQ2E80qSP3/LL/JYdkTqN8SWVIzjQ
-  bifWDVoR/cuOr7p1xwJd59ddXssCAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4E
-  FgQUjSXoiC3TrInuH7CFKhwEy40ZafgwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEB
-  BQUAA4IBAQCZ274dSGGr24+/3Tz/ws39y3vuwKsFjF0WzYPLTfS9BaoVTrtszcYA
-  txVrqdDWlNczCZsfhbL701qtAx2kj77ghB/u5vrXfDHHUs7BwwytMGERP50OVvum
-  8EIg0qgAZZZ6gBnE5fNSTOSuXYxvnAJJvW1rqXHn4a28gGIZeLfZz7ssI0w+1BJa
-  /h77pP6j8q1HBvRu8azySFNFwLHmu3bmrvjdbZzTb9wj4WpgtEv3mDbBpITOeVB9
-  aQjggWe+thx9aRnac+FunPZ7ltAgjkOreOsrc0fCXFmRlvDjbnCNBvpi4PhfHXzh
-  VK9OMDms3W3rq/ODn7ohj8ao4ZtQdcvF
+  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: 2013-09-25 00:00:00.000000000 Z
+date: 2020-08-18 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: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -78,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.0.0.rc.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: chronic_between