Add wrap_uncastable_values_from_database flag

Author: johnnyshields

lib/mongoid/config.rb

@@ -72,6 +72,10 @@ module Config
     # to assign an incompatible type to a field.
     option :strict_type_assignment, default: false
 
+    # Indicates whether uncastable values from the database should
+    # be returned wrapped by Mongoid::RawValue class.
+    option :wrap_uncastable_values_from_database, 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/fields/standard.rb

@@ -9,9 +9,11 @@ class Standard
       # Set readers for the instance variables.
       attr_accessor :default_val, :label, :name, :options
 
+      # If type.mongoize returns Mongoid::RawValue,
+      # handle according to field or global strict setting
       def mongoize(object)
         value = type.mongoize(object)
-        unless value.is_a?(Mongoid::RawValue)
+        if value.is_a?(Mongoid::RawValue)
           case strict
           when :error then value.raise_error!
           when :warn then value.warn
@@ -20,7 +22,17 @@ def mongoize(object)
         value
       end
 
-      def_delegators :type, :demongoize, :evolve
+      # If type.demongoize returns Mongoid::RawValue,
+      # return the inner value according to Mongoid.wrap_uncastable_values_from_database
+      def demongoize(object)
+        value = type.demongoize(object)
+        if value.is_a?(Mongoid::RawValue) && !Mongoid.wrap_uncastable_values_from_database
+          return value.raw_value
+        end
+        value
+      end
+
+      def_delegators :type, :evolve
 
       # Adds the atomic changes for this type of resizable field.
       #