custom_fields 2.1.0.rc → 2.1.0.rc1

data/lib/custom_fields/types/date.rb

@@ -68,8 +68,16 @@ module CustomFields
 
         def _set_formatted_date(name, value)
           if value.is_a?(::String) && !value.blank?
-            date  = ::Date._strptime(value, I18n.t('date.formats.default'))
-            value = date ? ::Date.new(date[:year], date[:mon], date[:mday]) : nil
+            # start by the Date.parse method
+            _value = ::Date.parse(value) rescue nil
+
+            # try now with the format defined in the current locale
+            if _value
+              value = _value
+            else
+              date  = ::Date._strptime(value, I18n.t('date.formats.default'))
+              value = date ? ::Date.new(date[:year], date[:mon], date[:mday]) : nil
+            end
           end
 
           self.send(:"#{name}=", value)

data/lib/custom_fields/types/select.rb

@@ -124,7 +124,7 @@ module CustomFields
               [option['_id'], option['name']].include?(id_or_name)
             end
 
-            instance.send(:"#{name}_id=", option['_id'])
+            instance.send(:"#{name}_id=", option.try(:[], '_id'))
           end
 
           # Returns a list of documents groupes by select values defined in the custom fields recipe

data/lib/custom_fields/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module CustomFields #:nodoc
 
-  VERSION = '2.1.0.rc'
+  VERSION = '2.1.0.rc1'
 
 end

metadata

@@ -2,14 +2,14 @@
 name: custom_fields
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 2.1.0.rc
+  version: 2.1.0.rc1
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000 Z
+date: 2012-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -258,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -612963602801593079
+      hash: 1276482835020364284
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false