Changeset 9106

Timestamp:

03/28/08 02:10:36 (2 months ago)

Author:

gbuesing

Message:

TimeWithZone time conversions don't need to be wrapped in TimeOrDateTime, because TZInfo does this internally

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/time_with_zone.rb (modified) (2 diffs)
• trunk/activesupport/test/core_ext/time_with_zone_test.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* TimeWithZone time conversions don't need to be wrapped in TimeOrDateTime, because TZInfo does this internally [Geoff Buesing]
-
-* TimeWithZone#usec returns 0 instead of error when DateTime is wrapped [Geoff Buesing]

trunk/activesupport/lib/active_support/time_with_zone.rb

@@ -13 +13 @@
-    # Returns a Time or DateTime instance that represents the time in time_zone
-    def time
-utc_to_local
+period.to_local(@utc)
-    end
-
-    # Returns a Time or DateTime instance that represents the time in UTC
-    def utc
-local_to_utc
+period.to_utc(@time)
-    end
-    alias_method :comparable_time, :utc
@@ -241 +241 @@
-        ::Time.utc_time(time.year, time.month, time.day, time.hour, time.min, time.sec, time.respond_to?(:usec) ? time.usec : 0)
-      end
-    
-      # Replicating logic from TZInfo::Timezone#utc_to_local because we want to cache the period in an instance variable for reuse
-      def utc_to_local
-        ::TZInfo::TimeOrDateTime.wrap(utc) {|utc| period.to_local(utc)}
-      end
-      
-      # Replicating logic from TZInfo::Timezone#local_to_utc because we want to cache the period in an instance variable for reuse
-      def local_to_utc
-        ::TZInfo::TimeOrDateTime.wrap(time) {|time| period.to_utc(time)}
-      end
-  end
-end

trunk/activesupport/test/core_ext/time_with_zone_test.rb

@@ -373 +373 @@
-      end
-    end
+    
+    def test_utc_to_local_conversion_with_far_future_datetime
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal [0,0,19,31,12,2049], ActiveSupport::TimeWithZone.new(DateTime.civil(2050), @time_zone).to_a[0,6]
+      end
+    end
+
+    def test_local_to_utc_conversion_with_far_future_datetime
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal DateTime.civil(2050).to_f, ActiveSupport::TimeWithZone.new(nil, @time_zone, DateTime.civil(2049,12,31,19)).to_f
+      end
+    end
-  end
-