chronic_between 0.2.22 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950a7b75d0a94bf583479236db63901ac5497ea2
-  data.tar.gz: a6718b76e616240dfa9e6cc08497bb9dfd295fae
+  metadata.gz: 053e7db0d6fb0f75c9a59cb8d37135a02b4dc3dc
+  data.tar.gz: 4d4e042caacdd438456dfbdf8f78f294844d053c
 SHA512:
-  metadata.gz: d9a75d0cd6a1b4d457b0dacdd5cb9ce3ce3c78e8508e18f9ac6dda5538844366adcd9a404394398a5c33972b541684ac4592381302d49183dfd8f7e7ca27de15
-  data.tar.gz: da718dd72272028073d02764cf5048b4ef995de197d8ef1e956082bdeeabb6cfc90c94682988cf305b1d86f1b93d720cbb8698268e8c883f2277b88b0c30d1ed
+  metadata.gz: 75dfb53477873ebc5baf00e7c81fbcede7746ae380ee5375d22f5d21355c02f310edeadda0c3720e6efc661b8e49ce25551ab799a409bf1224c773632a49a03a
+  data.tar.gz: 586929e355ce1e076c21ff16de85fdfb7d4ca1e058d824fe50b0fd598afe286e6de87dbe05651cc59a0b1724296c342fad9711211fba92a57674b5849092b1a4

data.tar.gz.sig

@@ -1,2 +1 @@
-S�I'm�;n�u�b�aj�6���� \H@��52�V� �WO�����q��[3��j���49b}�Jo}Xa�Zxnѓ}."��t���l�o�*�
-5ua~��9�޶J1v���D�a�yJ����(�P�>>0�3d�z�!n�Jdε��b�A�����z���zN��1R�gʧ&�lLg��*fT�x��=��r"D	�ep�gp�1����II�+�!�걸\�s��`�)
+
Op� ��!��TQÍh��Uj���?w�R�<�@��-�'��>b�ʾs;�������×�7cA�Sɗ�2��ŒJ�C���#WfG���]�@�� �����`�?
ڛ��7�K��AJ�݀3_���W�P��p�L�^ L�r�=��$|��yU�����_�V�����8u��>�b�!�$��x&�Y��`�b攕Ԝ��q�S��ZN��#6�@t�c�8i;��Pqj�z���d�0ȧ�

data/lib/chronic_between.rb

@@ -88,43 +88,27 @@ class ChronicBetween
     end
 
     # e.g. 3:45-5:15
-    get %r{^(\d[\w:]*)\s*-\s*(\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:]*)\s*-\s*(\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:]*)\s*-\s*(\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+)\s*-\s*(\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)
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic_between
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   gYAnNN6964dJK3oesiLcjg63rKSzHdCi9lmJT2AI/4pipR9a+tLLdd5zDRr5nCsv
   UYxJo7I155qFQQ==
   -----END CERTIFICATE-----
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic

metadata.gz.sig

@@ -1,3 +1,2 @@
-���4u'_8��o��č��f�����~L�ÇF��UT;��4U}c�͗c��_1�, =o$&�~f���UؕI �بT�GK�
-҆�m�&۴	���ퟰAc	�1�&
-�=p�>�&j��-q����[]؟Fl�gf���;�G��8�
+�J�\���F�`ċ��SP�͸�?�ךw�Jri�^|�@9�!�9��1	0!o
+�s7\UIa�ŖR�?A!�0��$����C���S+5�@ �W=�v���~%nN�Z�XQ���ܴ�p�8ٽ*v�ٹ�h)]�3slD��
T~@j}w�P>H��q\�����Z��n�3ZI������yB\�]�`�闘����oP@ZoC�j��-p2�*�kw�A���U9<@%���"vW,{���j�e5t��