bson 4.3.0 → 4.4.1

data/lib/bson/environment.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/false_class.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/float.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/hash.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/int32.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 
 module BSON
 
-  # Represents a $maxKey type, which compares less than any other value in the
-  # specification.
+  # Represents int32 type.
   #
   # @see http://bsonspec.org/#/specification
   #
@@ -87,9 +86,23 @@ module BSON
     #
     # @since 4.2.0
     def to_bson_key(validating_keys = Config.validating_keys?)
-      @integer.to_bson_key(validating_keys)
+      @integer
     end
 
+    # Check equality of the int32 with another object.
+    #
+    # @param [ Object ] other The object to check against.
+    #
+    # @return [ true, false ] If the objects are equal.
+    #
+    # @since 4.4.0
+    def ==(other)
+      return false unless other.is_a?(Int32)
+      @integer == other.instance_variable_get('@integer')
+    end
+    alias :eql? :==
+    alias :=== :==
+
     private
 
     def out_of_range!

data/lib/bson/int64.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 
 module BSON
 
-  # Represents a $maxKey type, which compares less than any other value in the
-  # specification.
+  # Represents int64 type.
   #
   # @see http://bsonspec.org/#/specification
   #
@@ -82,9 +81,23 @@ module BSON
     #
     # @since 4.2.0
     def to_bson_key(validating_keys = Config.validating_keys?)
-      @integer.to_bson_key(validating_keys)
+      @integer
     end
 
+    # Check equality of the int64 with another object.
+    #
+    # @param [ Object ] other The object to check against.
+    #
+    # @return [ true, false ] If the objects are equal.
+    #
+    # @since 4.4.0
+    def ==(other)
+      return false unless other.is_a?(Int64)
+      @integer == other.instance_variable_get('@integer')
+    end
+    alias :eql? :==
+    alias :=== :==
+
     private
 
     def out_of_range!

data/lib/bson/integer.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -156,7 +156,7 @@ module BSON
     #
     # @since 2.0.0
     def to_bson_key(validating_keys = Config.validating_keys?)
-      to_s.to_bson_key(validating_keys)
+      self
     end
 
     private

data/lib/bson/json.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/max_key.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/min_key.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/nil_class.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/object.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/object_id.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/open_struct.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016 MongoDB Inc.
+# Copyright (C) 2016-2019 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/lib/bson/regexp.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2016 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/registry.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/specialized.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/string.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/symbol.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ module BSON
     #
     # @since 2.0.0
     def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
-      to_s.to_bson(buffer)
+      buffer.put_symbol(self)
     end
 
     # Get the symbol as a BSON key name encoded C symbol.
@@ -71,7 +71,10 @@ module BSON
     #
     # @since 2.0.0
     def to_bson_key(validating_keys = Config.validating_keys?)
-      to_s.to_bson_key(validating_keys)
+      if validating_keys
+        raise BSON::String::IllegalKey.new(self) if BSON::String::ILLEGAL_KEY =~ self
+      end
+      self
     end
 
     # Converts the symbol to a normalized key in a BSON document.

data/lib/bson/time.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/time_with_zone.rb

@@ -0,0 +1,54 @@
+# Copyright (C) 2018-2019 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 "active_support/time_with_zone"
+
+module BSON
+
+  # Injects behaviour for encoding ActiveSupport::TimeWithZone values to
+  # raw bytes as specified by the BSON spec for time.
+  #
+  # @see http://bsonspec.org/#/specification
+  #
+  # @since 4.4.0
+  module TimeWithZone
+
+    # Get the ActiveSupport::TimeWithZone as encoded BSON.
+    #
+    # @example Get the ActiveSupport::TimeWithZone as encoded BSON.
+    #   Time.utc(2012, 12, 12, 0, 0, 0).in_time_zone("Pacific Time (US & Canada)").to_bson
+    #
+    # @return [ BSON::ByteBuffer ] The buffer with the encoded object.
+    #
+    # @see http://bsonspec.org/#/specification
+    #
+    # @since 4.4.0
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
+      buffer.put_int64((to_i * 1000) + (usec / 1000))
+    end
+
+    # Get the BSON type for the ActiveSupport::TimeWithZone.
+    #
+    # As the ActiveSupport::TimeWithZone is converted to a time, this returns
+    # the BSON type for time.
+    def bson_type
+      ::Time::BSON_TYPE
+    end
+  end
+
+  # Enrich the ActiveSupport::TimeWithZone class with this module.
+  #
+  # @since 4.4.0
+  ActiveSupport::TimeWithZone.send(:include, TimeWithZone)
+end

data/lib/bson/timestamp.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/true_class.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/undefined.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/lib/bson/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2016 MongoDB Inc.
+# Copyright (C) 2009-2019 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module BSON
-  VERSION = "4.3.0".freeze
+  VERSION = "4.4.1".freeze
 end

data/spec/bson/array_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/binary_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/boolean_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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/byte_buffer_spec.rb

@@ -196,6 +196,18 @@ describe BSON::ByteBuffer do
     it 'increments the write position by 1' do
       expect(modified.write_position).to eq(1)
     end
+
+    context 'when it receives a numeric value' do
+      it 'raises the ArgumentError exception' do
+        expect{buffer.put_byte(1)}.to raise_error(ArgumentError)
+      end
+    end
+
+    context 'when it receives a nil value' do
+      it 'raises the ArgumentError exception' do
+        expect{buffer.put_byte(nil)}.to raise_error(ArgumentError)
+      end
+    end
   end
 
   describe '#put_cstring' do
@@ -501,4 +513,32 @@ describe BSON::ByteBuffer do
       it_behaves_like 'a rewindable buffer'
     end
   end
+
+  describe '#put_bytes' do
+
+    let(:buffer) do
+      described_class.new
+    end
+
+    let!(:modified) do
+      buffer.put_bytes(BSON::Int32::BSON_TYPE)
+      buffer
+    end
+
+    it 'increments the write position by 1' do
+      expect(modified.write_position).to eq(1)
+    end
+
+    context 'when it receives a numeric value' do
+      it 'raises the ArgumentError exception' do
+        expect{buffer.put_bytes(1)}.to raise_error(ArgumentError)
+      end
+    end
+    
+    context 'when it receives a nil value' do
+      it 'raises the ArgumentError exception' do
+        expect{buffer.put_bytes(nil)}.to raise_error(ArgumentError)
+      end
+    end
+  end
 end

data/spec/bson/code_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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-2019 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-2019 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-2019 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/decimal128_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016 MongoDB Inc.
+# Copyright (C) 2016-2019 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/document_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright (C) 2009-2014 MongoDB Inc.
+# Copyright (C) 2009-2019 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,36 @@ 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
+    end
+  end
+
   describe "#[]" do
 
     let(:document) do
@@ -68,6 +98,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
@@ -118,6 +155,28 @@ describe BSON::Document do
     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 "returns the partial document" do
+          expect(document.slice("key1")).to contain_exactly(['key1', 'value1'])
+        end
+      end
+
+      context "when provided symbol keys" do
+
+        it "returns the partial document" do
+          expect(document.slice(:key1)).to contain_exactly(['key1', 'value1'])
+        end
+      end
+    end
+  end
+
   describe "#delete" do
 
     shared_examples_for "a document with deletable pairs" do