table_builder 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/table_builder/calendar_helper.rb

@@ -68,10 +68,15 @@ module CalendarHelper
     end
 
     def objects_for_days objects
-      objects = objects.group_by{ |o| yield(o).strftime "%Y-%m-%d" }
-      each_day do |day|
-        [day, objects[day.strftime("%Y-%m-%d")] || []]
+      grouped = {}
+      objects.each do |obj|
+        [*yield(obj)].each do |val|
+          key = val.strftime("%Y-%m-%d")
+          grouped.has_key?(key) ? grouped[key] << obj : grouped[key] = [obj]
+        end
       end
+            
+      each_day { |day| [day, grouped[day.strftime("%Y-%m-%d")] || []] }
     end
     
     def days

data/test/calendar_helper_test.rb

@@ -8,6 +8,10 @@ class CalendarHelperTest < ActionView::TestCase
       Event.new(3, 'Jimmy Page', DateTime.civil(2008, 12, 26, 1)), # In case is an hour of that day
       Event.new(4, 'Robert Plant', Date.civil(2008, 12, 26))
     ]
+    @events2 = [
+      Event.new(3, 'Jimmy Page', [DateTime.civil(2008, 12, 26, 1), DateTime.civil(2008, 12, 27, 1)]), # In case is an hour of that day
+      Event.new(4, 'Robert Plant', Date.civil(2008, 12, 26))
+    ]
   end
 
   should 'raise error if called without array' do
@@ -22,13 +26,27 @@ class CalendarHelperTest < ActionView::TestCase
     end
     
     should 'return objects_for_days with days and events' do
-      calendar         = CalendarHelper::Calendar.new :year=> 2008, :month => 12
+      calendar         = CalendarHelper::Calendar.new :year => 2008, :month => 12
       objects_for_days = (Date.civil(2008, 11, 30)..Date.civil(2009, 1, 3)).map do |day|
         [day, Date.civil(2008, 12, 26) == day ? @events : []]
       end
       assert_equal objects_for_days, calendar.objects_for_days(@events, &:date)
     end
     
+    should 'return objects_for_days with days and events when event has multiple dates' do
+      calendar         = CalendarHelper::Calendar.new :year => 2008, :month => 12
+      objects_for_days = (Date.civil(2008, 11, 30)..Date.civil(2009, 1, 3)).map do |day|
+        object =
+        case day
+        when DateTime.civil(2008, 12, 26, 1) then @events2
+        when DateTime.civil(2008, 12, 27, 1) then [@events2.first]
+        else [] end
+        [day, object]
+      end
+      assert_equal objects_for_days, calendar.objects_for_days(@events2, &:date)
+    end
+    
+    
     should 'return objects_for_days with days accepting a block' do
       calendar         = CalendarHelper::Calendar.new :year=> 2008, :month => 12
       objects_for_days = (Date.civil(2008, 11, 30)..Date.civil(2009, 1, 3)).map do |day|

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Petrik de Heus