bson 3.2.4 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dc5021cec13fb522184eff22fbc21da999e4e00
-  data.tar.gz: 1af593ca4fa28815a0c73fa9caed09a8e77ac898
+  metadata.gz: 2f5fedb8e90899170ca4e67704d80a6b63f10303
+  data.tar.gz: 20eef028f83b52a330aa392b41ef189f3822c12b
 SHA512:
-  metadata.gz: 98b53c5f9e1b5528507698be9cd6119d61a454be7400dbae4e1289944bb46d6d6732c6caf4c3adb14655ebd8a872da66841019b276865070e80a596b5ccb56e8
-  data.tar.gz: 080fde6e480edee7b400e2cfcad9a5363a33c4c75df0aff7e8883427cd8a32d2bb7cfa4e08ff3314bf2b2f01607a6f03bef8c284d1bd5325007d16c5075313ce
+  metadata.gz: fd23def4d8d0efe7279aeb96b0ca02f565c36fc974b53362887033a4b4b3d54a08499d5c78d8914f0bbe3845c511ab4f95a09e98092e33c1f1548073e88cd414
+  data.tar.gz: 98a8be8ca884939c734f388f412fdd236ce10c4470697ac289fab7acc777d61126b5f25ae144f320a18ecef697da92b25ebfb50cfaadc797eaabc6064bd468f7

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/ext/bson/native.c

@@ -635,6 +635,28 @@ static VALUE rb_true_class_to_bson(int argc, VALUE *argv, VALUE self)
   return encoded;
 }
 
+/**
+ * Decode a string from bson.
+ *
+ * @example Decode a string.
+ *  rb_bson_string_from_bson(string, io);
+ *
+ * @param [ String ] self The string class.
+ * @param [ IO ] bson The io stream of BSON.
+ *
+ * @return [ String ] The decoded string.
+ *
+ * @since 3.2.5
+ */
+static VALUE rb_bson_string_from_bson(VALUE self, VALUE bson)
+{
+  ID read_method = rb_intern("read");
+  VALUE int_bytes = rb_funcall(bson, read_method, 1, 4);
+  VALUE size = rb_integer_from_bson_int32(self, int_bytes);
+  VALUE string_bytes = rb_funcall(bson, read_method, 1, size - 1);
+  return rb_bson_from_bson_string(string_bytes);
+}
+
 /**
  * Initialize the bson c extension.
  *
@@ -656,6 +678,7 @@ void Init_native()
   VALUE object_id = rb_const_get(bson, rb_intern("ObjectId"));
   VALUE generator = rb_const_get(object_id, rb_intern("Generator"));
   VALUE string = rb_const_get(bson, rb_intern("String"));
+  VALUE string_class = rb_singleton_class(string);
   VALUE true_class = rb_const_get(bson, rb_intern("TrueClass"));
   VALUE false_class = rb_const_get(bson, rb_intern("FalseClass"));
   // needed to hash the machine id
@@ -711,6 +734,8 @@ void Init_native()
   rb_define_method(string, "set_int32", rb_string_set_int32, 2);
   rb_undef_method(string, "from_bson_string");
   rb_define_method(string, "from_bson_string", rb_bson_from_bson_string, 0);
+  rb_undef_method(string_class, "from_bson");
+  rb_define_method(string_class, "from_bson", rb_bson_string_from_bson, 1);
   rb_undef_method(string, "check_for_illegal_characters!");
   rb_define_private_method(string, "check_for_illegal_characters!", rb_string_check_for_illegal_characters, 0);
 

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: ruby
 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: