MONGOID-5222 remove _mongoid_wrap_mongoize

neilshweky · neilshweky · commit c51cd562e1e2 · 2022-07-08T14:26:04.000-04:00
diff --git a/lib/mongoid/criteria/queryable/extensions/boolean.rb b/lib/mongoid/criteria/queryable/extensions/boolean.rb
@@ -20,10 +20,10 @@ module ClassMethods
             # @return [ true, false ] The boolean value.
             def evolve(object)
               __evolve__(object) do |obj|
-                if obj.to_s =~ (/\A(true|t|yes|y|on|1|1.0)\z/i)
-                  true
-                elsif obj.to_s =~ (/\A(false|f|no|n|off|0|0.0)\z/i)
-                  false
+                begin
+                  mongoize(object)
+                rescue InvalidValue
+                  object
                 end
               end
             end
diff --git a/lib/mongoid/extensions/array.rb b/lib/mongoid/extensions/array.rb
@@ -146,10 +146,11 @@ def __mongoize_fk__(association, object)
         #
         # @return [ Array ] The object mongoized.
         def mongoize(object)
-          _mongoid_wrap_mongoize(object) do
-            if object.is_a?(::Array)
-              evolve(object).collect{ |obj| obj.class.mongoize(obj) }
-            end
+          return if object.nil?
+          if object.is_a?(::Array)
+            evolve(object).collect{ |obj| obj.class.mongoize(obj) }
+          else
+            raise Errors::InvalidValue.new(self, object)
           end
         end
 
diff --git a/lib/mongoid/extensions/big_decimal.rb b/lib/mongoid/extensions/big_decimal.rb
@@ -65,24 +65,27 @@ def demongoize(object)
         # @return [ String | BSON::Decimal128 | nil ] A String or Decimal128
         #   representing the object or nil.
         def mongoize(object)
-          return nil if object.is_a?(String) && object.blank?
-          _mongoid_wrap_mongoize(object) do
-            if Mongoid.map_big_decimal_to_decimal128
-              if object.is_a?(BSON::Decimal128)
-                object
-              elsif object.is_a?(BigDecimal)
-                BSON::Decimal128.new(object)
-              elsif object.numeric?
-                BSON::Decimal128.new(object.to_s)
-              elsif object.respond_to?(:to_d)
-                BSON::Decimal128.new(object.to_d)
-              end
-            else
-              if object.is_a?(BSON::Decimal128) || object.numeric?
-                object.to_s
-              elsif object.respond_to?(:to_d)
-                object.to_d.to_s
-              end
+          return if object.nil?
+          return if object.is_a?(String) && object.blank?
+          if Mongoid.map_big_decimal_to_decimal128
+            if object.is_a?(BSON::Decimal128)
+              object
+            elsif object.is_a?(BigDecimal)
+              BSON::Decimal128.new(object)
+            elsif object.numeric?
+              BSON::Decimal128.new(object.to_s)
+            elsif object.respond_to?(:to_d)
+              BSON::Decimal128.new(object.to_d)
+            end
+          else
+            if object.is_a?(BSON::Decimal128) || object.numeric?
+              object.to_s
+            elsif object.respond_to?(:to_d)
+              object.to_d.to_s
+            end
+          end.tap do |res|
+            if res.nil?
+              raise Errors::InvalidValue.new(self, object)
             end
           end
         end
diff --git a/lib/mongoid/extensions/binary.rb b/lib/mongoid/extensions/binary.rb
@@ -27,13 +27,11 @@ module ClassMethods
         # @return [ String | Symbol | BSON::Binary | nil ] A String or Binary
         #   representing the object or nil.
         def mongoize(object)
-          _mongoid_wrap_mongoize(object) do
-            case object
-            when BSON::Binary
-              object
-            when String, Symbol
-              BSON::Binary.new(object.to_s)
-            end
+          return if object.nil?
+          case object
+          when BSON::Binary then object
+          when String, Symbol then BSON::Binary.new(object.to_s)
+          else raise Errors::InvalidValue.new(self, object)
           end
         end
       end
diff --git a/lib/mongoid/extensions/boolean.rb b/lib/mongoid/extensions/boolean.rb
@@ -13,8 +13,13 @@ class << self
       #
       # @return [ String ] The object mongoized.
       def mongoize(object)
-        _mongoid_wrap_mongoize(object) do
-          evolve(object)
+        return if object.nil?
+        if object.to_s =~ (/\A(true|t|yes|y|on|1|1.0)\z/i)
+          true
+        elsif object.to_s =~ (/\A(false|f|no|n|off|0|0.0)\z/i)
+          false
+        else
+          raise Errors::InvalidValue.new(self, object)
         end
       end
     end
diff --git a/lib/mongoid/extensions/date.rb b/lib/mongoid/extensions/date.rb
@@ -52,21 +52,22 @@ def demongoize(object)
         #
         # @return [ Time ] The object mongoized.
         def mongoize(object)
-          _mongoid_wrap_mongoize(object) do
-            unless object.blank?
-              begin
-                if object.is_a?(String)
-                  # https://jira.mongodb.org/browse/MONGOID-4460
-                  time = ::Time.parse(object)
-                else
-                  time = object.__mongoize_time__
-                end
-                if time.acts_like?(:time)
-                  ::Time.utc(time.year, time.month, time.day)
-                end
-              rescue ArgumentError
-                nil
-              end
+          return if object.nil? || object.blank?
+          begin
+            if object.is_a?(String)
+              # https://jira.mongodb.org/browse/MONGOID-4460
+              time = ::Time.parse(object)
+            else
+              time = object.__mongoize_time__
+            end
+            if time.acts_like?(:time)
+              ::Time.utc(time.year, time.month, time.day)
+            end
+          rescue ArgumentError
+            nil
+          end.tap do |res|
+            if res.nil?
+              raise Errors::InvalidValue.new(self, object)
             end
           end
         end
diff --git a/lib/mongoid/extensions/float.rb b/lib/mongoid/extensions/float.rb
@@ -36,11 +36,12 @@ module ClassMethods
         #
         # @return [ String ] The object mongoized.
         def mongoize(object)
-          return nil if object.is_a?(String) && object.blank?
-          _mongoid_wrap_mongoize(object) do
-            if object.respond_to?(:to_f)
-              object.to_f
-            end
+          return if object.nil?
+          return if object.is_a?(String) && object.blank?
+          if object.respond_to?(:to_f)
+            object.to_f
+          else
+            raise Errors::InvalidValue.new(self, object)
           end
         end
         alias :demongoize :mongoize
diff --git a/lib/mongoid/extensions/hash.rb b/lib/mongoid/extensions/hash.rb
@@ -219,10 +219,11 @@ module ClassMethods
         #
         # @return [ Hash ] The object mongoized.
         def mongoize(object)
-          _mongoid_wrap_mongoize(object) do
-            if object.is_a?(Hash)
-              evolve(object.dup).transform_values!(&:mongoize)
-            end
+          return if object.nil?
+          if object.is_a?(Hash)
+            evolve(object.dup).transform_values!(&:mongoize)
+          else
+            raise Errors::InvalidValue.new(self, object)
           end
         end
 
diff --git a/lib/mongoid/extensions/integer.rb b/lib/mongoid/extensions/integer.rb
@@ -44,11 +44,12 @@ module ClassMethods
         #
         # @return [ String ] The object mongoized.
         def mongoize(object)
-          return nil if object.is_a?(String) && object.blank?
-          _mongoid_wrap_mongoize(object) do
-            if object.respond_to?(:to_i)
-              object.to_i
-            end
+          return if object.nil?
+          return if object.is_a?(String) && object.blank?
+          if object.respond_to?(:to_i)
+            object.to_i
+          else
+            raise Errors::InvalidValue.new(self, object)
           end
         end
         alias :demongoize :mongoize
diff --git a/lib/mongoid/extensions/object.rb b/lib/mongoid/extensions/object.rb
@@ -239,15 +239,6 @@ def demongoize(object)
         def mongoize(object)
           object.mongoize
         end
-
-        def _mongoid_wrap_mongoize(object)
-          return if object.nil?
-          yield.tap do |res|
-            if res.nil?
-              raise Errors::InvalidValue.new(self, object)
-            end
-          end
-        end
       end
     end
   end
diff --git a/lib/mongoid/extensions/range.rb b/lib/mongoid/extensions/range.rb
@@ -63,11 +63,11 @@ def demongoize(object)
         #
         # @return [ Hash ] The object mongoized.
         def mongoize(object)
-          _mongoid_wrap_mongoize(object) do
-            case object
-            when Hash then __mongoize_hash__(object)
-            when Range then __mongoize_range__(object)
-            end
+          return if object.nil?
+          case object
+          when Hash then __mongoize_hash__(object)
+          when Range then __mongoize_range__(object)
+          else raise Errors::InvalidValue.new(self, object)
           end
         end
 
diff --git a/lib/mongoid/extensions/regexp.rb b/lib/mongoid/extensions/regexp.rb
@@ -16,11 +16,10 @@ module ClassMethods
         #
         # @return [ Regexp ] The object mongoized.
         def mongoize(object)
-          _mongoid_wrap_mongoize(object) do
-            case object
-            when String, ::Regexp
-              ::Regexp.new(object)
-            end
+          return if object.nil?
+          case object
+          when String, ::Regexp then ::Regexp.new(object)
+          else raise Errors::InvalidValue.new(self, object)
           end
         end
       end
diff --git a/lib/mongoid/extensions/set.rb b/lib/mongoid/extensions/set.rb
@@ -39,11 +39,10 @@ def demongoize(object)
         #
         # @return [ Array ] The object mongoized.
         def mongoize(object)
-          _mongoid_wrap_mongoize(object) do
-            case object
-            when Array, Set
-              ::Array.mongoize(object.to_a)
-            end
+          return if object.nil?
+          case object
+          when Array, Set then ::Array.mongoize(object.to_a)
+          else raise Errors::InvalidValue.new(self, object)
           end
         end
       end
diff --git a/lib/mongoid/extensions/symbol.rb b/lib/mongoid/extensions/symbol.rb
@@ -38,8 +38,9 @@ def demongoize(object)
         #
         # @return [ Symbol ] The object mongoized.
         def mongoize(object)
-          _mongoid_wrap_mongoize(object) do
-            demongoize(object)
+          return if object.nil?
+          demongoize(object).tap do |res|
+            raise Errors::InvalidValue.new(self, object) unless res
           end
         end
       end
diff --git a/lib/mongoid/extensions/time.rb b/lib/mongoid/extensions/time.rb
@@ -65,21 +65,22 @@ def demongoize(object)
         #
         # @return [ Time ] The object mongoized.
         def mongoize(object)
-          _mongoid_wrap_mongoize(object) do
-            begin
-              time = object.__mongoize_time__
-              if time.acts_like?(:time)
-                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
+          return if object.nil?
+          begin
+            time = object.__mongoize_time__
+            if time.acts_like?(:time)
+              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
-            rescue ArgumentError
-              nil
             end
+          rescue ArgumentError
+            nil
+          end.tap do |res|
+            raise Errors::InvalidValue.new(self, object) unless res
           end
         end
       end
