@@ -1,2 +1,12 @@ module FrontHelper + # TODO: should be made customisable + MEETING_WDAY = 3 # Wednesday + + # returns the date for the next meeting + def next_meeting_date + last_day_of_month = Date.today.end_of_month + total = last_day_of_month.wday + MEETING_WDAY + 1 + total -= 7 if total >= 7 + return last_day_of_month - total.days + end end app/helpers/front_helper.rb @@ -1,14 +1,3 @@ module PageHelper - # TODO: should be made customisable - MEETING_WDAY = 3 # Wednesday - - # returns the date for the next meeting - def next_meeting_date - last_day_of_month = Date.today.end_of_month - total = last_day_of_month.wday + MEETING_WDAY + 1 - total -= 7 if total >= 7 - return last_day_of_month - total.days - end - end app/helpers/page_helper.rb @@ -11,11 +11,6 @@ ActiveRecord::Schema.define(:version => 20081015120059) do - create_table "attendance", :id => false, :force => true do |t| - t.integer "meeting_id", :limit => 11 - t.integer "person_id", :limit => 11 - end - create_table "bj_config", :primary_key => "bj_config_id", :force => true do |t| t.text "hostname" t.text "key" @@ -62,21 +57,6 @@ ActiveRecord::Schema.define(:version => 20081015120059) do t.integer "exit_status", :limit => 11 end - create_table "comments", :force => true do |t| - t.text "note" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "person_id", :limit => 11 - t.integer "topic_id", :limit => 11 - end - - create_table "meetings", :force => true do |t| - t.datetime "date" - t.datetime "created_at" - t.datetime "updated_at" - t.string "venue" - end - create_table "people", :force => true do |t| t.string "username" t.string "name" @@ -87,13 +67,4 @@ ActiveRecord::Schema.define(:version => 20081015120059) do t.string "twitter_user" end - create_table "topics", :force => true do |t| - t.string "title" - t.text "description" - t.string "link" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "meeting_id", :limit => 11 - end - end db/schema.rb @@ -1,11 +1,79 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe FrontHelper do + include FrontHelper - #Delete this example and add some real ones or delete this file - it "should be included in the object returned by #helper" do - included_modules = (class << helper; self; end).send :included_modules - included_modules.should include(FrontHelper) - end + # TODO: change the tests so that it is not tied to the particular day of the week + describe "next_meeting_date (Wednesday)" 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 + + 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 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 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 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 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 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 + } + end + end end spec/helpers/front_helper_spec.rb @@ -1,81 +1,5 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe PageHelper do - include PageHelper - - # TODO: change the tests so that it is not tied to the particular day of the week - describe "next_meeting_date (Wednesday)" 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 - - 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 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 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 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 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 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 - } - end - - end end spec/helpers/page_helper_spec.rb 78c38212d8e73ebd7e8b3b2f13b4c70f554837b1 Tim Riley tim@openmonkey.com http://github.com/artpop/crc_site/commit/8a2f461d9ae2b227e3a98272cc7b7d93aa34db6b 8a2f461d9ae2b227e3a98272cc7b7d93aa34db6b 2008-10-16T04:19:12-07:00 2008-10-16T04:19:12-07:00 move schlick's next meeting helper into the FrontHelper 46dd20f1378311770cad1a3cd910fd6dfddbfd29 Tim Riley tim@openmonkey.com