Changeset 9045

Timestamp:

03/17/08 05:07:50 (6 months ago)

Author:

gbuesing

Message:

Adding TimeZone#parse

Files:

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

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Adding TimeZone#parse [Geoff Buesing]
-
-* Adding TimeZone#at and DateTime#to_f [Geoff Buesing]

trunk/activesupport/lib/active_support/time_with_zone.rb

@@ -11 +11 @@
-    end
-  
-
+or DateTime 
-    def time
-      @time ||= utc_to_local
-    end
-
-
+or DateTime 
-    def utc
-      @utc ||= local_to_utc
@@ -223 +223 @@
-    private      
-      def get_period_and_ensure_valid_local_time
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-    

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

@@ -198 +198 @@
-    end
-    
+    # Method for creating new ActiveSupport::TimeWithZone instance in time zone of +self+ from parsed string. Example:
+    #
+    #   Time.zone = "Hawaii"                      # => "Hawaii"
+    #   Time.zone.parse('1999-12-31 14:00:00')    # => Fri, 31 Dec 1999 14:00:00 HST -10:00
+    #
+    # If upper components are missing from the string, they are supplied from TimeZone#now:
+    #
+    #   Time.zone.now                 # => Fri, 31 Dec 1999 14:00:00 HST -10:00
+    #   Time.zone.parse('22:30:00')   # => Fri, 31 Dec 1999 22:30:00 HST -10:00
+    def parse(str, now=now)
+      time = Time.parse(str, now) rescue DateTime.parse(str)
+      ActiveSupport::TimeWithZone.new(nil, self, time)
+    end
+    
-    # Returns an ActiveSupport::TimeWithZone instance representing the current time
-    # in the time zone represented by +self+. Example:
@@ -245 +259 @@
-  rescue LoadError # Tzinfo gem is not available
-    # re-raise LoadError only when a tzinfo-dependent method is called:
-
+parse 
-      define_method(method) {|*args| raise LoadError, "TZInfo gem is required for TimeZone##{method}. `gem install tzinfo` and try again."}
-    end

trunk/activesupport/test/time_zone_test.rb

@@ -155 +155 @@
-    assert_equal Time.utc(2007, 2, 5, 15, 30, 45), time.time
-    assert_equal TimeZone["Hawaii"], time.time_zone
+  end
+  
+  def test_local_with_old_date
+    silence_warnings do # silence warnings raised by tzinfo gem
+      time = TimeZone["Hawaii"].local(1850, 2, 5, 15, 30, 45)
+      assert_equal [45,30,15,5,2,1850], time.to_a[0,6]
+      assert_equal TimeZone["Hawaii"], time.time_zone
+    end
-  end
-  
@@ -198 +206 @@
-  
-  def test_at_with_old_date
-UTC
--3786825600.0
+Eastern Time (US & Canada)
+DateTime.civil(1850).to_f
-    twz = zone.at(secs)
-0,0,0,1,1,1850], twz.to_a[0,6
+1850, 1, 1, 0], [twz.utc.year, twz.utc.mon, twz.utc.day, twz.utc.hour
-    assert_equal zone, twz.time_zone
-    assert_equal secs, twz.to_f
+  end
+  
+  def test_parse
+    zone = TimeZone['Eastern Time (US & Canada)']
+    twz = zone.parse('1999-12-31 19:00:00')
+    assert_equal Time.utc(1999,12,31,19), twz.time
+    assert_equal Time.utc(2000), twz.utc
+    assert_equal zone, twz.time_zone
+  end
+  
+  def test_parse_with_old_date
+    silence_warnings do # silence warnings raised by tzinfo gem
+      zone = TimeZone['Eastern Time (US & Canada)']
+      twz = zone.parse('1850-12-31 19:00:00')
+      assert_equal [0,0,19,31,12,1850], twz.to_a[0,6]
+      assert_equal zone, twz.time_zone
+    end
+  end
+  
+  uses_mocha 'TestParseWithIncompleteDate' do
+    def test_parse_with_incomplete_date
+      zone = TimeZone['Eastern Time (US & Canada)']
+      zone.stubs(:now).returns zone.local(1999,12,31)
+      twz = zone.parse('19:00:00')
+      assert_equal Time.utc(1999,12,31,19), twz.time
+    end
-  end
-