1 files changed, 34 insertions, 10 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/conversions.rb b/activesupport/lib/active_support/core_ext/string/conversions.rb
index 541f969faa..022b376aec 100644
--- a/activesupport/lib/active_support/core_ext/string/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/string/conversions.rb
@@ -4,21 +4,45 @@ require 'active_support/core_ext/time/calculations'
 class String
   # Form can be either :utc (default) or :local.
   def to_time(form = :utc)
-    return nil if self.blank?
-    d = ::Date._parse(self, false).values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction, :offset).map { |arg| arg || 0 }
-    d[6] *= 1000000
-    ::Time.send("#{form}_time", *d[0..6]) - d[7]
+    unless blank?
+      date_values = ::Date._parse(self, false).
+        values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction, :offset).
+        map! { |arg| arg || 0 }
+      date_values[6] *= 1000000
+      offset = date_values.pop
+
+      ::Time.send("#{form}_time", *date_values) - offset
+    end
   end
 
+  # Converts a string to a Date value.
+  #
+  #   "1-1-2012".to_date   #=> Sun, 01 Jan 2012
+  #   "01/01/2012".to_date #=> Sun, 01 Jan 2012
+  #   "2012-12-13".to_date #=> Thu, 13 Dec 2012
+  #   "12/13/2012".to_date #=> ArgumentError: invalid date
   def to_date
-    return nil if self.blank?
-    ::Date.new(*::Date._parse(self, false).values_at(:year, :mon, :mday))
+    unless blank?
+      date_values = ::Date._parse(self, false).values_at(:year, :mon, :mday)
+
+      ::Date.new(*date_values)
+    end
   end
 
+  # Converts a string to a DateTime value.
+  #
+  #   "1-1-2012".to_datetime            #=> Sun, 01 Jan 2012 00:00:00 +0000
+  #   "01/01/2012 23:59:59".to_datetime #=> Sun, 01 Jan 2012 23:59:59 +0000
+  #   "2012-12-13 12:50".to_datetime    #=> Thu, 13 Dec 2012 12:50:00 +0000
+  #   "12/13/2012".to_datetime          #=> ArgumentError: invalid date
   def to_datetime
-    return nil if self.blank?
-    d = ::Date._parse(self, false).values_at(:year, :mon, :mday, :hour, :min, :sec, :zone, :sec_fraction).map { |arg| arg || 0 }
-    d[5] += d.pop
-    ::DateTime.civil(*d)
+    unless blank?
+      date_values = ::Date._parse(self, false).
+        values_at(:year, :mon, :mday, :hour, :min, :sec, :zone, :sec_fraction).
+        map! { |arg| arg || 0 }
+      date_values[5] += date_values.pop
+
+      ::DateTime.civil(*date_values)
+    end
   end
 end