bson 3.2.4-java → 3.2.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c56b5705464d23f23e17cb6075facfe3a0920507
-  data.tar.gz: 7026777dc603e8c421e7484f00a196580a0a5c34
+  metadata.gz: b54a207fcf892998eddef3722b31d1007cb2d2ed
+  data.tar.gz: b2f341d0bd70e96f9fde14f70fcb41aa13603c31
 SHA512:
-  metadata.gz: e14b929b5918634f7a0fc6f92776150715ae4514a7aa2ee063c1be773c7cf42b41840cd605d70a76255acb3baee828d5ec59215e3f5635c535167860adb7bc21
-  data.tar.gz: ac58c8d00dc791fdf507f058d409f82283eeab622af37cb30ef0c3eba680364cda0bb13c36a4cc5f4c47c18d554f3478d62b4235e859b53d263eedac568f7c6c
+  metadata.gz: 19645bb9a29de8bf44f8494a487c42aa8d5305ac37ef1ef5ce3cb9201c1b242a0c2c2bcf9e19872b7a0e49257c4dd46ef1f5968616cac1606296a6f5ce4deaf1
+  data.tar.gz: 5e402c6f0af5a8a9960cf757717ae1827b5ffe130eda593065d600e64217b822d7540ddcff683233102645cf954f318f997a5596bef18ea7aceaeb07d41988f7

checksums.yaml.gz.sig

@@ -1,2 +1 @@
-F�"x��Qmt���L
-�O��0ղ�sQ�ƶ��I�+X�G6&d�y��x�u tDj)�G�A��-��a�dO����T�%�/q��gC	��@�YP�â�������_"�@���ͳ嶑�%�٬�҆6F�^T��R�A{O~*&�owu���)�ˇ�L������VA�)x�?P?����K��q��l�I�{|�"պ��s������!�F'�*0���\�i��Y�7^V���_{7�!z�p�s�f�%A�
+��[�^��烍�����hLpU�q�D4����m!E‰F�ާ�)��d5�h%�?�Ҏ���4ʄ�%�p��hYFT4���Xɠ�V):�I��������������bI٤	ҥg�a[(3jۋӑ�v�%:�X�?!�q�cjo���O0�YJ�)?ݠ���U�P�*|�\��^2�s�X�d�>96�$U���O,�ǧ��?���]�AP�Wvnh۾��k���X-mIݱ�4��:Yj@�ky_�$�%e��

data/CHANGELOG.md

@@ -1,6 +1,20 @@
 BSON Changelog
 ==============
 
+## 3.2.6
+
+### Bug Fixes
+
+* [#44](https://github.com/mongodb/bson-ruby/pull/44) Fixed regexp deserialization in
+  conjunction with SSL io. (Niels Ganser)
+
+## 3.2.5
+
+### Bug Fixes
+
+* [RUBY-1024](https://jira.mongodb.org/browse/RUBY-1024) Fixed Hash#merge only to yield when keys
+  exist in both hashes. (Agis Anastasopoulos)
+
 ## 3.2.4
 
 ### Bug Fixes

data/Rakefile

@@ -47,11 +47,7 @@ def extension
   RUBY_PLATFORM =~ /darwin/ ? "bundle" : "so"
 end
 
-if RUBY_VERSION < "1.9"
-  require "perf/bench"
-else
-  require_relative "perf/bench"
-end
+require_relative "perf/bench" unless jruby?
 
 RSpec::Core::RakeTask.new(:spec)
 RSpec::Core::RakeTask.new(:rspec)
@@ -114,6 +110,12 @@ namespace :benchmark do
     require "bson"
     benchmark!
   end
+
+  task :profile => :compile do
+    puts "Profiling with native extensions..."
+    require "bson"
+    profile!
+  end
 end
 
 task :default => [ :clean_all, :spec, :ext_spec ]

data/lib/bson/document.rb

@@ -110,7 +110,7 @@ module BSON
     # @since 3.0.0
     def merge!(other)
       other.each_pair do |key, value|
-        value = yield(convert_key(key), self[key], convert_value(value)) if block_given?
+        value = yield(convert_key(key), self[key], convert_value(value)) if block_given? && self[key]
         self[key] = value
       end
       self

data/lib/bson/regexp.rb

@@ -28,6 +28,31 @@ module BSON
     # @since 2.0.0
     BSON_TYPE = 11.chr.force_encoding(BINARY).freeze
 
+    # Extended value constant.
+    #
+    # @since 3.2.6
+    EXTENDED_VALUE = 'x'.freeze
+
+    # Ignore case constant.
+    #
+    # @since 3.2.6
+    IGNORECASE_VALUE = 'i'.freeze
+
+    # Multiline constant.
+    #
+    # @since 3.2.6
+    MULTILINE_VALUE = 'm'.freeze
+
+    # Newline constant.
+    #
+    # @since 3.2.6
+    NEWLINE_VALUE = 's'.freeze
+
+    # Ruby multiline constant.
+    #
+    # @since 3.2.6
+    RUBY_MULTILINE_VALUE = 'ms'.freeze
+
     # Get the regexp as JSON hash data.
     #
     # @example Get the regexp as a JSON hash.
@@ -71,15 +96,15 @@ module BSON
     end
 
     def bson_extended
-      (options & ::Regexp::EXTENDED != 0) ? "x" : NO_VALUE
+      (options & ::Regexp::EXTENDED != 0) ? EXTENDED_VALUE : NO_VALUE
     end
 
     def bson_ignorecase
-      (options & ::Regexp::IGNORECASE != 0) ? "i" : NO_VALUE
+      (options & ::Regexp::IGNORECASE != 0) ? IGNORECASE_VALUE : NO_VALUE
     end
 
     def bson_multiline
-      (options & ::Regexp::MULTILINE != 0) ? "ms" : NO_VALUE
+      (options & ::Regexp::MULTILINE != 0) ? RUBY_MULTILINE_VALUE : NO_VALUE
     end
 
     # Represents the raw values for the regular expression.
@@ -153,13 +178,13 @@ module BSON
       def from_bson(bson)
         pattern = bson.gets(NULL_BYTE).from_bson_string.chop!
         options = 0
-        while (option = bson.readbyte) != 0
+        while (option = bson.readbyte.chr) != NULL_BYTE
           case option
-          when 105 # 'i'
+          when IGNORECASE_VALUE
             options |= ::Regexp::IGNORECASE
-          when 109, 115 # 'm', 's'
+          when MULTILINE_VALUE, NEWLINE_VALUE
             options |= ::Regexp::MULTILINE
-          when 120 # 'x'
+          when EXTENDED_VALUE
             options |= ::Regexp::EXTENDED
           end
         end

data/lib/bson/version.rb

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

data/spec/bson/document_spec.rb

@@ -439,7 +439,7 @@ describe BSON::Document do
       it "executes the block on each merged element" do
         expect(merged[:a]).to eq(0)
         expect(merged[:b]).to eq(3)
-        expect(merged[:c]).to eq(8)
+        expect(merged[:c]).to eq(7)
       end
     end
   end
@@ -488,7 +488,17 @@ describe BSON::Document do
       it "executes the block on each merged element" do
         expect(other[:a]).to eq(0)
         expect(other[:b]).to eq(3)
-        expect(other[:c]).to eq(8)
+        expect(other[:c]).to eq(7)
+      end
+    end
+
+    context "and the documents have no common keys" do
+      before { other[:a] = 1 }
+
+      it "does not execute the block" do
+        expect(other.merge(b: 1) { |key, old, new| old + new }).to eq(
+          BSON::Document.new(a: 1, b: 1)
+        )
       end
     end
   end

metadata

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

metadata.gz.sig

@@ -1,4 +1,2 @@
-[j��F�k��ع"�݋��5�o�a�
x�XQ��0���0�h�6wIF!8�J�:O?2�v
-�ά�������sg�`�e9�}D|$��,���V1Od����L&i<�y&���ʠ��i����4�	@Ú#;UP����ɧ#�S�����(��
-J:�`I�5��J����w����4�_R��VЂWJG�)���)M:-�Nğ�%��A��W�*�FF�"Do
-EkW͓���W���!I~��T��w��s�/쯼
+��0$)w<�w���p�`,��'[\�Y�٣���n�Dg�`�@�?�F�!����1Y=�
+sR�������E�/��oyS�{�Á-��Y���}��y�ˡ��]�P��ߴ��M7��LyŊd�7c���