@@ -42,7 +42,7 @@ module CollectiveIdea :end_at => range.last.end_of_day.in_time_zone}]} } - named_scope :upcoming, lambda{ {:conditions => ["#{quoted_table_name}.#{quoted_end_at_column_name} > ?", Time.now]} } + named_scope :upcoming, lambda{ {:conditions => ["#{quoted_table_name}.#{quoted_end_at_column_name} > ?", Time.zone.now]} } # In a typical month calendar view, you'll have a couple days at the # start and/or end of the month that are from the next/previous month. lib/active_record/event_finders.rb @@ -7,7 +7,7 @@ module Calendar def initialize(options = {}) @options = { - :date => Date.today, + :date => Time.zone.today, :begin_hour => 7, :end_hour => 18, :day_label_format => "%A, %B %d, %Y", lib/calendar/builder/day.rb @@ -4,7 +4,7 @@ module Calendar module Builder # # == Options - # * <tt>:date</tt>: The date that the calendar should show. Default is <tt>Date.today</tt>. + # * <tt>:date</tt>: The date that the calendar should show. Default is <tt>Time.zone.today</tt>. # * <tt>:first_day_of_week</tt>: A symbol or integer (0 == <tt>:sunday</tt>, # 6 == <tt>:saturday</tt>) for day of week that the calendar should start on. # Default is <tt>:sunday</tt> @@ -15,7 +15,7 @@ module Calendar def initialize(options = {}) self.options = { - :date => Date.today, + :date => Time.zone.today, :first_day_of_week => :sunday, :day_label_format => "%a, %b %d", }.merge(options) @@ -129,7 +129,7 @@ module Calendar classes << "weekend" if weekend?(date) classes << "first" if beginning_of_week?(date) classes << "last" if end_of_week?(date) - classes << "today" if Date.today == date + classes << "today" if Time.zone.today == date end end lib/calendar/builder/week.rb @@ -47,13 +47,13 @@ class EventFindersTest < Test::Unit::TestCase def test_upcoming Event.upcoming(:all).each do |event| - assert e.begin_at > Time.now + assert e.begin_at > Time.zone.now end end # FIXME: DATE_FORMAT() doesn't work in SQLite # def test_find_by_month - # Event.in_month(Date.today, :all) + # Event.in_month(Time.zone.today, :all) # end def test_in_date_range test/active_record/event_finders_test.rb @@ -24,12 +24,12 @@ class EventFindersTest < Test::Unit::TestCase def test_should_return_all_parties_in_date_range_when_not_scoped expected = @fun_parties.length + @boring_parties.length - actual = Party.in_date_range(Time.now..10.days.from_now).length + actual = Party.in_date_range(Time.zone.now..10.days.from_now).length assert_equal expected, actual end def test_should_return_only_fun_parties_in_date_range_when_scoped_to_community - actual = @fun_community.parties.in_date_range(Time.now..10.days.from_now) + actual = @fun_community.parties.in_date_range(Time.zone.now..10.days.from_now) assert_equal @fun_parties, actual end test/active_record/scoped_event_finders_test.rb b9df1622fbf4952efc626888aec77847b6fe8dd8 Daniel Morrison daniel@collectiveidea.com http://github.com/collectiveidea/calendar_builder/commit/99d64a9e9d57b6865358e2555369c0d7c9eabea5 99d64a9e9d57b6865358e2555369c0d7c9eabea5 2009-09-30T08:30:40-07:00 2009-09-30T08:29:59-07:00 More timezone updates cd895eb72147eb445f780a64cee7e99150749543 Daniel Morrison daniel@collectiveidea.com