bson 4.15.0 → 5.0.0

data/spec/bson/byte_buffer_spec.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 require 'spec_helper'
 
 describe BSON::ByteBuffer do

data/spec/bson/byte_buffer_write_spec.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 require 'spec_helper'
 
 describe BSON::ByteBuffer do

data/spec/bson/code_spec.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 # Copyright (C) 2009-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,17 +17,18 @@ require "spec_helper"
 
 describe BSON::Code do
 
-  describe "#as_json" do
+  describe "#as_extended_json" do
 
     let(:object) do
       described_class.new("this.value = 5")
     end
 
     it "returns the binary data plus type" do
-      expect(object.as_json).to eq({ "$code" => "this.value = 5" })
+      expect(object.as_extended_json).to eq({ "$code" => "this.value = 5" })
     end
 
-    it_behaves_like "a JSON serializable object"
+    it_behaves_like 'an Extended JSON serializable object'
+    it_behaves_like '#as_json calls #as_extended_json'
   end
 
   describe "#to_bson/#from_bson" do

data/spec/bson/code_with_scope_spec.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 # Copyright (C) 2009-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,19 +40,20 @@ describe BSON::CodeWithScope do
     end
   end
 
-  describe "#as_json" do
+  describe "#as_extended_json" do
 
     let(:object) do
       described_class.new("this.value = val", :val => "test")
     end
 
     it "returns the binary data plus type" do
-      expect(object.as_json).to eq(
+      expect(object.as_extended_json).to eq(
         { "$code" => "this.value = val", "$scope" => { :val => "test" }}
       )
     end
 
-    it_behaves_like "a JSON serializable object"
+    it_behaves_like 'an Extended JSON serializable object'
+    it_behaves_like '#as_json calls #as_extended_json'
   end
 
   describe "#to_bson" do

data/spec/bson/config_spec.rb

@@ -1,40 +1,6 @@
+# rubocop:todo all
 require "spec_helper"
 
 describe BSON::Config do
 
-  describe "#validating_keys?" do
-
-    context "when the default is used" do
-
-      it "returns false" do
-        expect(described_class).to_not be_validating_keys
-      end
-    end
-
-    context "when configuring to false" do
-
-      before do
-        BSON::Config.validating_keys = false
-      end
-
-      it "returns false" do
-        expect(described_class).to_not be_validating_keys
-      end
-    end
-
-    context "when configuring to true" do
-
-      before do
-        BSON::Config.validating_keys = true
-      end
-
-      after do
-        BSON::Config.validating_keys = false
-      end
-
-      it "returns true" do
-        expect(described_class).to be_validating_keys
-      end
-    end
-  end
 end

data/spec/bson/date_spec.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 # Copyright (C) 2009-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/bson/date_time_spec.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 # Copyright (C) 2009-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/bson/dbref_legacy_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 require 'json'
@@ -8,7 +8,24 @@ require 'json'
 # class, and are intended to verify that the current DBRef implementation is
 # compatible with the legacy driver DBRef interface.
 
-describe BSON::DBRef do
+# For testing a class that emits warnings, without spamming the terminal
+# with them.
+def silenced_version_of(klass)
+  Class.new(klass) do
+    class <<self
+      def name
+        "#{superclass.name} (silenced)"
+      end
+
+      alias to_s name
+    end
+
+    def warn(*_args)
+    end
+  end
+end
+
+describe silenced_version_of BSON::DBRef do
 
   let(:object_id) do
     BSON::ObjectId.new
@@ -76,7 +93,7 @@ describe BSON::DBRef do
         it 'raises ArgumentError' do
           lambda do
             dbref
-          end.should raise_error(ArgumentError)
+          end.should raise_error(BSON::Error::InvalidDBRefArgument)
         end
       end
     end

data/spec/bson/dbref_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 require 'json'
@@ -79,10 +79,10 @@ describe BSON::DBRef do
         described_class.new({:$ref => 'users', :$id => object_id}, object_id)
       end
 
-      it 'raises ArgumentError' do
+      it 'raises InvalidDBRefArgument' do
         lambda do
           dbref
-        end.should raise_error(ArgumentError)
+        end.should raise_error(BSON::Error::InvalidDBRefArgument)
       end
     end
 
@@ -92,10 +92,10 @@ describe BSON::DBRef do
         described_class.new({:$ref => 'users', :$id => object_id}, object_id, 'db')
       end
 
-      it 'raises ArgumentError' do
+      it 'raises InvalidDBRefArgument' do
         lambda do
           dbref
-        end.should raise_error(ArgumentError)
+        end.should raise_error(BSON::Error::InvalidDBRefArgument)
       end
     end
 
@@ -118,7 +118,7 @@ describe BSON::DBRef do
       it 'raises an error' do
         expect do
           dbref
-        end.to raise_error(ArgumentError, /DBRef must have \$ref/)
+        end.to raise_error(BSON::Error::InvalidDBRefArgument, /DBRef must have \$ref/)
       end
     end
 
@@ -130,7 +130,7 @@ describe BSON::DBRef do
       it 'raises an error' do
         expect do
           dbref
-        end.to raise_error(ArgumentError, /DBRef must have \$id/)
+        end.to raise_error(BSON::Error::InvalidDBRefArgument, /DBRef must have \$id/)
       end
     end
 
@@ -142,7 +142,7 @@ describe BSON::DBRef do
       it 'raises an error' do
         expect do
           dbref
-        end.to raise_error(ArgumentError, /The value for key \$ref must be a string/)
+        end.to raise_error(BSON::Error::InvalidDBRefArgument, /The value for key \$ref must be a string/)
       end
     end
 
@@ -154,7 +154,7 @@ describe BSON::DBRef do
       it 'raises an error' do
         expect do
           dbref
-        end.to raise_error(ArgumentError, /The value for key \$db must be a string/)
+        end.to raise_error(BSON::Error::InvalidDBRefArgument, /The value for key \$db must be a string/)
       end
     end
 

data/spec/bson/decimal128_spec.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 # Copyright (C) 2016-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,10 +29,10 @@ describe BSON::Decimal128 do
 
     context 'when the argument is neither a BigDecimal or String' do
 
-      it 'raises an ArgumentError' do
+      it 'raises an InvalidDecimal128Argument error' do
         expect {
           described_class.new(:invalid)
-        }.to raise_exception(ArgumentError)
+        }.to raise_exception(BSON::Error::InvalidDecimal128Argument, /A Decimal128 can only be created from a String or BigDecimal./ )
       end
     end
 
@@ -46,7 +47,7 @@ describe BSON::Decimal128 do
       end
 
       let(:from_bson) do
-        described_class.from_bson(buffer)
+        described_class.from_bson(buffer, mode: :bson)
       end
 
       let(:expected_bson) do
@@ -314,7 +315,7 @@ describe BSON::Decimal128 do
       it 'raises InvalidRange' do
         lambda do
           described_class.new('1e10000')
-        end.should raise_error(BSON::Decimal128::InvalidRange, /Value out of range/)
+        end.should raise_error(BSON::Error::InvalidDecimal128Range, /Value out of range/)
       end
     end
 
@@ -322,7 +323,7 @@ describe BSON::Decimal128 do
       it 'raises UnrepresentablePrecision' do
         lambda do
           described_class.new('1.000000000000000000000000000000000000000000000000001')
-        end.should raise_error(BSON::Decimal128::UnrepresentablePrecision, /The value contains too much precision/)
+        end.should raise_error(BSON::Error::UnrepresentablePrecision, /The value contains too much precision/)
       end
     end
   end
@@ -344,7 +345,7 @@ describe BSON::Decimal128 do
       end
 
       let(:decimal128) do
-        BSON::Document.from_bson(buffer)['d']
+        BSON::Document.from_bson(buffer, mode: :bson)['d']
       end
 
       let(:object_from_string) do
@@ -1270,13 +1271,39 @@ describe BSON::Decimal128 do
       described_class.new(BigDecimal('1.23'))
     end
 
-    it "returns the decimal128 with $numberDecimal key" do
-      expect(object.as_json).to eq({ "$numberDecimal" => object.to_s })
+    it "returns the decimal128 as a string" do
+      expect(object.as_json).to eq('1.23')
+    end
+
+    %w[NaN -NaN SNaN -SNaN Infinity -Infinity].each do |value|
+      context "when special value #{value}" do
+
+        let(:object) do
+          described_class.new(value)
+        end
+
+        it "returns nil to be consistent with ActiveSupport" do
+          expect(object.as_json).to eq(nil)
+        end
+      end
     end
 
     it_behaves_like "a JSON serializable object"
   end
 
+  describe "#as_extended_json" do
+
+    let(:object) do
+      described_class.new(BigDecimal('1.23'))
+    end
+
+    it "returns the decimal128 with $numberDecimal key" do
+      expect(object.as_extended_json).to eq({ "$numberDecimal" => '1.23' })
+    end
+
+    it_behaves_like "an Extended JSON serializable object"
+  end
+
   describe "::BSON_TYPE" do
 
     it "returns 0x13" do
@@ -1361,7 +1388,7 @@ describe BSON::Decimal128 do
     end
   end
 
-  describe "#to_big_decimal" do
+  describe "#to_d" do
 
     shared_examples_for 'a decimal128 convertible to a Ruby BigDecimal' do
 
@@ -1370,6 +1397,10 @@ describe BSON::Decimal128 do
       end
 
       it 'properly converts the Decimal128 to a BigDecimal' do
+        expect(decimal128.to_d).to eq(expected_big_decimal)
+      end
+
+      it 'permits the alias #to_big_decimal' do
         expect(decimal128.to_big_decimal).to eq(expected_big_decimal)
       end
     end
@@ -1592,17 +1623,6 @@ describe BSON::Decimal128 do
     end
   end
 
-  context "when the class is loaded" do
-
-    let(:registered) do
-      BSON::Registry.get(described_class::BSON_TYPE, 'field')
-    end
-
-    it "registers the type" do
-      expect(registered).to eq(described_class)
-    end
-  end
-
   %w(== ===).each do |eq_op|
     let(:lhs) { described_class.new('1.2e12') }
 

data/spec/bson/document_as_spec.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 # Copyright (C) 2021 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/bson/document_spec.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# rubocop:todo all
 
 # Copyright (C) 2009-2020 MongoDB Inc.
 #

data/spec/bson/ext_json_parse_spec.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 # Copyright (C) 2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/bson/false_class_spec.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 # Copyright (C) 2009-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,4 +26,11 @@ describe FalseClass do
     it_behaves_like "a bson element"
     it_behaves_like "a serializable bson element"
   end
+
+  describe '#as_extended_json' do
+    let(:object) { false }
+
+    it_behaves_like '#as_extended_json returns self'
+    it_behaves_like 'an Extended JSON serializable object'
+  end
 end

data/spec/bson/float_spec.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 # Copyright (C) 2009-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,15 +35,17 @@ describe Float do
   end
 
   describe '#as_extended_json' do
+    let(:object) { 42.0 }
+
     context 'canonical mode' do
       it 'returns $numberDouble' do
-        42.0.as_extended_json.should == {'$numberDouble' => '42.0'}
+        object.as_extended_json.should == {'$numberDouble' => '42.0'}
       end
     end
 
     context 'relaxed mode' do
       let(:serialized) do
-        42.0.as_extended_json(mode: :relaxed)
+        object.as_extended_json(mode: :relaxed)
       end
 
       it 'returns float' do
@@ -53,7 +56,7 @@ describe Float do
 
     context 'legacy mode' do
       let(:serialized) do
-        42.0.as_extended_json(mode: :legacy)
+        object.as_extended_json(mode: :legacy)
       end
 
       it 'returns float' do
@@ -61,5 +64,7 @@ describe Float do
         serialized.should be_within(0.00001).of(42)
       end
     end
+
+    it_behaves_like "an Extended JSON serializable object"
   end
 end

data/spec/bson/hash_as_spec.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 # Copyright (C) 2021 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/bson/hash_spec.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 # Copyright (C) 2009-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -52,93 +53,36 @@ describe Hash do
       end
     end
 
-    context "when the hash has invalid keys" do
+    context "when the hash has dollar keys" do
 
       let(:obj) do
         { "$testing" => "value" }
       end
 
-      context "when validating keys" do
 
-        context "when validating globally" do
-
-          before do
-            BSON::Config.validating_keys = true
-          end
-
-          after do
-            BSON::Config.validating_keys = false
-          end
-
-          it "raises an error" do
-            expect {
-              obj.to_bson
-            }.to raise_error(BSON::String::IllegalKey)
-          end
-
-          context "when the hash contains an array of documents containing invalid keys" do
-
-            let(:obj) do
-              { "array" =>  [{ "$testing" => "value" }] }
-            end
-
-            it "raises an error" do
-              expect {
-                obj.to_bson
-              }.to raise_error(BSON::String::IllegalKey)
-            end
-          end
-        end
-
-        context "when validating locally" do
-
-          it "raises an error" do
-            expect {
-              obj.to_bson(BSON::ByteBuffer.new, true)
-            }.to raise_error(BSON::String::IllegalKey)
-          end
+      let(:bson) do
+        "#{25.to_bson.to_s}#{String::BSON_TYPE}$testing#{BSON::NULL_BYTE}" +
+        "#{6.to_bson.to_s}value#{BSON::NULL_BYTE}#{BSON::NULL_BYTE}"
+      end
 
-          context "when the hash contains an array of documents containing invalid keys" do
+      it "serializes the hash" do
+        expect(obj.to_bson.to_s).to eq(bson)
+      end
 
-            let(:obj) do
-              { "array" =>  [{ "$testing" => "value" }] }
-            end
+      context "when the hash contains an array of documents containing invalid keys" do
 
-            it "raises an error" do
-              expect {
-                obj.to_bson(BSON::ByteBuffer.new, true)
-              }.to raise_error(BSON::String::IllegalKey)
-            end
-          end
+        let(:obj) do
+          { "array" =>  [{ "$testing" => "value" }] }
         end
-      end
-
-      context "when not validating keys" do
 
         let(:bson) do
-          "#{25.to_bson.to_s}#{String::BSON_TYPE}$testing#{BSON::NULL_BYTE}" +
-          "#{6.to_bson.to_s}value#{BSON::NULL_BYTE}#{BSON::NULL_BYTE}"
+          "#{45.to_bson.to_s}#{Array::BSON_TYPE}array#{BSON::NULL_BYTE}" +
+          "#{[{ "$testing" => "value" }].to_bson.to_s}#{BSON::NULL_BYTE}"
         end
 
         it "serializes the hash" do
           expect(obj.to_bson.to_s).to eq(bson)
         end
-
-        context "when the hash contains an array of documents containing invalid keys" do
-
-          let(:obj) do
-            { "array" =>  [{ "$testing" => "value" }] }
-          end
-
-          let(:bson) do
-            "#{45.to_bson.to_s}#{Array::BSON_TYPE}array#{BSON::NULL_BYTE}" +
-              "#{[{ "$testing" => "value" }].to_bson.to_s}#{BSON::NULL_BYTE}"
-          end
-
-          it "serializes the hash" do
-            expect(obj.to_bson.to_s).to eq(bson)
-          end
-        end
       end
     end
 
@@ -270,8 +214,28 @@ describe Hash do
         end.to_not raise_error
       end
 
-      it 'deserializes as a BSON::Decimal128' do
-        expect(from_bson).to eq({"x" => BSON::Decimal128.new('1')})
+      it 'deserializes as a BigDecimal' do
+        expect(from_bson).to eq({"x" => BigDecimal(1)})
+      end
+    end
+
+    context 'when deserializing round-tripping a Decimal128' do
+      let(:to_bson) do
+        {x:BSON::Decimal128.new('1')}.to_bson
+      end
+
+      let(:from_bson) do
+        Hash.from_bson(to_bson)
+      end
+
+      it 'doesn\'t raise on serialization' do
+        expect do
+          to_bson
+        end.to_not raise_error
+      end
+
+      it 'deserializes as a BigDecimal' do
+        expect(from_bson).to eq({"x" => BigDecimal(1)})
       end
     end
   end
@@ -348,7 +312,7 @@ describe Hash do
       it 'works' do
         expect do
           hash.to_bson
-        end.not_to raise_error
+        end.to_not raise_error
       end
     end
   end
@@ -372,7 +336,7 @@ describe Hash do
       let(:doc) { Hash.from_bson(buf) }
 
       it 'overwrites first value with second value' do
-        doc.should == {'foo' => 'overwrite'}
+        expect(doc).to eq({ 'foo' => 'overwrite' })
       end
     end
 
@@ -394,8 +358,56 @@ describe Hash do
       let(:doc) { Hash.from_bson(buf) }
 
       it 'overwrites first value with second value' do
-        doc.should == {'foo' => :bar}
+        expect(doc).to eq({ 'foo' => :bar })
       end
     end
+
+    context 'when deserializing a hash with a BigDecimal' do
+      let(:to_bson) do
+        {x: BigDecimal('1')}.to_bson
+      end
+
+      context 'when it has mode: :bson' do
+
+        let(:from_bson) do
+          Hash.from_bson(to_bson, mode: :bson)
+        end
+
+        it 'deserializes as a BigDecimal' do
+          expect(from_bson).to eq({"x" => BSON::Decimal128.new('1')})
+        end
+      end
+
+      context 'when it doesn\'t have mode: :bson' do
+
+        let(:from_bson) do
+          Hash.from_bson(to_bson)
+        end
+
+        it 'deserializes as a BigDecimal' do
+          expect(from_bson).to eq({"x" => BigDecimal(1)})
+        end
+      end
+    end
+  end
+
+  describe '#as_extended_json' do
+    let(:object) do
+      { 'foo' => :bar, 'baz' => ['qux', 1, 2.0, { 'lorem' => 1 }] }
+    end
+
+    let(:expected) do
+      { "foo" => { "$symbol" => "bar" },
+        "baz" => [ "qux",
+                   { "$numberInt" => "1" },
+                   { "$numberDouble" => "2.0" },
+                   { "lorem" => { "$numberInt" => "1" } } ] }
+    end
+
+    it "returns the binary data plus type" do
+      expect(object.as_extended_json).to eq(expected)
+    end
+
+    it_behaves_like 'an Extended JSON serializable object'
   end
 end