portera 0.1.3 → 0.1.4

data/CHANGELOG.markdown

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.4 / 2012-03-11
+
+- Allow M,Tu,W,Th,F,Sa,Su day of week symbols
+- Add input validation for days of week
+
 ## 0.1.3 / 2012-02-21
 
 - Draft simple presenter

data/lib/portera/event.rb

@@ -107,24 +107,30 @@ module Portera
     # Note assumes timeslots are appended in ascending order by range.begin
     # TODO could use some refactoring
     def coalesced
-      accum = self.class.new
-      inject(nil) do |last_slot, this_slot|
+      last_slot = nil
+      coales = inject(self.class.new) do |accum, this_slot|
         if last_slot
           rng       = this_slot.range
           last_rng  = last_slot.range
           if (rng.intersects?(last_rng) || rng.succeeds?(last_rng)) &&
              (this_slot.participants ==  last_slot.participants)
-            Timeslot.new(last_rng.begin...rng.end, 
-                         this_slot.participants)
+            last_slot = Timeslot.new(
+                          (last_rng.begin...rng.end), 
+                          this_slot.participants
+                        )
           else
             accum << last_slot
-            this_slot
+            last_slot = this_slot
           end
         else
-          this_slot
+          last_slot = this_slot
         end
+        accum
       end
-      accum
+      if last_slot 
+        coales << last_slot
+      end
+      coales
     end
 
     # sort timeslot availability by 

data/lib/portera/participant.rb

@@ -59,6 +59,13 @@ module Portera
                :thu => 4,
                :fri => 5,
                :sat => 6,
+               :su  => 0,
+               :m   => 1,
+               :tu  => 2,
+               :w   => 3,
+               :th  => 4,
+               :f   => 5,
+               :sa  => 6,
                :Sunday => 0,
                :Monday => 1,
                :Tuesday => 2,
@@ -72,7 +79,14 @@ module Portera
                :Wed => 3,
                :Thu => 4,
                :Fri => 5,
-               :Sat => 6               
+               :Sat => 6,
+               :Su  => 0,
+               :M   => 1,
+               :Tu  => 2,
+               :W   => 3,
+               :Th  => 4,
+               :F   => 5,
+               :Sa  => 6
              }
              
       def initialize(collect,utc_offset=nil)
@@ -107,7 +121,8 @@ module Portera
       private
 
       def to_weekday(day)
-        Days[day] || day
+        return day if (0..6).include?(day)
+        Days[day] or raise ArgumentError, "Unknown day: #{day}"
       end
       
     end

data/lib/portera/version.rb

@@ -2,7 +2,7 @@ module Portera
   module Version
     MAJOR  = 0
     MINOR  = 1
-    TINY   = 3
+    TINY   = 4
     STRING = "#{MAJOR}.#{MINOR}.#{TINY}"
   end
 end

data/test/coalesced.rb

@@ -0,0 +1,163 @@
+require File.expand_path('test_helper',File.dirname(__FILE__))
+
+module CoalescedTests
+
+  module Helpers
+  
+    def new_participants
+      ('A'..'Z').map {|name| Portera::Participant.new(name) }
+    end
+    
+    def participant_set(partic, indexes)
+      indexes = Array(indexes)
+      ::Set.new( indexes.map {|i| partic[i]} )
+    end
+    
+    def new_timeslot(range, partic)
+      range.extend(Tempr::DateTimeRange)
+      Portera::Timeslot.new( range , partic )
+    end
+    
+    def assert_timeslot(exp_range, exp_partic, act)
+      assert  exp_range  == act.range &&
+              exp_partic == act.participants,
+              "Timeslot expected to be for range #{exp_range} "+
+              "with participants #{exp_partic.to_a}, instead was " +
+              "#{act}"
+    end
+    
+  end
+  
+  describe 'coalescing' do
+    include Helpers
+    
+    before do
+      @subject = Portera::TimeslotEnum.new
+      @all_partic = new_participants
+      
+      [ new_timeslot(
+          (  Time.utc(2012,01,02,03,00,00)...
+             Time.utc(2012,01,02,03,30,00)),
+          participant_set(@all_partic, (0..5))
+        ),
+        new_timeslot(                             # coalesce
+          (  Time.utc(2012,01,02,03,15,00)...
+             Time.utc(2012,01,02,03,45,00)),
+          participant_set(@all_partic, (0..5))
+        ),        
+        new_timeslot(                             # coalesce
+          (  Time.utc(2012,01,02,03,44,59)...
+             Time.utc(2012,01,02,04,00,00)),
+          participant_set(@all_partic, (0..5))
+        ),
+        new_timeslot(                             # not coalesce
+          (  Time.utc(2012,01,02,03,45,00)...
+             Time.utc(2012,01,02,04,00,00)),
+          participant_set(@all_partic, (4..9))
+        ),
+        new_timeslot(                             # not coalesce
+          (  Time.utc(2012,01,02,03,45,00)...
+             Time.utc(2012,01,02,04,00,00)),
+          participant_set(@all_partic, (10..15))
+        ),
+        new_timeslot(                             # coalesce
+          (  Time.utc(2012,01,02,04,00,00)...
+             Time.utc(2012,01,02,04,15,00)),
+          participant_set(@all_partic, (10..15))
+        ),
+        new_timeslot(                             # coalesce
+          (  Time.utc(2012,01,02,04,15,00)...
+             Time.utc(2012,01,02,04,30,00)),
+          participant_set(@all_partic, (10..15))
+        ),        
+        new_timeslot(                             # not coalesce
+          (  Time.utc(2012,01,02,04,30,00)...
+             Time.utc(2012,01,02,05,00,00)),
+          participant_set(@all_partic, (15..16))
+        ),
+        new_timeslot(                             # not coalesce
+          (  Time.utc(2012,01,02,05,30,00)...
+             Time.utc(2012,01,02,06,00,00)),
+          participant_set(@all_partic, (15..16))
+        ),
+        new_timeslot(                             # not coalesce
+          (  Time.utc(2012,01,02,06,30,00)...
+             Time.utc(2012,01,02,07,00,00)),
+          participant_set(@all_partic, (16..17))
+        ),        
+      ].each do |slot|
+        @subject << slot
+      end
+      
+    end
+    
+    it 'should have the correct number of coalesced timeslots' do
+      actual = @subject.coalesced.to_a
+      puts actual
+      assert_equal 6, actual.count
+    end
+    
+    it 'should coalesce overlapping ranges with same participants' do
+      actual = @subject.coalesced.to_a
+      assert_timeslot (  Time.utc(2012,01,02,03,00,00)...
+                         Time.utc(2012,01,02,04,00,00)),
+                       participant_set(@all_partic, (0..5)),
+                       actual[0]
+    end
+    
+    it 'should not coalesce overlapping ranges with different participants' do
+      actual = @subject.coalesced.to_a
+      assert_timeslot (  Time.utc(2012,01,02,03,45,00)...
+                         Time.utc(2012,01,02,04,00,00)),
+                       participant_set(@all_partic, (4..9)),
+                       actual[1]
+    end
+
+    it 'should coalesce adjacent ranges with same participants' do
+      actual = @subject.coalesced.to_a
+      assert_timeslot (  Time.utc(2012,01,02,03,45,00)...
+                         Time.utc(2012,01,02,04,30,00)),
+                       participant_set(@all_partic, (10..15)),
+                       actual[2]
+    end
+
+    it 'should not coalesce adjacent ranges with different participants' do
+      actual = @subject.coalesced.to_a
+      assert_timeslot (  Time.utc(2012,01,02,04,30,00)...
+                         Time.utc(2012,01,02,05,00,00)),
+                       participant_set(@all_partic, (15..16)),
+                       actual[3]    
+    end
+
+    it 'should not coalesce non-overlapping non-adjacent ranges with same participants' do
+      actual = @subject.coalesced.to_a
+      assert_timeslot (  Time.utc(2012,01,02,05,30,00)...
+                         Time.utc(2012,01,02,06,00,00)),
+                       participant_set(@all_partic, (15..16)),
+                       actual[4]    
+    end
+
+    it 'should not coalesce non-overlapping non-adjacent ranges with different participants' do
+      actual = @subject.coalesced.to_a
+      assert_timeslot (  Time.utc(2012,01,02,06,30,00)...
+                         Time.utc(2012,01,02,07,00,00)),
+                       participant_set(@all_partic, (16..17)),
+                       actual[5]    
+    end
+    
+  end
+
+  describe "nil case" do
+    before do
+      @subject = Portera::TimeslotEnum.new
+    end
+    
+    it 'should have zero timeslots' do
+      actual = @subject.coalesced
+      assert actual.none?, 
+             "Expected coalesced to return no timeslots; was #{actual.to_a.count}"
+    end
+    
+  end
+  
+end

data/test/invalid_days.rb

@@ -0,0 +1,39 @@
+require File.expand_path('test_helper',File.dirname(__FILE__))
+
+describe 'invalid days' do
+
+  let(:malcolm) do
+    Portera::Participant.new('Malcolm Reynolds').available do
+      on(:Mon,    :from => "15:00", :to => "18:00" )
+      on(:Wed,    :from => "20:00", :to => "23:00" )
+      on(:Fs,    :from => "16:00", :to => "19:00" )
+    end
+  end
+  
+  let(:hoban) do
+    Portera::Participant.new('Hoban Washburne').available do
+      on(:monday,    :from => "15:00", :to => "18:00" )
+      on(:wednesday, :from => "20:00", :to => "23:00" )
+      on(7,  :from => "15:00", :to => "18:30" )
+    end
+  end
+
+  let(:zoe) do
+    Portera::Participant.new('Zoe Washburne').available do
+      on([1, 2, -1], :from => "15:00", :to => "18:00" )
+    end
+  end
+  
+  it 'should raise ArgumentError when unknown symbol' do
+    assert_raises(ArgumentError) { malcolm }
+  end
+  
+  it 'should raise ArgumentError when day > 6' do
+    assert_raises(ArgumentError) { hoban }  
+  end
+  
+  it 'should raise ArgumentError when day < 0' do
+    assert_raises(ArgumentError) { zoe }  
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: portera
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000Z
+date: 2012-03-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tempr
-  requirement: &10133680 !ruby/object:Gem::Requirement
+  requirement: &18516760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *10133680
+  version_requirements: *18516760
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &10133300 !ruby/object:Gem::Requirement
+  requirement: &18516220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10133300
+  version_requirements: *18516220
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &10132840 !ruby/object:Gem::Requirement
+  requirement: &18515680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10132840
+  version_requirements: *18515680
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &10132420 !ruby/object:Gem::Requirement
+  requirement: &18515240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10132420
+  version_requirements: *18515240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10132000 !ruby/object:Gem::Requirement
+  requirement: &18514820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10132000
+  version_requirements: *18514820
 description: ''
 email:
 - ericgj72@gmail.com
@@ -85,6 +85,8 @@ files:
 - lib/portera/version.rb
 - lib/portera/views/simple.erb
 - test/acceptance.rb
+- test/coalesced.rb
+- test/invalid_days.rb
 - test/test_helper.rb
 homepage: http://github.com/ericgj/portera
 licenses: []