chronic_between 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b480afa919f943c206c835a0aa56efd547543047
-  data.tar.gz: be34c656f9be59ca7c01378c8fcc01ccf6a0275b
+  metadata.gz: 6dfb37c01093fbbf536e29073a9725e675a1a0f6
+  data.tar.gz: 63b9063fe483ea098d27163049a69c4304408a2e
 SHA512:
-  metadata.gz: c0587a2c11affe7ddeec83706c6111c3a7ca12148a872b2ce5d550b41cfad0b1bf9233f352148161d477d02214b8befbcdb3ce025af91f8f4d664da64b02afa8
-  data.tar.gz: 7796874deda9431678cb185175ee14ebf7c46508d51567fde6d0867ac9bcc6964f9b8bdbbe639ec05bc88bba2a9eb7fc66496913a1159e05a24bb0d4413f0efb
+  metadata.gz: f816539494c46ee60120445e9a28a4de321d6532f06c1b60a6d65365b70329c17427bbe43ae0873022a3c1eca04b831c0173f55a6842a4f84d54ef7b49b32aaf
+  data.tar.gz: a4f7b4a864b7134b806b827a662acdf0ae929ca3f98a4db72132f98f708daf27d6853ed0692731da0b6b53821e1df0754d427bcefc12b09bb190152c8480c01d

checksums.yaml.gz.sig

@@ -1 +1 @@
-:�8��A�bB��s��o+ZTd)g���u��t��oU��j���	��Nt�H1����4�w�����`�%c�u�O<a�����[#��b~6P$�S�̅����qE�]��[��o	��a�O��s�\���}V�6�gm�H���ad��6cNy�AÊy2mb��Mn�	��(���=>B���Q��2��`��A��u�ѩ&����e�w�j��x��ڭi��<~77�J��?RvΓ��`�m�%�n'��
+��}v���Cэ� �^�5��k:*	��TfH�n�v�V/Ȧ��:�K���
�s�d]dȟΏ�d.%�T
�d��U�֞ߚ��m`K�����|q+�g��'�4m�cV���0�0q�@�P��*���D�`���H7��S۬�*�����7ʙ�~�ʌ\&�F�)$�U�����XIx�ni�:K����4:��`��. �p>�{9�?������&�5)Ks��e���\�vHRH+lES���@!?��8��

data/lib/chronic_between.rb

@@ -6,7 +6,6 @@ require 'chronic'
 require 'date'
 require 'app-routes'
 
-
 class ChronicBetween
   include AppRoutes
   
@@ -19,6 +18,8 @@ class ChronicBetween
   def within?(raw_date)
     
     date = raw_date.respond_to?(:to_datetime) ? raw_date.to_datetime : raw_date
+    @timezone = date.strftime("%z")
+    @year = date.year
     dates = []
     
     ranges(@params, date)
@@ -145,7 +146,7 @@ class ChronicBetween
     # e.g. April 2nd - April 5th 12:00-14:00
     get %r{^(.*)\s+-\s+(.*)\s+(\d[\w:]*)-(\d[\w:]*)$} do                                                    
       d1, d2, t1, t2 = params[:captures]
-      cdate1, cdate2 = [d1,d2].map {|d| Chronic.parse(d)}
+      cdate1, cdate2 = [d1,d2].map {|d| Chronic.parse(d, :now => Time.local(@year))}
       n_days = ((cdate2 - cdate1) / 86400).to_i
       dates = 0.upto(n_days).map do |n|          
         x = cdate1.to_datetime + n
@@ -156,7 +157,7 @@ class ChronicBetween
     # e.g. April 5th - April 9th
     get %r{^(.*)\s+-\s+(.*)$} do                                                    
       d1, d2 = params[:captures]        
-      cdate1, cdate2 = [d1,d2].map {|d| Chronic.parse(d)}
+      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')
@@ -166,7 +167,7 @@ class ChronicBetween
     # e.g. April 5th
     get %r{^(.*)$} do
       day = params[:captures].first
-      cdate1 = Chronic.parse(day)
+      cdate1 = Chronic.parse(day, :now => Time.local(@year))
       date1 = DateTime.parse(cdate1.strftime("%d-%b-%y") + ' 00:00')
       [date1, date1 + 1]
     end
@@ -195,7 +196,7 @@ class ChronicBetween
   end  
   
   def latest_date_and_ndays(date, d1, d2)
-    raw_date1 = Chronic.parse(d1, :context => :past)
+    raw_date1 = Chronic.parse(d1, :context => :past,  :now => Time.local(@year))
     raw_date2 = Chronic.parse(d2, :now => raw_date1)
     cdate2 = Chronic.parse(d2, now: (date - 1))
     n_days = ((raw_date2 - raw_date1) / 86400).to_i
@@ -203,8 +204,8 @@ class ChronicBetween
     [cdate2, n_days]
   end
   
-  def time_range(date, t1, t2)  
-    [t1,t2].map {|t| DateTime.parse(date.strftime("%d-%b-%y ") + t)}
+  def time_range(date, t1, t2)
+    [t1,t2].map {|t| DateTime.parse(date.strftime("%d-%b-%y ") + t + @timezone )}
   end
   
   alias datetime_range time_range

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic_between
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   aQjggWe+thx9aRnac+FunPZ7ltAgjkOreOsrc0fCXFmRlvDjbnCNBvpi4PhfHXzh
   VK9OMDms3W3rq/ODn7ohj8ao4ZtQdcvF
   -----END CERTIFICATE-----
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic