Changeset 9107

Timestamp:

03/28/08 04:06:47 (4 months ago)

Author:

gbuesing

Message:

Time.zone= accepts TZInfo::Timezone instances and Olson identifiers; wraps result in TimeZone instance

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/time/zones.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/values/time_zone.rb (modified) (2 diffs)
• trunk/activesupport/test/core_ext/time_with_zone_test.rb (modified) (1 diff)
• trunk/activesupport/test/time_zone_test.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Time.zone= accepts TZInfo::Timezone instances and Olson identifiers; wraps result in TimeZone instance [Geoff Buesing] 
-
-* TimeWithZone time conversions don't need to be wrapped in TimeOrDateTime, because TZInfo does this internally [Geoff Buesing]

trunk/activesupport/lib/active_support/core_ext/time/zones.rb

@@ -39 +39 @@
-          private
-            def get_zone(time_zone)
-
-
+
+
+
+
+
+
+
+
+
-            end
-        end

trunk/activesupport/lib/active_support/values/time_zone.rb

@@ -146 +146 @@
-
-  include Comparable
-, :utc_offset
+
-
-  # Create a new TimeZone object with the given name and offset. The
@@ -152 +152 @@
-  # (GMT). Seconds were chosen as the offset unit because that is the unit that
-  # Ruby uses to represent time zone offsets (see Time#utc_offset).
-
+, tzinfo = nil
-    @name = name
-    @utc_offset = utc_offset
+    @tzinfo = tzinfo
+  end
+  
+  def utc_offset
+    @utc_offset ||= tzinfo.current_period.utc_offset
-  end
-

trunk/activesupport/test/core_ext/time_with_zone_test.rb

@@ -484 +484 @@
-    end
-    
+    def test_time_zone_setter_with_tzinfo_timezone_object_wraps_in_rails_time_zone
+      silence_warnings do # silence warnings raised by tzinfo gem
+        tzinfo = TZInfo::Timezone.get('America/New_York')
+        Time.zone = tzinfo
+        assert_kind_of TimeZone, Time.zone
+        assert_equal tzinfo, Time.zone.tzinfo
+        assert_equal 'America/New_York', Time.zone.name
+        assert_equal(-18_000, Time.zone.utc_offset)
+      end
+    end
+    
+    def test_time_zone_setter_with_tzinfo_timezone_identifier_does_lookup_and_wraps_in_rails_time_zone
+      silence_warnings do # silence warnings raised by tzinfo gem
+        Time.zone = 'America/New_York'
+        assert_kind_of TimeZone, Time.zone
+        assert_equal 'America/New_York', Time.zone.tzinfo.name
+        assert_equal 'America/New_York', Time.zone.name
+        assert_equal(-18_000, Time.zone.utc_offset)
+      end
+    end
+    
+    def test_time_zone_setter_with_non_identifying_argument_returns_nil
+      Time.zone = 'foo'
+      assert_equal nil, Time.zone
+      Time.zone = -15.hours
+      assert_equal nil, Time.zone
+    end
+    
-    protected
-      def with_env_tz(new_tz = 'US/Eastern')

trunk/activesupport/test/time_zone_test.rb

@@ -193 +193 @@
-      end
-    end
+    
+    def test_utc_offset_lazy_loaded_from_tzinfo_when_not_passed_in_to_initialize
+      silence_warnings do # silence warnings raised by tzinfo gem
+        tzinfo = TZInfo::Timezone.get('America/New_York')
+        zone = TimeZone.create(tzinfo.name, nil, tzinfo)
+        assert_equal nil, zone.instance_variable_get('@utc_offset')
+        assert_equal(-18_000, zone.utc_offset)
+      end
+    end
-  end
-