reservation 0.0.5 → 0.0.6

data/lib/reservation/interval.rb

@@ -24,6 +24,10 @@ module Reservation
         new HourMinute.parse(start), HourMinute.parse(finish)
       end
 
+      def self.parse intervals
+        intervals.split(',').map { |i| self.from(*i.split('-')) }
+      end
+
       def to_s
         "#{start}-#{finish}"
       end

data/lib/reservation/version.rb

@@ -1,3 +1,3 @@
 module Reservation
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/reservation/weekly.rb

@@ -30,11 +30,18 @@ module Reservation
 
         patterns.each { |pattern|
           day = pattern["day"]
+          dayno = (day =~ /\d+/) ? day.to_i : DAY_MAP[day]
+
           nth_of_month = parse_nth_of_month pattern["nth_of_month"]
 
-          start  = HourMinute.parse pattern["start"]
-          finish = HourMinute.parse pattern["finish"]
-          self.wdays << Daily.new(DAY_MAP[day], nth_of_month, Interval.new(start, finish))
+          if pattern["intervals"]
+            intervals = Interval.parse(pattern["intervals"])
+            self.wdays.concat intervals.map { |i| Daily.new(dayno, nth_of_month, i) }
+          else
+            start  = HourMinute.parse pattern["start"]
+            finish = HourMinute.parse pattern["finish"]
+            self.wdays << Daily.new(dayno, nth_of_month, Interval.new(start, finish))
+          end
         }
       end
 

data/spec/models/schedule/interval_spec.rb

@@ -34,4 +34,12 @@ describe Reservation::Schedule::Interval do
     event.start.pretty.should  == "20130712T1830"
     event.finish.pretty.should == "20130712T2300"
   end
+
+  it "should parse a text list of intervals" do
+    intervals = Reservation::Schedule::Interval.parse "9h-12, 12h30-13:30 , 14-17.30"
+    intervals[0].to_s.should == "0900-1200"
+    intervals[1].to_s.should == "1230-1330"
+    intervals[2].to_s.should == "1400-1730"
+    intervals.size.should == 3
+  end
 end

data/spec/models/schedule/weekly_spec.rb

@@ -28,6 +28,24 @@ describe Reservation::Schedule::Weekly do
     weekly.matches?(event).should be_true
   end
 
+  it "should match when there exists a matching interval on the same day as the given event and the day is given as numeric" do
+    weekly = Reservation::Schedule::Weekly.new [ { "day" => "3", "start" => "0930", "finish" => "10:30"},
+                                                 { "day" => "3", "start" => "18",   "finish" => "20"   },
+                                                 { "day" => "5", "start" => "7h",   "finish" => "9:30" },
+                                                 { "day" => "2", "start" => "7",    "finish" => "8h30" }  ]
+
+    weekly.matches?(event).should be_true
+  end
+
+  it "should match when there exists a matching interval on the same day as the given event and the day is given as numeric and intervals as a list" do
+    weekly = Reservation::Schedule::Weekly.new [ { "day" => "3", "intervals" => "7-830, 9h00-12:30,13-1730" },
+                                                 { "day" => "3", "intervals" => "7-830, 9h00-12:30,13-1730" },
+                                                 { "day" => "5", "intervals" => "9h00-12:30,7-930,13-1730 " },
+                                                 { "day" => "2", "intervals" => "7-830, 9h00-12:30,13-1730" }  ]
+
+    weekly.matches?(event).should be_true
+  end
+
   it "should not match when there exists no matching interval on the same day as the given event" do
     weekly = Reservation::Schedule::Weekly.new [ { "day" => "wed", "start" => "0930", "finish" => "10:30"},
                                                  { "day" => "wed", "start" => "18",   "finish" => "20"   },
@@ -37,6 +55,15 @@ describe Reservation::Schedule::Weekly do
     weekly.matches?(event).should be_false
   end
 
+  it "should not match when there exists a matching interval on the same day as the given event and the day is given as numeric and intervals as a list" do
+    weekly = Reservation::Schedule::Weekly.new [ { "day" => "3", "intervals" => "7-830, 9h00-12:30,13-1730" },
+                                                 { "day" => "3", "intervals" => "7-830, 9h00-12:30,13-1730" },
+                                                 { "day" => "5", "intervals" => "9h00-12:30,7-1130,13-1730 " },
+                                                 { "day" => "2", "intervals" => "7-830, 9h00-12:30,13-1730" }  ]
+
+    weekly.matches?(event).should be_false
+  end
+
   it "should generate events corresponding to the weekly schedule" do
     weekly = Reservation::Schedule::Weekly.new [ { "day" => "wed", "start" => "0930", "finish" => "10:30"},
                                                  { "day" => "wed", "start" => "18",   "finish" => "20"   },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reservation
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails