Changeset 9042

Timestamp:

03/17/08 03:45:32 (4 months ago)

Author:

gbuesing

Message:

Adding TimeZone#at and DateTime#to_f

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/date_time/conversions.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/time_with_zone.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/values/time_zone.rb (modified) (3 diffs)
• trunk/activesupport/test/core_ext/date_time_ext_test.rb (modified) (1 diff)
• trunk/activesupport/test/time_zone_test.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Adding TimeZone#at and DateTime#to_f [Geoff Buesing]
-
-* TimeWithZone responds to Ruby 1.9 weekday-named query methods [Geoff Buesing]

trunk/activesupport/lib/active_support/core_ext/date_time/conversions.rb

@@ -79 +79 @@
-          strftime("%Y-%m-%dT%H:%M:%S%Z")
-        end if RUBY_VERSION < '1.9'
+        
+        # Converts self to a floating-point number of seconds since the Unix epoch 
+        def to_f
+          days_since_unix_epoch = self - ::DateTime.civil(1970)
+          (days_since_unix_epoch * 86_400).to_f
+        end
-      end
-    end

trunk/activesupport/lib/active_support/time_with_zone.rb

@@ -161 +161 @@
-    
-    def to_a
-time.to_a[0, 8].push(dst?, zone)
+[time.sec, time.min, time.hour, time.day, time.mon, time.year, time.wday, time.yday, dst?, zone]
-    end
-    

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

@@ -179 +179 @@
-    require_library_or_gem "tzinfo" unless Object.const_defined?(:TZInfo)
-    
-
+ from given values
-    #
-    #   Time.zone = "Hawaii"                      # => "Hawaii"
@@ -186 +186 @@
-      time = Time.utc_time(*args)
-      ActiveSupport::TimeWithZone.new(nil, self, time)
+    end
+
+    # Method for creating new ActiveSupport::TimeWithZone instance in time zone of +self+ from number of seconds since the Unix epoch. Example:
+    #
+    #   Time.zone = "Hawaii"        # => "Hawaii"
+    #   Time.utc(2000).to_f         # => 946684800.0
+    #   Time.zone.at(946684800.0)   # => Fri, 31 Dec 1999 14:00:00 HST -10:00
+    def at(secs)
+      utc = Time.at(secs).utc rescue DateTime.civil(1970).since(secs)
+      utc.in_time_zone(self)
-    end
-    
@@ -235 +245 @@
-  rescue LoadError # Tzinfo gem is not available
-    # re-raise LoadError only when a tzinfo-dependent method is called:
-
+at 
-      define_method(method) {|*args| raise LoadError, "TZInfo gem is required for TimeZone##{method}. `gem install tzinfo` and try again."}
-    end

trunk/activesupport/test/core_ext/date_time_ext_test.rb

@@ -272 +272 @@
-    assert_equal(-1, DateTime.civil(2000) <=> ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 0, 0, 1), TimeZone['UTC'] ))
-  end
+  
+  def test_to_f
+    assert_equal 946684800.0, DateTime.civil(2000).to_f
+    assert_equal 946684800.0, DateTime.civil(1999,12,31,19,0,0,Rational(-5,24)).to_f
+  end
-
-  protected

trunk/activesupport/test/time_zone_test.rb

@@ -186 +186 @@
-    assert_equal 'EDT', twz.zone
-  end
+  
+  def test_at
+    zone = TimeZone['Eastern Time (US & Canada)']
+    secs = 946684800.0
+    twz = zone.at(secs)
+    assert_equal Time.utc(1999,12,31,19), twz.time
+    assert_equal Time.utc(2000), twz.utc
+    assert_equal zone, twz.time_zone
+    assert_equal secs, twz.to_f
+  end
+  
+  def test_at_with_old_date
+    zone = TimeZone['UTC']
+    secs = -3786825600.0
+    twz = zone.at(secs)
+    assert_equal [0,0,0,1,1,1850], twz.to_a[0,6]
+    assert_equal zone, twz.time_zone
+    assert_equal secs, twz.to_f
+  end
-
-  protected