@@ -2,13 +2,27 @@ module PageHelper # TODO: should be made customisable MEETING_WDAY = 3 # Wednesday - - # returns the date for the next meeting + + # returns the date for the next meeting from today and formats the output for display def next_meeting_date - last_day_of_month = Date.today.end_of_month + meeting_date(Date.today).to_s(:rfc822) + end + + # returns the date for the next meeting after a particular date + def meeting_date(date) + last_day_of_month = date.end_of_month total = last_day_of_month.wday + MEETING_WDAY + 1 total -= 7 if total >= 7 - return last_day_of_month - total.days + the_meeting_date = last_day_of_month - total.days + if the_meeting_date < date + meeting_date(date.next_month.beginning_of_month) + else + the_meeting_date + end + rescue + # TODO: what to return if a DateTime is not passed? should I not worry? + # TODO: maybe allow passing of month number of the current year as an integer + "" end end app/helpers/page_helper.rb @@ -22,7 +22,7 @@ http://groups.google.com/group/canberra-ruby %h2 Meetings -%p== We aim to have meetups on the last Wednesday of the month. According to the calendar that may well be #{next_meeting_date.to_s(:rfc822)} (check for announcements in the mailing list). +%p== We aim to have meetups on the last Wednesday of the month. According to the calendar that may well be #{next_meeting_date} (check for announcements in the mailing list). %h2 Peeps #peeps app/views/pages/home.haml @@ -2,80 +2,93 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe PageHelper do include PageHelper + + describe "next meeting date" do + before(:each) do + @mock_today = Date.new(2008,1,1) + end + it "should call meeting date helper" do + Date.stub!(:today).and_return(@mock_today) + should_receive(:meeting_date).with(@mock_today).and_return(@mock_today) + next_meeting_date + end + it "should format the output" do + stub!(:meeting_date).and_return(@mock_today) + @mock_today.should_receive(:to_s).with(:rfc822) + next_meeting_date + end + end # TODO: change the tests so that it is not tied to the particular day of the week - describe "next_meeting_date (Wednesday)" do + describe "meeting date" do - it "should return last Wednesday for month ending on a Wednesday" do - mock_today = Date.new(2008,12,1) - last_wednesday = mock_today.end_of_month - 1.upto(31) { |d| - Date.stub!(:today).and_return(mock_today) - next_meeting_date.should eql(last_wednesday) - mock_today += 1.day - } - end + describe "for current month has not passed" do + it "should return last Wednesday for month ending on a Wednesday" do + mock_today = Date.new(2008,12,1) + last_wednesday = mock_today.end_of_month + meeting_date(mock_today).should eql(last_wednesday) + end - it "should return last Wednesday for month ending on a Thursday" do - mock_today = Date.new(2008,7,1) - last_wednesday = mock_today.end_of_month - 1.day - 1.upto(31) { |d| - Date.stub!(:today).and_return(mock_today) - next_meeting_date.should eql(last_wednesday) - mock_today += 1.day - } - end + it "should return last Wednesday for month ending on a Thursday" do + mock_today = Date.new(2008,7,1) + last_wednesday = mock_today.end_of_month - 1.day + meeting_date(mock_today).should eql(last_wednesday) + end - it "should return last Wednesday for month ending on a Friday" do - mock_today = Date.new(2008,10,1) - last_wednesday = mock_today.end_of_month - 2.days - 1.upto(31) { |d| - Date.stub!(:today).and_return(mock_today) - next_meeting_date.should eql(last_wednesday) - mock_today += 1.day - } - end + it "should return last Wednesday for month ending on a Friday" do + mock_today = Date.new(2008,10,1) + last_wednesday = mock_today.end_of_month - 2.days + meeting_date(mock_today).should eql(last_wednesday) + end - it "should return last Wednesday for month ending on a Saturday" do - mock_today = Date.new(2008,5,1) - last_wednesday = mock_today.end_of_month - 3.days - 1.upto(30) { |d| - Date.stub!(:today).and_return(mock_today) - next_meeting_date.should eql(last_wednesday) - mock_today += 1.day - } - end + it "should return last Wednesday for month ending on a Saturday" do + mock_today = Date.new(2008,5,1) + last_wednesday = mock_today.end_of_month - 3.days + meeting_date(mock_today).should eql(last_wednesday) + end - it "should return last Wednesday for month ending on a Sunday" do - mock_today = Date.new(2008,8,1) - last_wednesday = mock_today.end_of_month - 4.days - 1.upto(31) { |d| - Date.stub!(:today).and_return(mock_today) - next_meeting_date.should eql(last_wednesday) - mock_today += 1.day - } - end + it "should return last Wednesday for month ending on a Sunday" do + mock_today = Date.new(2008,8,1) + last_wednesday = mock_today.end_of_month - 4.days + meeting_date(mock_today).should eql(last_wednesday) + end - it "should return last Wednesday for month ending on a Monday" do - mock_today = Date.new(2008,6,1) - last_wednesday = mock_today.end_of_month - 5.days - 1.upto(30) { |d| - Date.stub!(:today).and_return(mock_today) - next_meeting_date.should eql(last_wednesday) - mock_today += 1.day - } - end + it "should return last Wednesday for month ending on a Monday" do + mock_today = Date.new(2008,6,1) + last_wednesday = mock_today.end_of_month - 5.days + meeting_date(mock_today).should eql(last_wednesday) + end - it "should return last Wednesday for month ending on a Tuesday" do - mock_today = Date.new(2008,9,1) - last_wednesday = mock_today.end_of_month - 6.days - 1.upto(30) { |d| - Date.stub!(:today).and_return(mock_today) - next_meeting_date.should eql(last_wednesday) - mock_today += 1.day - } + it "should return last Wednesday for month ending on a Tuesday" do + mock_today = Date.new(2008,9,1) + last_wednesday = mock_today.end_of_month - 6.days + meeting_date(mock_today).should eql(last_wednesday) + end end - + + describe "for current month is today" do + it "should return today as the last Wednesday for the month" do + mock_today = Date.new(2008,3,26) # last Wednesday of the month + last_wednesday = mock_today + meeting_date(mock_today).should eql(last_wednesday) + end + end + + describe "for current month has passed" do + it "should return last Wednesday for next month" do + mock_today = Date.new(2008,9,25) # day after the last wednesday + last_wednesday = Date.new(2008,10,29) # last wednesday of next month + meeting_date(mock_today).should eql(last_wednesday) + end + end + + describe "is passed an invalid date" do + it "should return empty string" do + mock_today = "Today" + meeting_date(mock_today).should eql("") + end + end + end end spec/helpers/page_helper_spec.rb d0aa182ccdf6d5fc35bc613a6a96562669631309 Michael MacDonald michaelm@amc.org.au http://github.com/artpop/crc_site/commit/1c5f88026ef9fb1a15e067e2e37daff8786f6df6 1c5f88026ef9fb1a15e067e2e37daff8786f6df6 2008-10-16T05:39:33-07:00 2008-10-16T05:39:33-07:00 Renamed and refactored next_meeting_date helper to meeting_date(date) so that any date can be passed and it now correctly shows the next month's meeting date if the meeting date for the chosen date has passed 84644cb8f1f26c22b0f803bd03e8b8cd1c5f049e Michael MacDonald michaelm@amc.org.au