chronic_between 0.1.4 → 0.2.0

data/lib/chronic_between.rb

@@ -9,49 +9,66 @@ class ChronicBetween
 
   def initialize(s)
     @s = s
+    @date_ranges = []
   end
+  
+  def within?(date)
+    params = {}
+    @app = AppRoutes.new(params)
+    ranges(params, date)    
+    build_range date
+    
+    d = @date_ranges.detect do |d1, d2|
+      date.between? d1, d2
+    end
+    d ? true : false
+  end  
+  
+  private
+  
+  def ranges(params, date)
 
-  def build_range(date)
-
-    date_ranges = []
-
-    # parse the days
-    raw_days = @s.split(',')
-
-    raw_days.each do |d|
+    @app.routes do
 
       # e.g. Mon-Fri 9:00-16:30
-      raw1 = d.match(/(\w+)-(\w+)\s+([^-]+)-(.*)/)
-      
-      if raw1 then
+      get %r{(\w+)-(\w+)\s+([^-]+)-(.*)} do 
+        
+        d1, d2, rt1, rt2 = params[:captures]
 
-        d1, d2, rt1, rt2 = raw1.captures
-        date_ranges << [[d1,rt1], [d2,rt2]].map do |d,r| 
+        @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
 
-      else
+      end
 
-        # e.g. Saturday
-        day = d.strip[/^\w+$/]
+      # e.g. Saturday
+      get %r{^(\w+)$} do
+        day = params[:captures].first
+        cdate = Chronic.parse(day, :now => (date - 1))
+        d1 = DateTime.parse(cdate.strftime("%d-%b-%y") + ' 00:00')
+        d2 = d1 + 1
+        @date_ranges << [d1, d2]
+      end
 
-        if day then
-          cdate = Chronic.parse(day, :now => (date - 1))
-          d1 = DateTime.parse(cdate.strftime("%d-%b-%y") + ' 00:00')
-          d2 = d1 + 1
-          date_ranges << [d1, d2]
-        end
+      # e.g. 3:45-5:15
+      get %r{(\d+:\d+)-(\d+:\d+)} do
+        t1, t2 = params[:captures]        
+        @date_ranges << [t1,t2].map {|t| DateTime.parse(t)}
       end
+
     end
+
   end
+  
+  def get(arg,&block)
+    @app.get(arg, &block)
+  end      
 
-  def within?(date)
-    date_ranges = build_range date
-    d = date_ranges.detect do |d1, d2|
-      date.between? d1, d2
-    end
-    d ? true : false
+  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.1.4
+  version: 0.2.0
 platform: ruby
 authors: []
 
@@ -24,6 +24,17 @@ dependencies:
         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"
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: 
 executables: []