MONGOID-5221/5222: Fix mongoization + demongoization of non-empty string as Integer/Float

lib/mongoid/extensions/boolean.rb

@@ -11,7 +11,7 @@ class << self
       # @example Mongoize the object.
       #   Boolean.mongoize("123.11")
       #
-      # @return [ String ] The object mongoized.
+      # @return [ true | false ] The object mongoized.
       def mongoize(object)
         evolve(object)
       end

lib/mongoid/extensions/float.rb

@@ -34,13 +34,10 @@ module ClassMethods
         #
         # @param [ Object ] object The object to mongoize.
         #
-        # @return [ String ] The object mongoized.
+        # @return [ Float ] The object mongoized.
         def mongoize(object)
-          unless object.blank?
-            __numeric__(object).to_f rescue 0.0
-          else
-            nil
-          end
+          return nil if object.blank?
+          Float(__numeric__(object)) rescue nil
         end
         alias :demongoize :mongoize
       end

lib/mongoid/extensions/integer.rb

@@ -42,13 +42,10 @@ module ClassMethods
         # @example Mongoize the object.
         #   BigDecimal.mongoize("123.11")
         #
-        # @return [ String ] The object mongoized.
+        # @return [ Integer ] The object mongoized.
         def mongoize(object)
-          unless object.blank?
-            __numeric__(object).to_i rescue 0
-          else
-            nil
-          end
+          return nil if object.blank?
+          Integer(__numeric__(object)) rescue nil
         end
         alias :demongoize :mongoize
       end

spec/mongoid/criteria/queryable/extensions/numeric_spec.rb

@@ -115,5 +115,14 @@
         expect { actual }.to raise_error(ArgumentError)
       end
     end
+
+    context "when the string is non-numeric" do
+
+      let(:str) { 'foo' }
+
+      it "returns the value as integer" do
+        expect { actual }.to raise_error(ArgumentError)
+      end
+    end
   end
 end

spec/mongoid/extensions/float_spec.rb

@@ -60,8 +60,8 @@
 
     context "when the value is not a float string" do
 
-      it "returns a float" do
-        expect(Float.demongoize('asdf')).to eq(0)
+      it "returns nil" do
+        expect(Float.demongoize('asdf')).to eq(nil)
       end
     end
   end
@@ -124,8 +124,8 @@
 
       context "when the string is non numerical" do
 
-        it "returns 0" do
-          expect(Float.mongoize("foo")).to eq(0.0)
+        it "returns nil" do
+          expect(Float.mongoize("foo")).to eq(nil)
         end
       end
 

spec/mongoid/extensions/integer_spec.rb

@@ -112,7 +112,7 @@
       context "when the string is non numerical" do
 
         it "returns 0" do
-          expect(Integer.mongoize("foo")).to eq(0)
+          expect(Integer.mongoize("foo")).to eq(nil)
         end
       end