bson 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47d29b1cc3748faca5e80d2fd891f3afef42a63f
-  data.tar.gz: c9cc5e18df9aa9bb2dc5ed6e007648adf05ac845
+  metadata.gz: 31e82028a4dbdd0ee59ad09a19bc8d1dac7c3fcd
+  data.tar.gz: 9773de56e955e3b0545804de618692bcd9bd74b7
 SHA512:
-  metadata.gz: 433674c25e326d02c357f2b2fad8861c63ee4d3de379bd6310ea0da84c208c433d3fe8f5366a97bf6c731ab174b27d17ace2fde7046f248bcf301182059ebf3c
-  data.tar.gz: 05a96d4fd7446788c97a8d2cb0254432e46d6d66c7e32d9e17ba345fdb1c6f18dbe088cb76920bfa8446436ea66d4b1d106ee27e29084ec5887b39c6e1029214
+  metadata.gz: 8fb4637938de67b08963c79e02aef0e32050e27229c17cd09bb1d0c69072f528f861fdd0759b46ec9ed70353ebcc6f55e32530b30e8cba5f76445338ab8f0903
+  data.tar.gz: cdac6674f943e86cfe45e5742a9a361a3cc83ba5222ca82c5bf4b5ac50c7a43f8e70aa2804c63d233c6c2c2461627f116c63aee9c6c37e7a26ce9c67dcccf282

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: ruby
 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:
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: bson
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby Implementation of the BSON specification