bson 4.0.0.beta-java → 4.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6111b7a5d3785b63d89444ddd5cf6e686a8a17da
-  data.tar.gz: ecbe32290134736b498ba719d60aaa23059039ae
+  metadata.gz: 3a437de13d570ec32baf67a6ab3219e57c339aa9
+  data.tar.gz: 953b083f6212afb23efbc2191d5d39001b989422
 SHA512:
-  metadata.gz: e4c1f290674d55904de628351da900aa2ea94e1da17152409a7fa37fef0b9b8d79144397a19475bb9cc5f274253e707932fec49e033d731ca7aa5e6fa50d4ee9
-  data.tar.gz: d0a6549648f3c5b376dd68826c8d87ebabc1001b9ab49bb1498f20cf616299eb7270f067ce4fcf6540dd5be7542c08ed479bc552d6b2734e8091ef1f3e0b3624
+  metadata.gz: 83a525d241bdc949077c03f258e420ac58c2a78319400359c8464e3571b21380446abad9b1811b04925817d29fe74d8c28907d7c975af01c07641f639beb7b37
+  data.tar.gz: c0b3be2540d637ded982aab96e6a0b7839a85159db4c5c13d8eeb5df9fc58f97061889d0540b8bc60e66977144535121a569f8a2d54a946e8b9eda008006b485

data/lib/bson/binary.rb

@@ -132,7 +132,7 @@ module BSON
     def to_bson(buffer = ByteBuffer.new)
       position = buffer.length
       buffer.put_int32(0)
-      buffer.put_byte(SUBTYPES.fetch(type))
+      buffer.put_byte(SUBTYPES[type])
       buffer.put_int32(data.bytesize) if type == :old
       buffer.put_bytes(data.force_encoding(BINARY))
       buffer.replace_int32(position, buffer.length - position - 5)

data/lib/bson/document.rb

@@ -74,9 +74,11 @@ module BSON
     # @example Test if a key exists using a symbol
     #   document.has_key?(:test)
     #
+    # @param [ Object ] key The key to check for.
+    #
     # @return [ true, false]
     #
-    # @since 3.2.7
+    # @since 4.0.0
     def has_key?(key)
       super(convert_key(key))
     end
@@ -85,22 +87,41 @@ module BSON
     alias :key?     :has_key?
     alias :member?  :has_key?
 
-
     # Returns true if the given value is present in the document.  Will normalize
     # symbols into strings.
     #
     # @example Test if a key exists using a symbol
     #   document.has_value?(:test)
     #
+    # @param [ Object ] value THe value to check for.
+    #
     # @return [ true, false]
     #
-    # @since 3.2.7
+    # @since 4.0.0
     def has_value?(value)
       super(convert_value(value))
     end
 
     alias :value :has_value?
 
+    # Deletes the key-value pair and returns the value from the document
+    # whose key is equal to key.
+    # If the key is not found, returns the default value. If the optional code
+    # block is given and the key is not found, pass in the key and return the
+    # result of block.
+    #
+    # @example Delete a key-value pair
+    #   document.delete(:test)
+    #
+    # @param [ Object ] key The key of the key-value pair to delete.
+    #
+    # @return [ Object ]
+    #
+    # @since 4.0.0
+    def delete(key, &block)
+      super(convert_key(key), &block)
+    end
+
     # Instantiate a new Document. Valid parameters for instantiation is a hash
     # only or nothing.
     #

data/lib/bson/hash.rb

@@ -74,7 +74,7 @@ module BSON
       # @since 2.0.0
       def from_bson(buffer)
         hash = Document.allocate
-        buffer.get_int32 # Throw away the size - todo: just move read position?
+        buffer.get_int32 # Throw away the size.
         while (type = buffer.get_byte) != NULL_BYTE
           field = buffer.get_cstring
           hash.store(field, BSON::Registry.get(type).from_bson(buffer))

data/lib/bson/integer.rb

@@ -145,8 +145,8 @@ module BSON
       encoded << ((self >> 56) & 255)
     end
 
-    def to_bson_key(buffer = ByteBuffer.new)
-      buffer.put_cstring(to_s)
+    def to_bson_key
+      to_s
     end
 
     private
@@ -161,7 +161,6 @@ module BSON
     def out_of_range!
       raise RangeError.new("#{self} is not a valid 8 byte integer value.")
     end
-
   end
 
   # Enrich the core Integer class with this module.

data/lib/bson/registry.rb

@@ -40,7 +40,7 @@ module BSON
     #
     # @since 2.0.0
     def get(byte)
-      MAPPINGS.fetch(byte)
+      MAPPINGS[byte]
     end
 
     # Register the Ruby type for the corresponding single byte.

data/lib/bson/symbol.rb

@@ -30,6 +30,22 @@ module BSON
     # @since 2.0.0
     BSON_TYPE = 14.chr.force_encoding(BINARY).freeze
 
+    # Symbols are serialized as strings as symbols are now removed from the
+    # BSON specification. Therefore the bson_type when serializing must be a
+    # string.
+    #
+    # @example Get the BSON type for the symbol.
+    #   :test.bson_type
+    #
+    # @return [ String ] The single byte BSON type.
+    #
+    # @see http://bsonspec.org/#/specification
+    #
+    # @since 4.0.0
+    def bson_type
+      String::BSON_TYPE
+    end
+
     # Get the symbol as encoded BSON.
     #
     # @example Get the symbol as encoded BSON.
@@ -89,7 +105,7 @@ module BSON
     # Register this type when the module is loaded.
     #
     # @since 2.0.0
-    Registry.register(BSON_TYPE, ::Symbol)
+    Registry::MAPPINGS.store(BSON_TYPE, ::Symbol)
   end
 
   # Enrich the core Symbol class with this module.

data/lib/bson/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module BSON
-  VERSION = "4.0.0.beta"
+  VERSION = "4.0.0"
 end

data/spec/bson/document_spec.rb

@@ -98,33 +98,61 @@ describe BSON::Document do
 
   describe "#delete" do
 
-    let(:key) { "white" }
-    let(:val) { "ffffff" }
-    let(:bad_key) { "black" }
+    shared_examples_for "a document with deletable pairs" do
 
-    before do
-      doc[key] = val
-    end
+      let!(:deleted) { doc.delete(key) }
+
+      it "returns the deleted value" do
+        expect(deleted).to eq(val)
+      end
 
-    let!(:deleted) { doc.delete(key) }
+      it "removes the key from the list" do
+        expect(doc.keys.length).to eq(keys.length)
+      end
 
-    it "returns the deleted value" do
-      expect(deleted).to eq(val)
-    end
+      it "matches the keys length to the document length" do
+        expect(doc.length).to eq(doc.keys.length)
+      end
 
-    it "removes the key from the list" do
-      expect(doc.keys.length).to eq(keys.length)
+      context "when removing a bad key" do
+
+        it "returns nil" do
+          expect(doc.delete(bad_key)).to be_nil
+        end
+
+        context "when a block is provided" do
+
+          it "returns the result of the block" do
+            expect(doc.delete(bad_key) { |k| "golden key" }).to eq("golden key")
+          end
+        end
+      end
     end
 
-    it "matches the keys length to the document length" do
-      expect(doc.length).to eq(doc.keys.length)
+    context "when keys are strings" do
+
+      let(:key) { "white" }
+      let(:val) { "ffffff" }
+      let(:bad_key) { "black" }
+
+      before do
+        doc[key] = val
+      end
+
+      it_behaves_like "a document with deletable pairs"
     end
 
-    context "when removind a bad key" do
+    context "when keys are symbols" do
+
+      let(:key) { :white }
+      let(:val) { "ffffff" }
+      let(:bad_key) { :black }
 
-      it "returns nil" do
-        expect(doc.delete(bad_key)).to be_nil
+      before do
+        doc[key] = val
       end
+
+      it_behaves_like "a document with deletable pairs"
     end
   end
 
@@ -812,15 +840,6 @@ describe BSON::Document do
       end
     end
 
-    context "when the symbols are utf-8" do
-
-      let(:document) do
-        described_class["type", "gültig".to_sym]
-      end
-
-      it_behaves_like "a document able to handle utf-8"
-    end
-
     context "when utf-8 string values are in an array" do
 
       let(:document) do
@@ -868,7 +887,7 @@ describe BSON::Document do
       end
     end
 
-    context "when binary strings with utf-8 values exist", if: BSON::Environment.jruby? && !(ENV['RUBY_VERSION'] =~ /jruby-9/) do
+    context "when binary strings with utf-8 values exist", if: BSON::Environment.jruby? && (JRUBY_VERSION !~ /9.0/) do
 
       let(:string) { "europäisch" }
       let(:document) do

data/spec/bson/hash_spec.rb

@@ -37,6 +37,21 @@ describe Hash do
       it_behaves_like "a deserializable bson element"
     end
 
+    context "when the hash has non-string keys" do
+
+      let(:obj) do
+        { 1 => "value" }
+      end
+
+      let(:expected) do
+        { "1" => "value" }
+      end
+
+      it "properly converts to bson" do
+        expect(BSON::Document.from_bson(BSON::ByteBuffer.new(obj.to_bson.to_s))).to eq(expected)
+      end
+    end
+
     context "when the hash is embedded" do
 
       let(:obj) do

data/spec/bson/integer_spec.rb

@@ -62,10 +62,10 @@ describe Integer do
   describe "#to_bson_key" do
 
     let(:obj)  { Integer::MAX_32BIT - 1 }
-    let(:encoded) { obj.to_s + BSON::NULL_BYTE }
+    let(:encoded) { obj.to_s }
 
-    it "returns the encoded string" do
-      expect(obj.to_bson_key.to_s).to eq(encoded)
+    it "returns the key as a string" do
+      expect(obj.to_bson_key).to eq(encoded)
     end
   end
 end

data/spec/bson/registry_spec.rb

@@ -35,10 +35,8 @@ describe BSON::Registry do
 
     context "when the type has no corresponding class" do
 
-      it "raises an error" do
-        expect {
-          described_class.get("test")
-        }.to raise_error(KeyError)
+      it "returns nil" do
+        expect(described_class.get("test")).to be_nil
       end
     end
   end

data/spec/bson/symbol_spec.rb

@@ -16,16 +16,22 @@ require "spec_helper"
 
 describe Symbol do
 
+  describe "#bson_type" do
+
+    it "returns the type for a string" do
+      expect(:type.bson_type).to eq("type".bson_type)
+    end
+  end
+
   describe "#to_bson/#from_bson" do
 
-    let(:type) { 14.chr }
+    let(:type) { 2.chr }
     let(:obj)  { :test }
     let(:bson) { "#{5.to_bson.to_s}test#{BSON::NULL_BYTE}" }
 
     it_behaves_like "a bson element"
     it_behaves_like "a serializable bson element"
     it_behaves_like "a deserializable bson element"
-
   end
 
   describe "#to_bson_key" do

data/spec/spec_helper.rb

@@ -15,15 +15,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
-if ENV["CI"] && !ENV["WITH_EXT"]
-  require "simplecov"
-  require "coveralls"
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-  SimpleCov.start do
-    add_filter "spec"
-  end
-end
-
 require "bson"
 require "json"
 require "rspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bson
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta
+  version: 4.0.0
 platform: java
 authors:
 - Tyler Brock
@@ -34,7 +34,7 @@ cert_chain:
   XZOS48LlWh15EG4yZo/gRzqNAW2LUIkYA5eMS2Kp6r+KV8IBUO/LaHdrXbdilpa8
   BRsuCo7UZDbFVRns04HLyjVvkj+K/ywIcdKdS0csz5M=
   -----END CERTIFICATE-----
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies: []
 description: A full featured BSON specification implementation, in Ruby
 email:
@@ -82,6 +82,7 @@ files:
 - lib/bson/true_class.rb
 - lib/bson/undefined.rb
 - lib/bson/version.rb
+- lib/native.bundle
 - spec/bson/array_spec.rb
 - spec/bson/binary_spec.rb
 - spec/bson/boolean_spec.rb
@@ -124,17 +125,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: bson
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Ruby Implementation of the BSON specification