chronic_between 0.2.11 → 0.2.12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 477a43d00b7b5f5ba9bb9577cbec7e23f74e37b0
+  data.tar.gz: 4154370117160cf97a9a248e25115ea2f21df855
+SHA512:
+  metadata.gz: c2e5a20e6905e8d4b629b48b7df90f3f86ad457efb36f6fa60398050a7dea075c0dba0e1ac04ecb37b9b471a75ebb1bad2635150a9d116624d2fa5902dffe5a5
+  data.tar.gz: 2ec61b2561c8ae823426a6878dfc0324ca2cf18f8c5451cd62a4a474b25b0985c7bc00801f85197941c8d0ed3407f534366daf3a8a11f4bd65d3eb45dadfe06d

data/lib/chronic_between.rb

@@ -13,11 +13,13 @@ class ChronicBetween
   def initialize(x)    
     
     @times = x.is_a?(String) ? x.split(/[,;&]/).map(&:strip) : x
+    puts '@times : ' + @times.inspect
     @routes = {}; @params = {}
   end
     
-  def within?(date)
+  def within?(raw_date)
     
+    date = raw_date.respond_to? ? :to_datetime : raw_date
     dates = []
     
     ranges(@params, date)
@@ -27,7 +29,8 @@ class ChronicBetween
     closed_times.map!{|x| x[/^#{negatives}(.*)/,2]}
     
     dates = build times
-    inside_range = dates.detect {|d1, d2| date.between? d1, d2}    
+    puts 'dates : ' + dates.inspect
+    inside_range = dates.detect {|d1, d2| p [d1,d2]; date.between? d1, d2}    
     
     neg_dates = build closed_times
     inside_restrictions = neg_dates.detect {|d1, d2| date.between? d1, d2}
@@ -51,6 +54,7 @@ class ChronicBetween
     # e.g. Mon-Fri 9:00-16:30
     get %r{(\w+)-(\w+)\s+(\d[\w:]*)-(\d[\w:]*)$} do       
       d1, d2, t1, t2 = params[:captures]
+      puts 'fooo'
       date_range_time_range(date, d1 ,d2, t1, t2)
     end
     
@@ -174,6 +178,7 @@ class ChronicBetween
 
   def build(times)
     times.inject([]) do |result, x|
+      puts 'x: ' + x
       r = run_route(x.strip)
       r.first.is_a?(Array) ? result + r : result << r
     end
@@ -185,6 +190,7 @@ class ChronicBetween
       x = (cdate2.to_date - n)
       datetime_range(x, t1, t2)
     end
+    return dates
   end
   
   def cdatetime_range(date, d1, t1, t2)
@@ -207,4 +213,4 @@ class ChronicBetween
   
   alias datetime_range time_range
   
-end
+end

metadata

@@ -1,14 +1,13 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: chronic_between
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.2.11
+version: !ruby/object:Gem::Version
+  version: 0.2.12
 platform: ruby
-authors: 
+authors:
 - James Robertson
 autorequire: 
 bindir: bin
-cert_chain: 
+cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIDRDCCAiygAwIBAgIBADANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
@@ -30,67 +29,64 @@ cert_chain:
   aQjggWe+thx9aRnac+FunPZ7ltAgjkOreOsrc0fCXFmRlvDjbnCNBvpi4PhfHXzh
   VK9OMDms3W3rq/ODn7ohj8ao4ZtQdcvF
   -----END CERTIFICATE-----
-
-date: 2013-02-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: chronic
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: app-routes
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: app-routes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/chronic_between.rb
 homepage: 
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0.rc.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: chronic_between
 test_files: []
-