Changeset 8852

Timestamp:

02/10/08 20:04:14 (5 months ago)

Author:

gbuesing

Message:

Adding TimeWithZone #to_a, #to_f, #to_i, #httpdate, #rfc2822

Files:

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

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Adding TimeWithZone #to_a, #to_f, #to_i, #httpdate, #rfc2822 [Geoff Buesing]
-
-* Pruning unneeded TimeWithZone#change_time_zone_to_current [Geoff Buesing]

trunk/activesupport/lib/active_support/time_with_zone.rb

@@ -45 +45 @@
-    # Returns a Time.local() instance of the simultaneous time in your system's ENV['TZ'] zone
-    def localtime
-dup.localtime # use #dup because Time#localtime is destructive
+getlocal
-    end
-  
@@ -80 +80 @@
-      %("#{time.strftime("%Y/%m/%d %H:%M:%S")} #{formatted_offset(false)}")
-    end
+    
+    def httpdate
+      utc.httpdate
+    end
+  
+    def rfc2822
+      to_s(:rfc822)
+    end
+    alias_method :rfc822, :rfc2822
-  
-    # :db format outputs time in UTC; all others output time in local. Uses TimeWithZone's strftime, so %Z and %z work correctly
@@ -107 +116 @@
-    def -(other)
-      other.acts_like?(:time) ? utc - other : method_missing(:-, other)
+    end
+    
+    def to_a
+      time.to_a[0, 8].push(dst?, zone)
+    end
+    
+    def to_f
+      utc.to_f
+    end    
+    
+    def to_i
+      utc.to_i
-    end
-  

trunk/activesupport/test/core_ext/time_with_zone_test.rb

@@ -83 +83 @@
-    end
-    
+    def test_httpdate
+      assert_equal 'Sat, 01 Jan 2000 00:00:00 GMT', @twz.httpdate
+    end
+    
+    def test_rfc2822
+      assert_equal "Fri, 31 Dec 1999 19:00:00 -0500", @twz.rfc2822
+    end
+    
-    def test_compare_with_time
-      assert_equal  1, @twz <=> Time.utc(1999, 12, 31, 23, 59, 59)
@@ -126 +134 @@
-      twz2 = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2), TimeZone['UTC'] )
-      assert_equal  86_400.0,  twz2 - twz1
+    end
+    
+    def test_to_a
+      assert_equal [45, 30, 5, 1, 2, 2000, 2, 32, false, "HST"], ActiveSupport::TimeWithZone.new( Time.utc(2000, 2, 1, 15, 30, 45), TimeZone['Hawaii'] ).to_a
+    end
+    
+    def test_to_f
+      result = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1), TimeZone['Hawaii'] ).to_f
+      assert_equal 946684800.0, result
+      assert result.is_a?(Float)
+    end
+    
+    def test_to_i
+      result = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1), TimeZone['Hawaii'] ).to_i
+      assert_equal 946684800, result
+      assert result.is_a?(Integer)
-    end
-