bson 3.1.0-java → 3.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c4d3274a71610f319ef7e1b0cb48e1cdfaef262
-  data.tar.gz: 9bb3b68125bdc55caa633e202ec43c510e020955
+  metadata.gz: a4582887945e5c40e4bc5208f20c7f5fd8a68aed
+  data.tar.gz: 318fdcb621f419e89793067ea91e80f5a3b9002e
 SHA512:
-  metadata.gz: 9b099548252a4939b3449aa38f28063c25df21e3ffa9aab273d4e24e22dbbaec0790863eff78e59fab4b62d96f7e82e99afef7fb6c68f9b8e0617d99ed8f8ab1
-  data.tar.gz: 55d34df5d46136ffea946cd6fae2518db7ecdbc9517fad6daa77461d6e7ad28bf43a117ffc810e3840f53c9300517a3e22e94871b8ce48fd6512286805446c81
+  metadata.gz: 901c1929736f122089bef49179bd32f4a3da19ee815c83275b290c01a9defa7aaa20d6f24dcb2ebedc7c174cdc701f458af39d9d764b9262bdb392963f300357
+  data.tar.gz: 4520cc3824ad2a5d130ba0f484e9cd93f8195aba1aedbef35c4474e4d4bcc7cad8075beaee9b377d890b223836f2f6e5de9e1fc1cb827e2f2bb1713d68344a79

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 BSON Changelog
 ==============
 
+## 3.1.1
+
+### Bug Fixes
+
+* Fixed argument errors when delegating to regex objects. (Tom Scott)
+
 ## 3.1.0
 
 ### New Features

data/lib/bson/document.rb

@@ -50,7 +50,7 @@ module BSON
     #
     # @since 2.0.0
     def [](key)
-      super(key.to_bson_normalized_key)
+      super(convert_key(key))
     end
 
     # Set a value on the document. Will normalize symbol keys into strings.
@@ -65,7 +65,7 @@ module BSON
     #
     # @since 3.0.0
     def []=(key, value)
-      super(key.to_bson_normalized_key, value.to_bson_normalized_value)
+      super(convert_key(key), convert_value(value))
     end
 
     # Instantiate a new Document. Valid parameters for instantiation is a hash
@@ -110,12 +110,22 @@ module BSON
     # @since 3.0.0
     def merge!(other)
       other.each_pair do |key, value|
-        value = yield(key.to_bson_normalized_key, self[key], value.to_bson_normalized_value) if block_given?
+        value = yield(convert_key(key), self[key], convert_value(value)) if block_given?
         self[key] = value
       end
       self
     end
 
     alias :update :merge!
+
+    private
+
+    def convert_key(key)
+      key.to_bson_normalized_key
+    end
+
+    def convert_value(value)
+      value.to_bson_normalized_value
+    end
   end
 end

data/lib/bson/regexp.rb

@@ -135,7 +135,7 @@ module BSON
 
       def method_missing(method, *arguments)
         return super unless respond_to?(method)
-        compile.send(method)
+        compile.send(method, *arguments)
       end
     end
 

data/lib/bson/version.rb

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

data/spec/bson/regexp_spec.rb

@@ -40,8 +40,12 @@ describe Regexp do
       StringIO.new(bson)
     end
 
+    let(:regex) do
+      described_class.from_bson(io)
+    end
+
     let(:result) do
-      described_class.from_bson(io).compile
+      regex.compile
     end
 
     it_behaves_like "a bson element"
@@ -58,7 +62,7 @@ describe Regexp do
       it_behaves_like "a serializable bson element"
 
       it "runs the method on the Regexp object" do
-        expect(result.match('6')).not_to be_nil
+        expect(regex.match('6')).not_to be_nil
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bson
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: java
 authors:
 - Tyler Brock
@@ -34,7 +34,7 @@ cert_chain:
   XZOS48LlWh15EG4yZo/gRzqNAW2LUIkYA5eMS2Kp6r+KV8IBUO/LaHdrXbdilpa8
   BRsuCo7UZDbFVRns04HLyjVvkj+K/ywIcdKdS0csz5M=
   -----END CERTIFICATE-----
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies: []
 description: A full featured BSON specification implementation, in Ruby
 email: