Merge pull request #80 from mariovisic/hotfix/import_content_type_date

Fix: Content type fields import does not support dates in yaml

lib/locomotive/import/content_types.rb

@@ -79,7 +79,7 @@ module Locomotive
             value = (case field.kind.downcase
             when 'file'     then self.open_sample_asset(value)
             when 'boolean'  then Boolean.set(value)
-            when 'date'     then Date.parse(value)
+            when 'date'     then value.is_a?(Date) ? value : Date.parse(value)
             when 'category'
               if field.category_items.detect { |item| item.name == value }.nil?
                 field.category_items.build :name => value

spec/lib/locomotive/import_spec.rb

@@ -22,7 +22,7 @@ describe Locomotive::Import::Job do
     it 'adds content types' do
       @site.content_types.count.should == 2
       content_type = @site.content_types.where(:slug => 'projects').first
-      content_type.content_custom_fields.size.should == 6
+      content_type.content_custom_fields.size.should == 7
     end
 
     it 'converts correctly the order_by option for content types' do