From 4f03190f262c07c1f389957ff7ae76901495d824 Mon Sep 17 00:00:00 2001 From: gbuesing Date: Thu, 8 May 2008 22:07:21 -0500 Subject: TimeWithZone: date part getter methods (#year #mon #day etc) are defined on class; no longer relying on method_missing --- activesupport/CHANGELOG | 2 ++ activesupport/lib/active_support/time_with_zone.rb | 8 ++++++++ activesupport/test/core_ext/time_with_zone_test.rb | 10 +++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 989c72533a..ea5490eb8f 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* TimeWithZone: date part getter methods (#year #mon #day etc) are defined on class; no longer relying on method_missing [Geoff Buesing] + * Time.zone.parse return nil for strings with no date information [Geoff Buesing] * Time.zone.parse respects offset information in string. Resolves #105. [Scott Fleckenstein, Geoff Buesing] diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb index 461d52e40e..21ddcaad48 100644 --- a/activesupport/lib/active_support/time_with_zone.rb +++ b/activesupport/lib/active_support/time_with_zone.rb @@ -163,6 +163,14 @@ module ActiveSupport utc.advance(options).in_time_zone(time_zone) end + %w(year mon month day mday hour min sec).each do |method_name| + class_eval <<-EOV + def #{method_name} + time.#{method_name} + end + EOV + end + def usec time.respond_to?(:usec) ? time.usec : 0 end diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb index df70e82c1d..64fcb4af09 100644 --- a/activesupport/test/core_ext/time_with_zone_test.rb +++ b/activesupport/test/core_ext/time_with_zone_test.rb @@ -328,10 +328,18 @@ class TimeWithZoneTest < Test::Unit::TestCase assert_equal Time.utc(1999, 12, 31, 19), mtime.time end end - + def test_method_missing_with_non_time_return_value + silence_warnings do # silence warnings raised by tzinfo gem + @twz.time.expects(:foo).returns('bar') + assert_equal 'bar', @twz.foo + end + end + + def test_date_part_value_methods silence_warnings do # silence warnings raised by tzinfo gem twz = ActiveSupport::TimeWithZone.new(Time.utc(1999,12,31,19,18,17,500), @time_zone) + twz.stubs(:method_missing).returns(nil) #ensure these methods are defined directly on class assert_equal 1999, twz.year assert_equal 12, twz.month assert_equal 31, twz.day -- cgit v1.2.3