UncastableValue --> RawValue

johnnyshields · johnnyshields · commit 897b1bd26327 · 2022-07-11T01:09:50.000+09:00
diff --git a/lib/mongoid/criteria/queryable/extensions/array.rb b/lib/mongoid/criteria/queryable/extensions/array.rb
@@ -137,7 +137,7 @@ def evolve(object)
               when ::Array, ::Set
                 object.map { |obj| obj.class.evolve(obj) }
               else
-                Mongoid::UncastableValue(object, 'Array')
+                Mongoid::RawValue(object, 'Array')
               end
             end
           end
diff --git a/lib/mongoid/criteria/queryable/selector.rb b/lib/mongoid/criteria/queryable/selector.rb
@@ -157,12 +157,12 @@ def evolve(serializer, value)
                      evolve_array(serializer, value)
                    when Range
                      value.__evolve_range__(serializer: serializer)
-                   when Mongoid::UncastableValue
+                   when Mongoid::RawValue
                      value
                    else
                      (serializer || value.class).evolve(value)
                    end
-          _value = _value.raw_value if _value.is_a?(Mongoid::UncastableValue)
+          _value = _value.raw_value if _value.is_a?(Mongoid::RawValue)
           _value
         end
 
diff --git a/lib/mongoid/extensions.rb b/lib/mongoid/extensions.rb
@@ -48,6 +48,7 @@ def transform_keys
 require "mongoid/extensions/object"
 require "mongoid/extensions/object_id"
 require "mongoid/extensions/range"
+require "mongoid/raw_value"
 require "mongoid/extensions/regexp"
 require "mongoid/extensions/set"
 require "mongoid/extensions/string"
diff --git a/lib/mongoid/extensions/array.rb b/lib/mongoid/extensions/array.rb
@@ -151,7 +151,7 @@ def mongoize(object)
           when ::Array, ::Set
             evolve(object).collect{ |obj| obj.class.mongoize(obj) }
           else
-            Mongoid::UncastableValue(object, 'Array')
+            Mongoid::RawValue(object, 'Array')
           end
         end
 
diff --git a/lib/mongoid/extensions/big_decimal.rb b/lib/mongoid/extensions/big_decimal.rb
@@ -75,13 +75,13 @@ def mongoize(object)
             elsif object.numeric?
               BSON::Decimal128.new(object.to_s)
             else
-              Mongoid::UncastableValue(object, 'BigDecimal')
+              Mongoid::RawValue(object, 'BigDecimal')
             end
           else
             if object.is_a?(BSON::Decimal128) || object.numeric?
               object.to_s
             else
-              Mongoid::UncastableValue(object, 'BigDecimal')
+              Mongoid::RawValue(object, 'BigDecimal')
             end
           end
         end
diff --git a/lib/mongoid/extensions/binary.rb b/lib/mongoid/extensions/binary.rb
@@ -30,7 +30,7 @@ def mongoize(object)
           case object
           when BSON::Binary then object
           when String, Symbol then BSON::Binary.new(object.to_s)
-          else Mongoid::UncastableValue(object, 'BSON::Binary')
+          else Mongoid::RawValue(object, 'BSON::Binary')
           end
         end
       end
diff --git a/lib/mongoid/extensions/boolean.rb b/lib/mongoid/extensions/boolean.rb
@@ -19,7 +19,7 @@ def mongoize(object)
         elsif object.to_s =~ (/\A(false|f|no|n|off|0|0.0)\z/i)
           false
         else
-          Mongoid::UncastableValue(object, 'Boolean')
+          Mongoid::RawValue(object, 'Boolean')
         end
       end
     end
diff --git a/lib/mongoid/extensions/date.rb b/lib/mongoid/extensions/date.rb
@@ -66,7 +66,7 @@ def mongoize(object)
             end
           rescue ArgumentError
           end
-          Mongoid::UncastableValue(object, 'Date')
+          Mongoid::RawValue(object, 'Date')
         end
       end
     end
diff --git a/lib/mongoid/extensions/float.rb b/lib/mongoid/extensions/float.rb
@@ -38,7 +38,7 @@ module ClassMethods
         def mongoize(object)
           return if object.blank?
           return object.to_f if object.numeric?
-          Mongoid::UncastableValue(object, 'Date')
+          Mongoid::RawValue(object, 'Date')
         end
         alias :demongoize :mongoize
       end
diff --git a/lib/mongoid/extensions/hash.rb b/lib/mongoid/extensions/hash.rb
@@ -221,7 +221,7 @@ module ClassMethods
         def mongoize(object)
           return if object.nil?
           return object.dup.transform_values!(&:mongoize) if object.is_a?(Hash)
-          Mongoid::UncastableValue(object, 'Hash')
+          Mongoid::RawValue(object, 'Hash')
         end
 
         # Can the size of this object change?
diff --git a/lib/mongoid/extensions/integer.rb b/lib/mongoid/extensions/integer.rb
@@ -46,7 +46,7 @@ module ClassMethods
         def mongoize(object)
           return if object.blank?
           return object.to_i if object.numeric?
-          Mongoid::UncastableValue(object, 'Integer')
+          Mongoid::RawValue(object, 'Integer')
         end
         alias :demongoize :mongoize
       end
diff --git a/lib/mongoid/extensions/range.rb b/lib/mongoid/extensions/range.rb
@@ -67,7 +67,7 @@ def mongoize(object)
           case object
           when Hash then __mongoize_hash__(object)
           when Range then __mongoize_range__(object)
-          else Mongoid::UncastableValue(object, 'Range')
+          else Mongoid::RawValue(object, 'Range')
           end
         end
 
diff --git a/lib/mongoid/extensions/regexp.rb b/lib/mongoid/extensions/regexp.rb
@@ -17,14 +17,16 @@ module ClassMethods
         # @return [ Regexp | nil ] The object mongoized or nil.
         def mongoize(object)
           return if object.nil?
-          case object
-          when String then return ::Regexp.new(object)
-          when ::Regexp then return object
-          when BSON::Regexp::Raw then return object.compile
+          begin
+            case object
+            when String then return ::Regexp.new(object)
+            when ::Regexp then return object
+            when BSON::Regexp::Raw then return object.compile
+            end
+          rescue RegexpError
           end
-        rescue RegexpError
+          Mongoid::RawValue(object, 'Regexp')
         end
-        Mongoid::UncastableValue(object, 'Regexp')
       end
     end
   end
diff --git a/lib/mongoid/extensions/set.rb b/lib/mongoid/extensions/set.rb
@@ -43,7 +43,7 @@ def mongoize(object)
           case object
           when ::Set then ::Array.mongoize(object.to_a)
           when ::Array then ::Array.mongoize(object).uniq
-          else Mongoid::UncastableValue(object, 'Set')
+          else Mongoid::RawValue(object, 'Set')
           end
         end
       end
diff --git a/lib/mongoid/extensions/string.rb b/lib/mongoid/extensions/string.rb
@@ -173,7 +173,7 @@ def demongoize(object)
         def mongoize(object)
           return nil if object.blank?
           return object.to_s if object.respond_to?(:to_s)
-          Mongoid::UncastableValue.new(object, 'String')
+          Mongoid::RawValue.new(object, 'String')
         end
       end
     end
diff --git a/lib/mongoid/extensions/symbol.rb b/lib/mongoid/extensions/symbol.rb
@@ -40,7 +40,7 @@ def demongoize(object)
         def mongoize(object)
           return if object.nil?
           return object.to_sym if object.respond_to?(:to_sym)
-          Mongoid::UncastableValue.new(object, 'Symbol')
+          Mongoid::RawValue.new(object, 'Symbol')
         end
       end
     end
diff --git a/lib/mongoid/extensions/time.rb b/lib/mongoid/extensions/time.rb
@@ -69,17 +69,17 @@ def mongoize(object)
           begin
             time = object.__mongoize_time__
             if time.acts_like?(:time)
-              return if object.respond_to?(:sec_fraction)
-                       ::Time.at(time.to_i, object.sec_fraction * 10**6).utc
-                     elsif time.respond_to?(:subsec)
-                       ::Time.at(time.to_i, time.subsec * 10**6).utc
-                     else
-                       ::Time.at(time.to_i, time.usec).utc
-                     end
+              if object.respond_to?(:sec_fraction)
+                return ::Time.at(time.to_i, object.sec_fraction * 10**6).utc
+              elsif time.respond_to?(:subsec)
+                return ::Time.at(time.to_i, time.subsec * 10**6).utc
+              else
+                return ::Time.at(time.to_i, time.usec).utc
+              end
             end
           rescue ArgumentError
           end
-          Mongoid::UncastableValue.new(object, 'Time')
+          Mongoid::RawValue.new(object, 'Time')
         end
       end
     end
diff --git a/lib/mongoid/fields/standard.rb b/lib/mongoid/fields/standard.rb
@@ -11,7 +11,7 @@ class Standard
 
       def mongoize(object)
         value = type.mongoize(object)
-        unless value.is_a?(Mongoid::UncastableValue)
+        unless value.is_a?(Mongoid::RawValue)
           case strict
           when :error then value.raise_error!
           when :warn then value.warn
diff --git a/lib/mongoid/raw_value.rb b/lib/mongoid/raw_value.rb
@@ -3,11 +3,11 @@
 # Wrapper class used when a value cannot be casted in mongoize,
 # demongoize, and evolve methods.
 module Mongoid
-  def UncastableValue(*args)
-    UncastableValue.new(*args)
+  def RawValue(*args)
+    RawValue.new(*args)
   end
 
-  class UncastableValue
+  class RawValue
 
     attr_reader :raw_value,
                 :cast_class
diff --git a/lib/mongoid/stringified_symbol.rb b/lib/mongoid/stringified_symbol.rb
@@ -19,7 +19,7 @@ class << self
       def demongoize(object)
         return nil if object.nil?
         return object.to_s.to_sym if object.respond_to?(:to_s)
-        Mongoid::UncastableValue.new(object, 'String')
+        Mongoid::RawValue.new(object, 'String')
       end
 
       # Turn the object from the ruby type we deal with to a Mongo friendly
@@ -36,7 +36,7 @@ def demongoize(object)
       def mongoize(object)
         return nil if object.nil?
         return object.to_s if object.respond_to?(:to_s)
-        Mongoid::UncastableValue.new(object, 'String')
+        Mongoid::RawValue.new(object, 'String')
       end
 
       # @api private
