From 726b5d79845c0ef50db64e2991bfec4e108faf4d Mon Sep 17 00:00:00 2001 From: Daniel Neighman Date: Thu, 22 Apr 2010 09:43:33 +1000 Subject: updates String#to_(date|date_time|time) to return nil for blank strings --- activesupport/lib/active_support/core_ext/string/conversions.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'activesupport/lib/active_support') diff --git a/activesupport/lib/active_support/core_ext/string/conversions.rb b/activesupport/lib/active_support/core_ext/string/conversions.rb index 4cc36147f8..6a243fe982 100644 --- a/activesupport/lib/active_support/core_ext/string/conversions.rb +++ b/activesupport/lib/active_support/core_ext/string/conversions.rb @@ -30,16 +30,19 @@ 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).map { |arg| arg || 0 } d[6] *= 1000000 ::Time.send("#{form}_time", *d) end def to_date + return nil if self.blank? ::Date.new(*::Date._parse(self, false).values_at(:year, :mon, :mday)) end 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) -- cgit v1.2.3