Prevent parsing of empty string for Date & DateTime

mvz · Feb 15, 2017 · 6bab0b0 · 6bab0b0
1 parent b3ddbbd
commit 6bab0b0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/lib/happymapper/supported_types.rb b/lib/happymapper/supported_types.rb
@@ -110,11 +110,11 @@ def apply(value)
     end
 
     register_type DateTime do |value|
-      DateTime.parse(value.to_s) if value
+      DateTime.parse(value.to_s) if value && !value.empty?
     end
 
     register_type Date do |value|
-      Date.parse(value.to_s) if value
+      Date.parse(value.to_s) if value && !value.empty?
     end
 
     register_type Boolean do |value|

diff --git a/spec/happymapper/item_spec.rb b/spec/happymapper/item_spec.rb
@@ -107,6 +107,11 @@ class Bar; end
       item.typecast(nil).should == nil
     end
 
+    it "should handle empty string Dates" do
+      item = HappyMapper::Item.new(:foo, Date)
+      item.typecast("").should == nil
+    end
+
     it "should work with DateTimes" do
       item = HappyMapper::Item.new(:foo, DateTime)
       item.typecast('2000-01-01 00:00:00').should == DateTime.new(2000, 1, 1, 0, 0, 0)
@@ -117,6 +122,12 @@ class Bar; end
       item.typecast(nil).should == nil
     end
 
+    it "should handle empty string DateTimes" do
+      item = HappyMapper::Item.new(:foo, DateTime)
+      item.typecast("").should == nil
+    end
+
+
     it "should work with Boolean" do
       item = HappyMapper::Item.new(:foo, HappyMapper::Boolean)
       item.typecast('false').should == false