@@ -32,6 +32,8 @@ Possible options are: * :hide_month_name: Hide the table header showing the month name. Defaults to false. * :use_full_day_names: Use full instead of abbreviated day names. Defaults to false. * :use_full_month_names: Use full instead of abbreviated month names. Defaults to true. + * :yield_surrounding_days: Defines whether or not days or the previous and next month are yielded to the passed block. Defaults to false. + * :next_month: Defines if and how the next month should be displayed. See section "Formatting the header section" for further information. * :previous_month: Defines if and how the previous month should be displayed. See section "Formatting the header section" for further information. * :next_and_previous_month: Defines if and how the next and previous month should be displayed. See section "Formatting the header section" for further information. README @@ -72,8 +72,8 @@ module LaterDude options[:class] << " weekend" if Calendar.weekend?(day) options[:class] << " today" if day.today? - # block is only called for current month - if @block && day.month == @days.first.month + # block is only called for current month or if :yield_surrounding_days is set to true + if @block && (@options[:yield_surrounding_days] || day.month == @days.first.month) content, options_from_block = Array(@block.call(day)) # passing options is optional @@ -203,7 +203,8 @@ module LaterDude :current_month => I18n.translate(:'date.formats.calendar_header', :default => "%B"), :next_month => false, :previous_month => false, - :next_and_previous_month => false + :next_and_previous_month => false, + :yield_surrounding_days => false } end end lib/later_dude.rb @@ -190,7 +190,7 @@ class CalendarTest < ActiveSupport::TestCase test "highlights current day (= today)" do Date.stubs(:current).then.returns(Date.civil(2009, 1, 14)) - assert_match %r(<td class="(.*)today(.*)">14</td>), LaterDude::Calendar.new(2009, 1).to_html + assert_match %r(<td class="([^\"]*)today([^\"]*)">14</td>), LaterDude::Calendar.new(2009, 1).to_html end test "shows special days as designated by a block" do @@ -209,13 +209,47 @@ class CalendarTest < ActiveSupport::TestCase (Date.civil(2009, 1, 1)..Date.civil(2009, 1, -1)).each do |day| if day.day.even? - assert_match %r(<td class="day(.*)specialDay"><a href="/calendar/#{day.year}/#{day.month}/#{day.day}">#{day.day}</a></td>), calendar_html + assert_match %r(<td class="day([^\"]*)specialDay"><a href="/calendar/#{day.year}/#{day.month}/#{day.day}">#{day.day}</a></td>), calendar_html else - assert_match %r(<td class="day(.*)">#{day.day}</td>), calendar_html - assert_no_match %r(<td class="day(.*)specialDay"><a href="/calendar/#{day.year}/#{day.month}/#{day.day}">#{day.day}</a></td>), calendar_html + assert_match %r(<td class="day([^\"]*)">#{day.day}</td>), calendar_html + assert_no_match %r(<td class="day([^\"]*)specialDay"><a href="/calendar/#{day.year}/#{day.month}/#{day.day}">#{day.day}</a></td>), calendar_html end end end + test "yields days of surrounding months :yield_surrounding_days is set to true" do + CalendarTest.send(:include, ActionView::Helpers) + + # make it bold + special_days_proc = lambda { |day| "<b>#{day.day}</b>" } + + calendar_html = LaterDude::Calendar.new(2009, 4, { :yield_surrounding_days => true }, &special_days_proc).to_html + + # start of first week: 29 March 2009 + # end of last week: 2 May 2009 + surrounding_days = [Date.civil(2009, 3, 29), Date.civil(2009, 3, 30), Date.civil(2009, 3, 31), Date.civil(2009, 5, 1), Date.civil(2009, 5, 2)] + surrounding_days.each do |day| + assert_match %r(<td class="day([^\"]*)otherMonth([^\"]*)"><b>#{day.day}</b></td>), calendar_html + end + end + + test "yields days of surrounding months :yield_surrounding_days isn't set to true" do + CalendarTest.send(:include, ActionView::Helpers) + + # make it bold + special_days_proc = lambda { |day| "<b>#{day.day}</b>" } + + calendar_html = LaterDude::Calendar.new(2009, 4, &special_days_proc).to_html + calendar_html2 = LaterDude::Calendar.new(2009, 4, { :yield_surrounding_days => false }, &special_days_proc).to_html + + # start of first week: 29 March 2009 + # end of last week: 2 May 2009 + surrounding_days = [Date.civil(2009, 3, 29), Date.civil(2009, 3, 30), Date.civil(2009, 3, 31), Date.civil(2009, 5, 1), Date.civil(2009, 5, 2)] + surrounding_days.each do |day| + assert_no_match %r(<td class="day([^\"]*)otherMonth([^\"]*)"><b>#{day.day}</b></td>), calendar_html + assert_no_match %r(<td class="day([^\"]*)otherMonth([^\"]*)"><b>#{day.day}</b></td>), calendar_html2 + end + end + # TODO: Should I do "real" output testing despite the good coverage of output-related methods? Testing HTML is tedious ... end \ No newline at end of file test/calendar_test.rb 5e6a18cb1ed924b4cb06c3e51b1b8f38845f3f2e Clemens Kofler clemens@railway.at http://github.com/clemens/later_dude/commit/a8ff66d671fbb6fda031bf53a608649fa98ff4ac a8ff66d671fbb6fda031bf53a608649fa98ff4ac 2009-10-30T16:01:45-07:00 2009-10-30T16:01:45-07:00 Include option to yield days of surrounding months to the passed block. 1abaa57d6ff848ed687671c4f1bbdfd6a6a3e066 Clemens Kofler clemens@railway.at