More changes

Author: johnnyshields

lib/mongoid/config.rb

@@ -68,6 +68,10 @@ module Config
     # existing method.
     option :scope_overwrite_exception, default: false
 
+    # Indicates whether or not to raise an error when attempting
+    # to assign an incompatible type to a field.
+    option :strict_type_assignment, default: false
+
     # Use ActiveSupport's time zone in time operations instead of the
     # Ruby default time zone.
     option :use_activesupport_time_zone, default: true

lib/mongoid/criteria/queryable/selector.rb

@@ -150,16 +150,20 @@ def evolve_multi(specs)
         #
         # @return [ Object ] The serialized object.
         def evolve(serializer, value)
-          case value
-          when Hash
-            evolve_hash(serializer, value)
-          when Array
-            evolve_array(serializer, value)
-          when Range
-            value.__evolve_range__(serializer: serializer)
-          else
-            (serializer || value.class).evolve(value)
-          end
+          _value = case value
+                   when Hash
+                     evolve_hash(serializer, value)
+                   when Array
+                     evolve_array(serializer, value)
+                   when Range
+                     value.__evolve_range__(serializer: serializer)
+                   when Mongoid::UncastableValue
+                     value
+                   else
+                     (serializer || value.class).evolve(value)
+                   end
+          _value = _value.raw_value if _value.is_a?(Mongoid::UncastableValue)
+          _value
         end
 
         # Evolve a single key selection with array values.

lib/mongoid/stringified_symbol.rb

@@ -17,11 +17,9 @@ class << self
       #
       # @api private
       def demongoize(object)
-        if object.nil?
-          object
-        else
-          object.to_s.to_sym
-        end
+        return nil if object.nil?
+        return object.to_s.to_sym if object.respond_to?(:to_s)
+        Mongoid::UncastableValue.new(object, 'String')
       end
 
       # Turn the object from the ruby type we deal with to a Mongo friendly
@@ -36,11 +34,9 @@ def demongoize(object)
       #
       # @api private
       def mongoize(object)
-         if object.nil?
-           object
-         else
-           object.to_s
-         end
+        return nil if object.nil?
+        return object.to_s if object.respond_to?(:to_s)
+        Mongoid::UncastableValue.new(object, 'String')
       end
 
       # @api private