MONGOID-5222 fix BigDecimal mongoization

Author: neilshweky

lib/mongoid/extensions/big_decimal.rb

@@ -65,17 +65,22 @@ 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 object.is_a?(BSON::Decimal128)
-              object
-            elsif Mongoid.map_big_decimal_to_decimal128
-              if object.is_a?(BigDecimal)
+            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
-            elsif object.numeric?
-              object.to_s
             end
           end
         end

lib/mongoid/extensions/float.rb

@@ -36,7 +36,7 @@ module ClassMethods
         #
         # @return [ String ] The object mongoized.
         def mongoize(object)
-          return nil if object.to_s.blank?
+          return nil if object.is_a?(String) && object.blank?
           _mongoid_wrap_mongoize(object) do
             if object.respond_to?(:to_f)
               object.to_f

lib/mongoid/extensions/integer.rb

@@ -44,7 +44,7 @@ module ClassMethods
         #
         # @return [ String ] The object mongoized.
         def mongoize(object)
-          return nil if object.to_s.blank?
+          return nil if object.is_a?(String) && object.blank?
           _mongoid_wrap_mongoize(object) do
             if object.respond_to?(:to_i)
               object.to_i

spec/mongoid/extensions/big_decimal_spec.rb

@@ -195,6 +195,7 @@
       let(:mongoized) do
         BigDecimal.mongoize(value)
       end
+
       context "when the value is a BigDecimal" do
 
         let(:value) do
@@ -234,10 +235,8 @@
           ""
         end
 
-        it "raises an error" do
-          expect do
-            mongoized
-          end.to raise_error(Mongoid::Errors::InvalidValue)
+        it "returns nil" do
+          expect(mongoized).to be_nil
         end
       end
 
@@ -269,10 +268,8 @@
           "1a2"
         end
 
-        it "raises an error" do
-          expect do
-            mongoized
-          end.to raise_error(Mongoid::Errors::InvalidValue)
+        it "returns a string" do
+          expect(mongoized).to eq("1.0")
         end
       end
 
@@ -432,6 +429,16 @@
           expect(mongoized).to eq("-Infinity")
         end
       end
+
+      context "when the value is a decimal128" do
+        let(:value) do
+          BSON::Decimal128.new("42")
+        end
+
+        it "returns a String" do
+          expect(mongoized).to eq("42")
+        end
+      end
     end
 
     describe "#mongoize" do
@@ -670,10 +677,8 @@
           ""
         end
 
-        it "raises an error" do
-          expect do
-            mongoized
-          end.to raise_error(Mongoid::Errors::InvalidValue)
+        it "returns nil" do
+          expect(mongoized).to be_nil
         end
       end
 
@@ -705,10 +710,8 @@
           "1a2"
         end
 
-        it "raises an error" do
-          expect do
-            mongoized
-          end.to raise_error(Mongoid::Errors::InvalidValue)
+        it "returns a decimal128" do
+          expect(mongoized).to eq(BSON::Decimal128.new("1"))
         end
       end
 
@@ -869,6 +872,16 @@
           expect(mongoized).to eq(BSON::Decimal128.new("-Infinity"))
         end
       end
+
+      context "when the value is a decimal128" do
+        let(:value) do
+          BSON::Decimal128.new("42")
+        end
+
+        it "returns a String" do
+          expect(mongoized).to eq(value)
+        end
+      end
     end
 
     describe "#mongoize" do