bson 4.1.0-java → 4.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cbded2c27d698be26bb72f36921c70e1e8193d2
-  data.tar.gz: 4173ded97b83024341bf8f8922acd60d70d12b6b
+  metadata.gz: 937c39adeba926daec9cda4e1a3f33ed95d409df
+  data.tar.gz: 16b8d33f71e2a25762fb10489115dad09ac16b02
 SHA512:
-  metadata.gz: 054ee98826bd504e44d6c1871e77deb4355f2eabf1907bc23762b95d50445bb64b72c943fa91dcf00e5e15652fdd36860569812f6e3d6446de52eb766bab6211
-  data.tar.gz: 6b4c01788ca478e953d2d127779f010a3d3cfc6ccb13803165d9525e83067f1102d90a69a4d39719d5fa8d016da7ae8c046bb9256753c6b9b3fb9b6aa0a92e80
+  metadata.gz: 6b4734870f5a0111a4129295f8e851cd65578d0b2b54aae09e15965a8b0408ec6e61f583c7b47798b10c2f3997c11b8db48fa8861a53f4db8499cbb121d047f2
+  data.tar.gz: 9f6f660b38963ce96184acaa73f6ac4906fb8b9df2318aa093004e56ed48132801c8c650996c232299ae16e78442a8a4ea6c890170bf429f317eb977e4eb6027

data/lib/bson/array.rb

@@ -40,13 +40,13 @@ module BSON
     # @see http://bsonspec.org/#/specification
     #
     # @since 2.0.0
-    def to_bson(buffer = ByteBuffer.new)
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
       position = buffer.length
       buffer.put_int32(0)
       each_with_index do |value, index|
         buffer.put_byte(value.bson_type)
         buffer.put_cstring(index.to_s)
-        value.to_bson(buffer)
+        value.to_bson(buffer, validating_keys)
       end
       buffer.put_byte(NULL_BYTE)
       buffer.replace_int32(position, buffer.length - position)

data/lib/bson/binary.rb

@@ -129,7 +129,7 @@ module BSON
     # @see http://bsonspec.org/#/specification
     #
     # @since 2.0.0
-    def to_bson(buffer = ByteBuffer.new)
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
       position = buffer.length
       buffer.put_int32(0)
       buffer.put_byte(SUBTYPES[type])

data/lib/bson/code.rb

@@ -81,7 +81,7 @@ module BSON
     # @see http://bsonspec.org/#/specification
     #
     # @since 2.0.0
-    def to_bson(buffer = ByteBuffer.new)
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
       buffer.put_string(javascript) # @todo: was formerly to_bson_string
     end
 

data/lib/bson/code_with_scope.rb

@@ -87,7 +87,7 @@ module BSON
     # @see http://bsonspec.org/#/specification
     #
     # @since 2.0.0
-    def to_bson(buffer = ByteBuffer.new)
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
       position = buffer.length
       buffer.put_int32(0)
       buffer.put_string(javascript)

data/lib/bson/date.rb

@@ -34,7 +34,7 @@ module BSON
     # @see http://bsonspec.org/#/specification
     #
     # @since 2.1.0
-    def to_bson(buffer = ByteBuffer.new)
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
       ::Time.utc(year, month, day).to_bson(buffer)
     end
 

data/lib/bson/date_time.rb

@@ -34,7 +34,7 @@ module BSON
     # @see http://bsonspec.org/#/specification
     #
     # @since 2.1.0
-    def to_bson(buffer = ByteBuffer.new)
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
       to_time.to_bson(buffer)
     end
   end

data/lib/bson/false_class.rb

@@ -49,7 +49,7 @@ module BSON
     # @see http://bsonspec.org/#/specification
     #
     # @since 2.0.0
-    def to_bson(buffer = ByteBuffer.new)
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
       buffer.put_byte(FALSE_BYTE)
     end
   end

data/lib/bson/float.rb

@@ -42,7 +42,7 @@ module BSON
     # @see http://bsonspec.org/#/specification
     #
     # @since 2.0.0
-    def to_bson(buffer = ByteBuffer.new)
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
       buffer.put_double(self)
     end
 

data/lib/bson/hash.rb

@@ -43,7 +43,7 @@ module BSON
       each do |field, value|
         buffer.put_byte(value.bson_type)
         buffer.put_cstring(field.to_bson_key(validating_keys))
-        value.to_bson(buffer)
+        value.to_bson(buffer, validating_keys)
       end
       buffer.put_byte(NULL_BYTE)
       buffer.replace_int32(position, buffer.length - position)

data/lib/bson/integer.rb

@@ -103,7 +103,7 @@ module BSON
     # @see http://bsonspec.org/#/specification
     #
     # @since 2.0.0
-    def to_bson(buffer = ByteBuffer.new)
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
       if bson_int32?
         buffer.put_int32(self)
       elsif bson_int64?

data/lib/bson/object_id.rb

@@ -168,7 +168,7 @@ module BSON
     # @see http://bsonspec.org/#/specification
     #
     # @since 2.0.0
-    def to_bson(buffer = ByteBuffer.new)
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
       buffer.put_bytes(generate_data)
     end
 

data/lib/bson/regexp.rb

@@ -84,7 +84,7 @@ module BSON
     # @see http://bsonspec.org/#/specification
     #
     # @since 2.0.0
-    def to_bson(buffer = ByteBuffer.new)
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
       buffer.put_cstring(source)
       buffer.put_cstring(bson_options)
     end

data/lib/bson/specialized.rb

@@ -45,7 +45,7 @@ module BSON
     # @return [ String ] An empty string.
     #
     # @since 2.0.0
-    def to_bson(buffer = ByteBuffer.new)
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
       buffer
     end
 

data/lib/bson/string.rb

@@ -45,7 +45,7 @@ module BSON
     # @see http://bsonspec.org/#/specification
     #
     # @since 2.0.0
-    def to_bson(buffer = ByteBuffer.new)
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
       buffer.put_string(self)
     end
 

data/lib/bson/symbol.rb

@@ -56,7 +56,7 @@ module BSON
     # @see http://bsonspec.org/#/specification
     #
     # @since 2.0.0
-    def to_bson(buffer = ByteBuffer.new)
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
       to_s.to_bson(buffer)
     end
 

data/lib/bson/time.rb

@@ -37,7 +37,7 @@ module BSON
     # @see http://bsonspec.org/#/specification
     #
     # @since 2.0.0
-    def to_bson(buffer = ByteBuffer.new)
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
       buffer.put_int64((to_i * 1000) + (usec / 1000))
     end
 

data/lib/bson/timestamp.rb

@@ -87,7 +87,7 @@ module BSON
     # @see http://bsonspec.org/#/specification
     #
     # @since 2.0.0
-    def to_bson(buffer = ByteBuffer.new)
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
       buffer.put_int32(increment)
       buffer.put_int32(seconds)
     end

data/lib/bson/true_class.rb

@@ -49,7 +49,7 @@ module BSON
     # @see http://bsonspec.org/#/specification
     #
     # @since 2.0.0
-    def to_bson(buffer = ByteBuffer.new)
+    def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
       buffer.put_byte(TRUE_BYTE)
     end
   end

data/lib/bson/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module BSON
-  VERSION = "4.1.0".freeze
+  VERSION = "4.1.1".freeze
 end

data/spec/bson/array_spec.rb

@@ -27,6 +27,111 @@ describe Array do
     it_behaves_like "a bson element"
     it_behaves_like "a serializable bson element"
     it_behaves_like "a deserializable bson element"
+
+    context "when the array has documents containing invalid 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
+        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
+
+          context "when serializing different types" do
+
+            let(:obj) do
+              [ BSON::Binary.new("testing", :generic),
+                BSON::Code.new("this.value = 5"),
+                BSON::CodeWithScope.new("this.value = val", "test"),
+                Date.new(2012, 1, 1),
+                Time.utc(2012, 1, 1),
+                DateTime.new(2012, 1, 1, 0, 0, 0),
+                false,
+                1.2332,
+                Integer::MAX_32BIT - 1,
+                BSON::ObjectId.new,
+                /\W+/i,
+                'a string',
+                :a_symbol,
+                Time.utc(2012, 1, 1, 0, 0, 0),
+                BSON::Timestamp.new(1, 10),
+                true,
+                { "$testing" => "value" }
+              ]
+            end
+
+            it "raises an error" do
+              expect {
+                obj.to_bson(BSON::ByteBuffer.new, true)
+              }.to raise_error(BSON::String::IllegalKey)
+            end
+          end
+        end
+      end
+
+      context "when not validating keys" do
+
+        let(:bson) do
+          BSON::Document["0", { "$testing" => "value" }].to_bson.to_s
+        end
+
+        it "serializes the hash" do
+          expect(obj.to_bson.to_s).to eq(bson)
+        end
+
+        context "when serializing different types" do
+
+          let(:obj) do
+            [ BSON::Binary.new("testing", :generic),
+              BSON::Code.new("this.value = 5"),
+              BSON::CodeWithScope.new("this.value = val", "test"),
+              Date.new(2012, 1, 1),
+              Time.utc(2012, 1, 1),
+              DateTime.new(2012, 1, 1, 0, 0, 0),
+              false,
+              1.2332,
+              Integer::MAX_32BIT - 1,
+              BSON::ObjectId.new,
+              /\W+/i,
+              'a string',
+              :a_symbol,
+              Time.utc(2012, 1, 1, 0, 0, 0),
+              BSON::Timestamp.new(1, 10),
+              true,
+              { "$testing" => "value" }
+            ]
+          end
+
+          it "serializes the hash" do
+            expect(obj.to_bson.length).to eq(251)
+          end
+        end
+      end
+    end
   end
 
   describe "#to_bson_normalized_value" do

data/spec/bson/hash_spec.rb

@@ -75,6 +75,19 @@ describe Hash do
               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
@@ -84,6 +97,19 @@ describe Hash do
               obj.to_bson(BSON::ByteBuffer.new, true)
             }.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(BSON::ByteBuffer.new, true)
+              }.to raise_error(BSON::String::IllegalKey)
+            end
+          end
         end
       end
 
@@ -97,6 +123,22 @@ describe Hash do
         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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bson
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: java
 authors:
 - Tyler Brock
@@ -34,7 +34,7 @@ cert_chain:
   yVPbgNJA2D/PnLe8ZFMhgJf+VIA1V4oybP/o+9aqlghTtNfYHJpRCAluUiaywwXl
   KzD4mmIBpxtbWrWB3hx7tsVJmWx5zgO9aDAfvWnXfoo=
   -----END CERTIFICATE-----
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies: []
 description: A full featured BSON specification implementation, in Ruby
 email:
@@ -126,17 +126,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