chronic_between 0.2.0 → 0.2.1

data/lib/chronic_between.rb

@@ -4,41 +4,43 @@
 
 require 'chronic'
 require 'date'
+require 'app-routes'
 
 class ChronicBetween
 
   def initialize(s)
     @s = s
-    @date_ranges = []
   end
   
   def within?(date)
-    params = {}
+    
+    params = {};  @date_ranges = []    
     @app = AppRoutes.new(params)
-    ranges(params, date)    
-    build_range date
     
-    d = @date_ranges.detect do |d1, d2|
-      date.between? d1, d2
-    end
+    set_ranges(params, date)
+    @s.split(',').each {|x| @app.run(x.strip)}
+    d = @date_ranges.detect {|d1, d2| date.between? d1, d2}
+
     d ? true : false
   end  
   
   private
   
-  def ranges(params, date)
+  def set_ranges(params, date)
 
     @app.routes do
 
       # e.g. Mon-Fri 9:00-16:30
-      get %r{(\w+)-(\w+)\s+([^-]+)-(.*)} do 
+      get %r{(\w+)-(\w+)\s+(\d+:\d+)-(\d+:\d+)$} do 
         
-        d1, d2, rt1, rt2 = params[:captures]
-
-        @date_ranges << [[d1,rt1], [d2,rt2]].map do |d,r| 
-          cdate = Chronic.parse(d, :now => (date - 1))
-          DateTime.parse(cdate.strftime("%d-%b-%y") + ' ' + r)
-        end
+        d1, d2, t1, t2 = params[:captures]
+        cdate1, cdate2 = [d1,d2].map {|d| Chronic.parse(d)}
+        n_days = (cdate2 - cdate1) / 86400
+        
+        0.upto(n_days.to_i).each do |n|          
+          x = (cdate1.to_date + n).strftime("%d-%b-%y ")
+          @date_ranges << [DateTime.parse(x + t1), DateTime.parse(x + t2)]
+        end        
 
       end
 
@@ -52,11 +54,28 @@ class ChronicBetween
       end
 
       # e.g. 3:45-5:15
-      get %r{(\d+:\d+)-(\d+:\d+)} do
+      get %r{^(\d+:\d+)-(\d+:\d+)$} do
         t1, t2 = params[:captures]        
         @date_ranges << [t1,t2].map {|t| DateTime.parse(t)}
       end
 
+      # e.g. Mon 3:45-5:15
+      get %r{^(\w+)\s+(\d+:\d+)-(\d+:\d+)$} do                                                    
+        d, t1, t2 = params[:captures]        
+        x = Chronic.parse(d, :now => (date - 1)).strftime("%d-%b-%y ")
+        @date_ranges << [DateTime.parse(x + t1), DateTime.parse(x + t2)]
+      end
+
+      # e.g. Mon-Wed
+      get %r{^(\w+)-(\w+)$} do                                                    
+        d1, d2 = params[:captures]        
+        cdate1, cdate2 = [d1,d2].map {|d| Chronic.parse(d)}
+        n_days = (cdate2 - cdate1) / 86400
+        
+        date = DateTime.parse(cdate1.strftime("%d-%b-%y") + ' 00:00')
+        @date_ranges << [date, date + n_days.to_i]
+      end
+
     end
 
   end
@@ -65,10 +84,4 @@ class ChronicBetween
     @app.get(arg, &block)
   end      
 
-  def build_range(date)
-    # parse the days
-    raw_days = @s.split(',')
-    raw_days.each {|d| @app.run(d.strip)}
-  end
-
 end

metadata

@@ -2,7 +2,7 @@
 name: chronic_between
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: []
 
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 00:00:00 +00:00
+date: 2011-03-26 23:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency