bson 4.2.2 → 4.12.1

data/spec/bson/code_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/spec/bson/code_with_scope_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/spec/bson/date_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/spec/bson/date_time_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,5 +35,58 @@ describe DateTime do
 
       it_behaves_like "a serializable bson element"
     end
+
+    context "when the dates don't both use Gregorian" do
+      
+      let(:shakespeare_datetime) do 
+        DateTime.iso8601('1616-04-23', Date::ENGLAND)
+      end
+
+      let(:gregorian_datetime) do
+        DateTime.iso8601('1616-04-23', Date::GREGORIAN)
+      end
+
+      context "when putting to bson" do 
+        
+        let(:shakespeare) do
+          { a: shakespeare_datetime }.to_bson
+        end
+
+        let(:gregorian) do
+          { a: gregorian_datetime }.to_bson
+        end
+
+        it "does not equal each other" do 
+          expect(shakespeare.to_s).to_not eq(gregorian.to_s)
+        end
+
+        it "the english date is 10 days later" do 
+          expect(shakespeare.to_s).to eq({ a: DateTime.iso8601('1616-05-03', Date::GREGORIAN) }.to_bson.to_s)
+        end
+      end
+
+      context "when putting and receiving from bson" do 
+
+        let(:shakespeare) do
+          Hash.from_bson(BSON::ByteBuffer.new({ a: shakespeare_datetime }.to_bson.to_s))
+        end
+
+        let(:gregorian) do
+          Hash.from_bson(BSON::ByteBuffer.new({ a: gregorian_datetime }.to_bson.to_s))
+        end
+
+        it "does not equal each other" do
+          expect(shakespeare).to_not eq(gregorian)
+        end
+
+        it "the english date is 10 days later" do
+          expect(shakespeare[:a]).to eq(DateTime.iso8601('1616-05-03', Date::GREGORIAN).to_time)
+        end
+
+        it "the gregorian date is the same" do
+          expect(gregorian[:a]).to eq(DateTime.iso8601('1616-04-23', Date::GREGORIAN).to_time)
+        end
+      end
+    end
   end
 end

data/spec/bson/decimal128_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016 MongoDB Inc.
+# Copyright (C) 2016-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -78,7 +78,7 @@ describe BSON::Decimal128 do
 
       context 'when a BigDecimal is passed' do
 
-        let(:argument) { BigDecimal.new("Infinity") }
+        let(:argument) { BigDecimal("Infinity") }
 
         it_behaves_like 'an initialized BSON::Decimal128'
       end
@@ -98,7 +98,7 @@ describe BSON::Decimal128 do
 
       context 'when a BigDecimal is passed' do
 
-        let(:argument) { BigDecimal.new("-Infinity") }
+        let(:argument) { BigDecimal("-Infinity") }
 
         it_behaves_like 'an initialized BSON::Decimal128'
       end
@@ -118,7 +118,7 @@ describe BSON::Decimal128 do
 
       context 'when a BigDecimal is passed' do
 
-        let(:argument) { BigDecimal.new("NaN") }
+        let(:argument) { BigDecimal("NaN") }
 
         it_behaves_like 'an initialized BSON::Decimal128'
       end
@@ -177,7 +177,7 @@ describe BSON::Decimal128 do
 
       context 'when a BigDecimal is passed' do
 
-        let(:argument) { BigDecimal.new("-0") }
+        let(:argument) { BigDecimal("-0") }
 
         it_behaves_like 'an initialized BSON::Decimal128'
       end
@@ -197,7 +197,7 @@ describe BSON::Decimal128 do
 
       context 'when a BigDecimal is passed' do
 
-        let(:argument) { BigDecimal.new(12) }
+        let(:argument) { BigDecimal(12) }
 
         it_behaves_like 'an initialized BSON::Decimal128'
       end
@@ -217,7 +217,7 @@ describe BSON::Decimal128 do
 
       context 'when a BigDecimal is passed' do
 
-        let(:argument) { BigDecimal.new(-12) }
+        let(:argument) { BigDecimal(-12) }
 
         it_behaves_like 'an initialized BSON::Decimal128'
       end
@@ -237,7 +237,7 @@ describe BSON::Decimal128 do
 
       context 'when a BigDecimal is passed' do
 
-        let(:argument) { BigDecimal.new(0.12345, 5) }
+        let(:argument) { BigDecimal(0.12345, 5) }
 
         it_behaves_like 'an initialized BSON::Decimal128'
       end
@@ -257,7 +257,7 @@ describe BSON::Decimal128 do
 
       context 'when a BigDecimal is passed' do
 
-        let(:argument) { BigDecimal.new(-0.12345, 5) }
+        let(:argument) { BigDecimal(-0.12345, 5) }
 
         it_behaves_like 'an initialized BSON::Decimal128'
       end
@@ -277,7 +277,7 @@ describe BSON::Decimal128 do
 
       context 'when a BigDecimal is passed' do
 
-        let(:argument) { BigDecimal.new(1234567890123456789012345678901234) }
+        let(:argument) { BigDecimal(1234567890123456789012345678901234) }
 
         it_behaves_like 'an initialized BSON::Decimal128'
       end
@@ -297,7 +297,7 @@ describe BSON::Decimal128 do
 
       context 'when a BigDecimal is passed' do
 
-        let(:argument) { BigDecimal.new(-1234567890123456789012345678901234) }
+        let(:argument) { BigDecimal(-1234567890123456789012345678901234) }
 
         it_behaves_like 'an initialized BSON::Decimal128'
       end
@@ -1183,7 +1183,7 @@ describe BSON::Decimal128 do
       end
 
       it "returns false" do
-        expect(decimal128).to_not eq(described_class.new(BigDecimal.new('2.00')))
+        expect(decimal128).to_not eq(described_class.new(BigDecimal('2.00')))
       end
     end
 
@@ -1198,7 +1198,7 @@ describe BSON::Decimal128 do
   describe "#===" do
 
     let(:decimal128) do
-      described_class.new(BigDecimal.new('1.23'))
+      described_class.new(BigDecimal('1.23'))
     end
 
     context "when comparing with another decimal128" do
@@ -1217,7 +1217,7 @@ describe BSON::Decimal128 do
       context "when the high and low bits are not equal" do
 
         let(:other) do
-          described_class.new(BigDecimal.new('1000.003'))
+          described_class.new(BigDecimal('1000.003'))
         end
 
         it "returns false" do
@@ -1251,7 +1251,7 @@ describe BSON::Decimal128 do
   describe "#as_json" do
 
     let(:object) do
-      described_class.new(BigDecimal.new('1.23'))
+      described_class.new(BigDecimal('1.23'))
     end
 
     it "returns the decimal128 with $numberDecimal key" do
@@ -1271,7 +1271,7 @@ describe BSON::Decimal128 do
   describe "#bson_type" do
 
     let(:code) do
-      described_class.new(BigDecimal.new('1.23'))
+      described_class.new(BigDecimal('1.23'))
     end
 
     it "returns 0x13" do
@@ -1311,7 +1311,7 @@ describe BSON::Decimal128 do
       end
 
       it "returns false" do
-        expect(decimal128).to_not eql(described_class.new(BigDecimal.new('2')))
+        expect(decimal128).to_not eql(described_class.new(BigDecimal('2')))
       end
     end
 
@@ -1326,7 +1326,7 @@ describe BSON::Decimal128 do
   describe "#hash" do
 
     let(:decimal128) do
-      described_class.new(BigDecimal.new('-1234E+33'))
+      described_class.new(BigDecimal('-1234E+33'))
     end
 
     it "returns a hash of the high and low bits" do
@@ -1337,7 +1337,7 @@ describe BSON::Decimal128 do
   describe "#inspect" do
 
     let(:decimal128) do
-      described_class.new(BigDecimal.new('1.23'))
+      described_class.new(BigDecimal('1.23'))
     end
 
     it "returns the inspection with the decimal128 to_s" do
@@ -1363,7 +1363,7 @@ describe BSON::Decimal128 do
       context 'when the value is Infinity' do
 
         let(:big_decimal) do
-          BigDecimal.new('Infinity')
+          BigDecimal('Infinity')
         end
 
         let(:expected_big_decimal) do
@@ -1376,7 +1376,7 @@ describe BSON::Decimal128 do
       context 'when the value is -Infinity' do
 
         let(:big_decimal) do
-          BigDecimal.new('-Infinity')
+          BigDecimal('-Infinity')
         end
 
         let(:expected_big_decimal) do
@@ -1392,7 +1392,7 @@ describe BSON::Decimal128 do
       context 'when the value is 1' do
 
         let(:big_decimal) do
-          BigDecimal.new(1)
+          BigDecimal(1)
         end
 
         let(:expected_big_decimal) do
@@ -1405,7 +1405,7 @@ describe BSON::Decimal128 do
       context 'when the value is -1' do
 
         let(:big_decimal) do
-          BigDecimal.new(-1)
+          BigDecimal(-1)
         end
 
         let(:expected_big_decimal) do
@@ -1418,7 +1418,7 @@ describe BSON::Decimal128 do
       context 'when the value is 20' do
 
         let(:big_decimal) do
-          BigDecimal.new(20)
+          BigDecimal(20)
         end
 
         let(:expected_big_decimal) do
@@ -1431,7 +1431,7 @@ describe BSON::Decimal128 do
       context 'when the value is -20' do
 
         let(:big_decimal) do
-          BigDecimal.new(-20)
+          BigDecimal(-20)
         end
 
         let(:expected_big_decimal) do
@@ -1444,7 +1444,7 @@ describe BSON::Decimal128 do
       context 'when the value is 12345678901234567' do
 
         let(:big_decimal) do
-          BigDecimal.new(12345678901234567)
+          BigDecimal(12345678901234567)
         end
 
         let(:expected_big_decimal) do
@@ -1457,7 +1457,7 @@ describe BSON::Decimal128 do
       context 'when the value is -12345678901234567' do
 
         let(:big_decimal) do
-          BigDecimal.new(-12345678901234567)
+          BigDecimal(-12345678901234567)
         end
 
         let(:expected_big_decimal) do
@@ -1470,7 +1470,7 @@ describe BSON::Decimal128 do
       context 'when the value is 12345689012345789012345' do
 
         let(:big_decimal) do
-          BigDecimal.new(12345689012345789012345)
+          BigDecimal(12345689012345789012345)
         end
 
         let(:expected_big_decimal) do
@@ -1483,7 +1483,7 @@ describe BSON::Decimal128 do
       context 'when the value is -12345689012345789012345' do
 
         let(:big_decimal) do
-          BigDecimal.new(-12345689012345789012345)
+          BigDecimal(-12345689012345789012345)
         end
 
         let(:expected_big_decimal) do
@@ -1499,7 +1499,7 @@ describe BSON::Decimal128 do
       context 'when the value is 0.1' do
 
         let(:big_decimal) do
-          BigDecimal.new(0.1, 1)
+          BigDecimal(0.1, 1)
         end
 
         let(:expected_big_decimal) do
@@ -1512,7 +1512,7 @@ describe BSON::Decimal128 do
       context 'when the value is -0.1' do
 
         let(:big_decimal) do
-          BigDecimal.new(-0.1, 1)
+          BigDecimal(-0.1, 1)
         end
 
         let(:expected_big_decimal) do
@@ -1525,7 +1525,7 @@ describe BSON::Decimal128 do
       context 'when the value is 0.123' do
 
         let(:big_decimal) do
-          BigDecimal.new(0.123, 3)
+          BigDecimal(0.123, 3)
         end
 
         let(:expected_big_decimal) do
@@ -1538,7 +1538,7 @@ describe BSON::Decimal128 do
       context 'when the value is -0.123' do
 
         let(:big_decimal) do
-          BigDecimal.new(-0.123, 3)
+          BigDecimal(-0.123, 3)
         end
 
         let(:expected_big_decimal) do
@@ -1552,7 +1552,7 @@ describe BSON::Decimal128 do
     context 'when the value has leading zeros' do
 
       let(:big_decimal) do
-        BigDecimal.new(0.001234, 4)
+        BigDecimal(0.001234, 4)
       end
 
       let(:expected_big_decimal) do
@@ -1565,7 +1565,7 @@ describe BSON::Decimal128 do
     context 'when the value has trailing zeros' do
 
       let(:big_decimal) do
-        BigDecimal.new(2.000, 4)
+        BigDecimal(2.000, 4)
       end
 
       let(:expected_big_decimal) do

data/spec/bson/document_as_spec.rb

@@ -0,0 +1,46 @@
+# Copyright (C) 2021 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "spec_helper"
+
+# BSON::Document ActiveSupport extensions
+describe BSON::Document do
+  require_active_support
+
+  describe '#symbolize_keys' do
+    context 'string keys' do
+      let(:doc) do
+        described_class.new('foo' => 'bar')
+      end
+
+      it 'works correctly' do
+        doc.symbolize_keys.should == {foo: 'bar'}
+      end
+    end
+  end
+
+  describe '#symbolize_keys!' do
+    context 'string keys' do
+      let(:doc) do
+        described_class.new('foo' => 'bar')
+      end
+
+      it 'raises ArgumentError' do
+        lambda do
+          doc.symbolize_keys!
+        end.should raise_error(ArgumentError, /symbolize_keys! is not supported on BSON::Document instances/)
+      end
+    end
+  end
+end

data/spec/bson/document_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -49,6 +49,68 @@ describe BSON::Document do
     end
   end
 
+  describe "#fetch" do
+
+    let(:document) do
+      described_class["key", "value", "key2", "value"]
+    end
+
+    context "when provided string keys" do
+
+      it "returns the value" do
+        expect(document.fetch("key")).to eq("value")
+      end
+    end
+
+    context "when provided symbol keys" do
+
+      it "returns the value" do
+        expect(document.fetch(:key)).to eq("value")
+      end
+    end
+
+    context "when key does not exist" do
+
+      it "raises KeyError" do
+        expect do
+          document.fetch(:non_existent_key)
+        end.to raise_exception(KeyError)
+      end
+
+      context "and default value is provided" do
+
+        it "returns default value" do
+          expect(document.fetch(:non_existent_key, false)).to eq(false)
+        end
+      end
+
+      context "and block is passed" do
+
+        it "returns result of the block" do
+          expect(document.fetch(:non_existent_key, &:to_s))
+            .to eq("non_existent_key")
+        end
+      end
+    end
+
+    context "when key exists" do
+
+      context "and default value is provided" do
+
+        it "returns the value" do
+          expect(document.fetch(:key, "other")).to eq("value")
+        end
+      end
+
+      context "and block is passed" do
+
+        it "returns the value" do
+          expect(document.fetch(:key, &:to_s)).to eq("value")
+        end
+      end
+    end
+  end
+
   describe "#[]" do
 
     let(:document) do
@@ -68,6 +130,13 @@ describe BSON::Document do
         expect(document[:key]).to eq("value")
       end
     end
+
+    context "when key does not exist" do
+
+      it "returns nil" do
+        expect(document[:non_existent_key]).to be nil
+      end
+    end
   end
 
   describe "#[]=" do
@@ -94,8 +163,108 @@ describe BSON::Document do
     it "sets the value" do
       expect(doc[key]).to eq(val)
     end
+
+    context 'when value is a hash' do
+      let(:val) do
+        {'foo' => {'bar' => 'baz'}}
+      end
+
+      it 'converts value to indifferent access' do
+        expect(doc[key][:foo][:bar]).to eq('baz')
+      end
+    end
+
+    context 'when value is an array with hash element' do
+      let(:val) do
+        [42, {'foo' => {'bar' => 'baz'}}]
+      end
+
+      it 'converts hash element to indifferent access' do
+        expect(doc[key][1][:foo][:bar]).to eq('baz')
+      end
+    end
+  end
+
+  if described_class.instance_methods.include?(:dig)
+    describe "#dig" do
+      let(:document) do
+        described_class.new("key1" => { :key2 => "value" })
+      end
+
+      context "when provided string keys" do
+
+        it "returns the value" do
+          expect(document.dig("key1", "key2")).to eq("value")
+        end
+      end
+
+      context "when provided symbol keys" do
+
+        it "returns the value" do
+          expect(document.dig(:key1, :key2)).to eq("value")
+        end
+      end
+    end
   end
 
+  if described_class.instance_methods.include?(:slice)
+    describe "#slice" do
+      let(:document) do
+        described_class.new("key1" => "value1", key2: "value2")
+      end
+
+      context "when provided string keys" do
+
+        it "is a BSON Document" do
+          expect(document.slice("key1")).to be_a(BSON::Document)
+        end
+
+        it "returns the partial document" do
+          expect(document.slice("key1")).to contain_exactly(['key1', 'value1'])
+        end
+      end
+
+      context "when provided symbol keys" do
+
+        it "is a BSON Document" do
+          expect(document.slice(:key1)).to be_a(BSON::Document)
+        end
+
+        it "returns the partial document" do
+          expect(document.slice(:key1)).to contain_exactly(['key1', 'value1'])
+        end
+      end
+
+      context "when provided keys that do not exist in the document" do
+
+        it "returns only the keys that exist in the document" do
+          expect(document.slice(:key1, :key3)).to contain_exactly(['key1', 'value1'])
+        end
+      end
+    end
+  end
+
+  describe "#except" do
+    let(:document) do
+      described_class.new("key1" => "value1", key2: "value2")
+    end
+
+    context "when provided string keys" do
+
+      it "returns the partial document" do
+        expect(document.except("key1")).to contain_exactly(['key2', 'value2'])
+      end
+    end
+
+    context "when provided symbol keys" do
+
+      it "returns the partial document" do
+        expect(document.except(:key1)).to contain_exactly(['key2', 'value2'])
+      end
+    end
+  end
+
+
   describe "#delete" do
 
     shared_examples_for "a document with deletable pairs" do
@@ -756,6 +925,24 @@ describe BSON::Document do
       end
     end
 
+    context "when the hash contains an array of hashes" do
+      let(:obj) do
+        described_class["key",[{"a" => 1}, {"b" => 2}]]
+      end
+
+      let(:bson) do
+        "#{45.to_bson}#{Array::BSON_TYPE}key#{BSON::NULL_BYTE}" +
+        "#{35.to_bson}"+
+        "#{BSON::Document::BSON_TYPE}0#{BSON::NULL_BYTE}#{12.to_bson}#{BSON::Int32::BSON_TYPE}a#{BSON::NULL_BYTE}#{1.to_bson}#{BSON::NULL_BYTE}" +
+        "#{BSON::Document::BSON_TYPE}1#{BSON::NULL_BYTE}#{12.to_bson}#{BSON::Int32::BSON_TYPE}b#{BSON::NULL_BYTE}#{2.to_bson}#{BSON::NULL_BYTE}" +
+        "#{BSON::NULL_BYTE}" +
+        "#{BSON::NULL_BYTE}"
+      end
+
+      it_behaves_like "a serializable bson element"
+      it_behaves_like "a deserializable bson element"
+    end
+
     context "when the hash is a single level" do
 
       let(:obj) do
@@ -867,51 +1054,31 @@ describe BSON::Document do
       it_behaves_like "a document able to handle utf-8"
     end
 
-    context "when utf-8 values exist in wrong encoding" do
+    context "given a utf-8-encodable string in another encoding" do
 
       let(:string) { "gültig" }
       let(:document) do
         described_class["type", string.encode("iso-8859-1")]
       end
 
-      it "raises an exception", unless: BSON::Environment.jruby? do
-        expect {
-          document.to_bson
-        }.to raise_error(ArgumentError)
-      end
-
-      it 'converts the values', if: BSON::Environment.jruby? do
-        expect(
-          BSON::Document.from_bson(BSON::ByteBuffer.new(document.to_bson.to_s))
-        ).to eq({ "type" => string })
-      end
-    end
-
-    context "when binary strings with utf-8 values exist", if: BSON::Environment.jruby? && (JRUBY_VERSION < '9') do
-
-      let(:string) { "europäisch" }
-      let(:document) do
-        described_class["type", string.encode("binary")]
-      end
-
-      it "encodes and decodes the document properly" do
+      it 'converts the values to utf-8' do
         expect(
           BSON::Document.from_bson(BSON::ByteBuffer.new(document.to_bson.to_s))
         ).to eq({ "type" => string })
       end
     end
 
-    context "when binary strings with utf-8 values exist", unless: BSON::Environment.jruby? do
+    context "given a binary string with utf-8 values" do
 
-      let(:string) { "europäisch" }
+      let(:string) { "europäisch".force_encoding('binary') }
       let(:document) do
-        described_class["type", string.encode("binary", "binary")]
+        described_class["type", string]
       end
 
-      it "encodes and decodes the document properly" do
-        expect(
-          BSON::Document.from_bson(BSON::ByteBuffer.new(document.to_bson.to_s))
-        ).to eq({ "type" => string })
+      it "raises encoding error" do
+        expect do
+          document.to_bson
+        end.to raise_error(Encoding::UndefinedConversionError, /from ASCII-8BIT to UTF-8/)
       end
     end
   end