diff options
| -rw-r--r-- | activesupport/CHANGELOG | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 17 | ||||
| -rw-r--r-- | activesupport/test/time_zone_test.rb | 5 |
3 files changed, 17 insertions, 7 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 633b9cbb89..5b9d72d1dc 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* TimeZone#now returns an ActiveSupport::TimeWithZone [Geoff Buesing] + * Time #in_current_time_zone and #change_time_zone_to_current return self when Time.zone is nil [Geoff Buesing] * Remove unneeded #to_datetime_default_s alias for DateTime#to_s, given that we inherit a #to_default_s from Date that does exactly the same thing [Geoff Buesing] diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index 689ba5a6e5..7adc8133c6 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -177,22 +177,27 @@ class TimeZone begin # the following methods depend on the tzinfo gem require_library_or_gem "tzinfo" unless Object.const_defined?(:TZInfo) - # Compute and return the current time, in the time zone represented by - # +self+. + # Returns an ActiveSupport::TimeWithZone instance representing the current time + # in the time zone represented by +self+. Example: + # + # Time.zone = 'Hawaii' # => "Hawaii" + # Time.zone.now # => Wed, 23 Jan 2008 20:24:27 HST -10:00 def now - tzinfo.now + tzinfo.now.change_time_zone(self) end # Return the current date in this time zone. def today - now.to_date + tzinfo.now.to_date end - # Adjust the given time to the time zone represented by +self+. + # Adjust the given time to the simultaneous time in the time zone represented by +self+. Returns a + # Time.utc() instance -- if you want an ActiveSupport::TimeWithZone instance, use Time#in_time_zone() instead. def utc_to_local(time) tzinfo.utc_to_local(time) end - + + # Adjust the given time to the simultaneous time in UTC. Returns a Time.utc() instance. def local_to_utc(time, dst=true) tzinfo.local_to_utc(time, dst) end diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb index 8dea36f20e..72f25a1683 100644 --- a/activesupport/test/time_zone_test.rb +++ b/activesupport/test/time_zone_test.rb @@ -55,7 +55,10 @@ class TimeZoneTest < Test::Unit::TestCase uses_mocha 'TestTimeZoneNowAndToday' do def test_now TZInfo::DataTimezone.any_instance.stubs(:now).returns(Time.utc(2000)) - assert_equal Time.utc(2000), TimeZone['Eastern Time (US & Canada)'].now + zone = TimeZone['Eastern Time (US & Canada)'] + assert_instance_of ActiveSupport::TimeWithZone, zone.now + assert_equal Time.utc(2000), zone.now.time + assert_equal zone, zone.now.time_zone end def test_today |