0
@@ -179,7 +179,7 @@
0
         def define_write_method_for_time_zone_conversion(attr_name)
0
           method_body = <<-EOV
0
             def #{attr_name}=(time)
0
-              unless time.blank? || time.acts_like?(:time)
0
+              unless time. time.acts_like?(:time)
0
                 time = time.is_a?(String) ? Time.zone.parse(time) : time.to_time rescue time
0
               end
0
               time = time.in_time_zone rescue nil if time

0
@@ -213,8 +213,10 @@
0
   #   Time.zone.now                 # => Fri, 31 Dec 1999 14:00:00 HST -10:00
0
   #   Time.zone.parse('22:30:00')   # => Fri, 31 Dec 1999 22:30:00 HST -10:00
0
   def parse(str, now=now)
0
+    date_parts = Date._parse(str)
0
+    return if date_parts.blank?
0
     time = Time.parse(str, now) rescue DateTime.parse(str)
0
-    if Date._parse(str)[:offset].nil?
0
+    if date_parts[:offset].nil?
0
       ActiveSupport::TimeWithZone.new(nil, self, time)
0
     else
0
       time.in_time_zone(self)

0
@@ -198,6 +198,14 @@
0
       assert_equal zone, twz.time_zone
0
     end
0
   end
0
+  
0
+  def test_parse_returns_nil_when_string_without_date_information_is_passed_in
0
+    silence_warnings do # silence warnings raised by tzinfo gem
0
+      zone = TimeZone['Eastern Time (US & Canada)']
0
+      assert_nil zone.parse('foobar')
0
+      assert_nil zone.parse('   ')
0
+    end
0
+  end
0
 
0
   uses_mocha 'TestParseWithIncompleteDate' do
0
     def test_parse_with_incomplete_date