RUBY-2059 Depend on bson 4.4.2 for the benefit of driver 2.10 (#1617)

Co-authored-by: Oleg Pudeyev <p@users.noreply.github.com>

Author: p-mongo

.evergreen/config.yml

@@ -545,6 +545,7 @@ axes:
         display_name: "2.6"
         variables:
            VERSION: "2.6"
+  
   - id: fcv
     display_name: FCV
     values:
@@ -568,6 +569,7 @@ axes:
         display_name: Sharded
         variables:
            TOPOLOGY: "sharded_cluster"
+  
   - id: "auth-and-ssl"
     display_name: Authentication and SSL
     values:
@@ -591,6 +593,7 @@ axes:
         variables:
            AUTH: "noauth"
            SSL: "nossl"
+  
   - id: "ruby"
     display_name: Ruby Version
     values:
@@ -638,6 +641,7 @@ axes:
         display_name: jruby-9.2
         variables:
            RVM_RUBY: "jruby-9.2"
+  
   - id: "os"
     display_name: OS
     values:
@@ -652,48 +656,67 @@ axes:
       - id: rhel70
         display_name: "RHEL 7.0"
         run_on: rhel70-small
+  
   - id: "compressor"
     display_name: Compressor
     values:
       - id: "zlib"
         display_name: Zlib
         variables:
            COMPRESSOR: "zlib"
+  
   - id: retry-reads
     display_name: Retry Reads
     values:
       - id: no-retry-reads
         display_name: No Retry Reads
         variables:
           RETRY_READS: 'false'
+  
   - id: retry-writes
     display_name: Retry Writes
     values:
       - id: no-retry-writes
         display_name: No Retry Writes
         variables:
           RETRY_WRITES: 'false'
+  
   - id: lint
     display_name: Lint
     values:
       - id: on
         display_name: On
         variables:
           LINT: '1'
+  
   - id: "as"
     display_name: ActiveSupport
     values:
       - id: "as"
         display_name: AS
         variables:
           WITH_ACTIVE_SUPPORT: true
+  
+  - id: bson
+    display_name: BSON
+    values:
+      - id: min
+        display_name: min
+        variables:
+          BSON: min
+      - id: master
+        display_name: master
+        variables:
+          BSON: master
+  
   - id: "single-mongos"
     display_name: Single Mongos
     values:
       - id: "single-mongos"
         display_name: Single Mongos
         variables:
           SINGLE_MONGOS: 'true'
+  
   - id: storage-engine
     display_name: Storage Engine
     values:
@@ -903,6 +926,17 @@ buildvariants:
   tasks:
      - name: "test"
 
+- matrix_name: "bson"
+  matrix_spec:
+    ruby: ruby-2.6
+    mongodb-version: '4.2'
+    topology: replica-set
+    bson: "*"
+    os: rhel70
+  display_name: "AS ${mongodb-version} ${topology} ${ruby} ${bson}"
+  tasks:
+     - name: "test"
+
 -
   matrix_name: "3.6-with-3.4-fcv"
   matrix_spec:

.evergreen/functions.sh

@@ -58,7 +58,13 @@ set_env_vars() {
   fi
   export CI=evergreen
   # JRUBY_OPTS were initially set for Mongoid
-  export JRUBY_OPTS="--server -J-Xms512m -J-Xmx1G"
+  export JRUBY_OPTS="--server -J-Xms512m -J-Xmx2G"
+  
+  if test "$BSON" = min; then
+    export BUNDLE_GEMFILE=gemfiles/bson_min.gemfile
+  elif test "$BSON" = master; then
+    export BUNDLE_GEMFILE=gemfiles/bson_master.gemfile
+  fi
 }
 
 setup_ruby() {

Gemfile

@@ -1,63 +1,7 @@
 source 'https://rubygems.org'
 
 gemspec
-gem 'yard'
 
-group :development, :testing do
-  gem 'jruby-openssl', platforms: :jruby
-  gem 'json', platforms: :jruby
-  # Explicitly specify each rspec dependency so that we can use
-  # rspec-mocks-diag instead of rspec-mocks
-  #gem 'rspec', '~> 3.0'
-  gem 'rspec-core', '~> 3.0'
-  gem 'mime-types', '~> 1.25'
-  if RUBY_VERSION >= '2.3'
-    gem 'activesupport'
-  end
-  if RUBY_VERSION < '2.0.0'
-    gem 'rake', '~> 12.2.0'
-    gem 'httparty', '0.14.0'
-  else
-    gem 'rake'
-    gem 'httparty'
-  end
-  
-  if RUBY_VERSION >= '2.3'
-    gem 'byebug', platforms: :mri
-  elsif RUBY_VERSION >= '2.0'
-    gem 'byebug', '< 11', platforms: :mri
-  end
-  
-  # for benchmark tests
-  gem 'yajl-ruby', require: 'yajl', platforms: :mri
-  gem 'celluloid', platforms: :mri, require: false
-  if RUBY_VERSION < '2.2'
-    gem 'timers', '< 4.2'
-    gem 'hitimes', '1.3.0'
-  else
-    gem 'timers'
-  end
-end
+require_relative './gemfiles/standard'
 
-group :testing do
-  gem 'timecop'
-  gem 'ice_nine'
-  gem 'rspec-retry'
-  if RUBY_VERSION >= '2.3'
-    gem 'rspec-expectations', '~> 3.0'
-    gem 'rspec-mocks-diag', '~> 3.0'
-  end
-  gem 'rfc'
-  gem 'fuubar'
-  gem 'timeout-interrupt', platforms: :mri
-  
-  if RUBY_VERSION < '2.3'
-    gem 'ffi', '<1.11'
-  end
-end
-
-group :development do
-  gem 'ruby-prof', :platforms => :mri
-  gem 'pry-rescue'
-  gem 'pry-nav'
-end
+standard_dependencies

gemfiles/bson_master.gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+gemspec path: '..'
+
+gem 'bson', git: 'https://github.com/mongodb/bson-ruby'
+
+require_relative './standard'
+
+standard_dependencies

gemfiles/bson_min.gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+gemspec path: '..'
+
+gem 'bson', '4.4.2'
+
+require_relative './standard'
+
+standard_dependencies

gemfiles/standard.rb

@@ -0,0 +1,62 @@
+def standard_dependencies
+  gem 'yard'
+
+  group :development, :testing do
+    gem 'jruby-openssl', platforms: :jruby
+    gem 'json', platforms: :jruby
+    # Explicitly specify each rspec dependency so that we can use
+    # rspec-mocks-diag instead of rspec-mocks
+    #gem 'rspec', '~> 3.0'
+    gem 'rspec-core', '~> 3.0'
+    gem 'mime-types', '~> 1.25'
+    if RUBY_VERSION >= '2.3'
+      gem 'activesupport'
+    end
+    if RUBY_VERSION < '2.0.0'
+      gem 'rake', '~> 12.2.0'
+      gem 'httparty', '0.14.0'
+    else
+      gem 'rake'
+      gem 'httparty'
+    end
+
+    if RUBY_VERSION >= '2.3'
+      gem 'byebug', platforms: :mri
+    elsif RUBY_VERSION >= '2.0'
+      gem 'byebug', '< 11', platforms: :mri
+    end
+
+    # for benchmark tests
+    gem 'yajl-ruby', require: 'yajl', platforms: :mri
+    gem 'celluloid', platforms: :mri, require: false
+    if RUBY_VERSION < '2.2'
+      gem 'timers', '< 4.2'
+      gem 'hitimes', '1.3.0'
+    else
+      gem 'timers'
+    end
+  end
+
+  group :testing do
+    gem 'timecop'
+    gem 'ice_nine'
+    gem 'rspec-retry'
+    if RUBY_VERSION >= '2.3'
+      gem 'rspec-expectations', '~> 3.0'
+      gem 'rspec-mocks-diag', '~> 3.0'
+    end
+    gem 'rfc'
+    gem 'fuubar'
+    gem 'timeout-interrupt', platforms: :mri
+
+    if RUBY_VERSION < '2.3'
+      gem 'ffi', '<1.11'
+    end
+  end
+
+  group :development do
+    gem 'ruby-prof', :platforms => :mri
+    gem 'pry-rescue'
+    gem 'pry-nav'
+  end
+end

lib/mongo/cursor/builder/kill_cursors_command.rb

@@ -92,7 +92,14 @@ def update_cursors(spec, ids)
           #
           # @since 2.3.0
           def get_cursors_list(spec)
-            spec[:selector][:cursors].map(&:value)
+            spec[:selector][:cursors].map do |value|
+              if value.respond_to?(:value)
+                # bson-ruby >= 4.6.0
+                value = value.value
+              else
+                value = value.instance_variable_get('@integer')
+              end
+            end
           end
         end
       end

lib/mongo/cursor/builder/op_kill_cursors.rb

@@ -87,7 +87,14 @@ def update_cursors(spec, ids)
           #
           # @since 2.3.0
           def get_cursors_list(spec)
-            spec[:cursor_ids].map(&:value)
+            spec[:cursor_ids].map do |value|
+              if value.respond_to?(:value)
+                # bson-ruby >= 4.6.0
+                value.value
+              else
+                value.instance_variable_get('@integer')
+              end
+            end
           end
         end
       end

lib/mongo/protocol/serializers.rb

@@ -110,7 +110,12 @@ module Int32
         # @return [String] Buffer with serialized value.
         def self.serialize(buffer, value, validating_keys = BSON::Config.validating_keys?)
           if value.is_a?(BSON::Int32)
-            value = value.value
+            if value.respond_to?(:value)
+              # bson-ruby >= 4.6.0
+              value = value.value
+            else
+              value = value.instance_variable_get('@integer')
+            end
           end
           buffer.put_int32(value)
         end
@@ -138,7 +143,12 @@ module Int64
         # @return [ String ] Buffer with serialized value.
         def self.serialize(buffer, value, validating_keys = BSON::Config.validating_keys?)
           if value.is_a?(BSON::Int64)
-            value = value.value
+            if value.respond_to?(:value)
+              # bson-ruby >= 4.6.0
+              value = value.value
+            else
+              value = value.instance_variable_get('@integer')
+            end
           end
           buffer.put_int64(value)
         end

mongo.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |s|
   s.require_paths     = ['lib']
   s.bindir            = 'bin'
 
-  s.add_dependency 'bson', '>=4.6.0', '<5.0.0'
+  s.add_dependency 'bson', '>=4.4.2', '<5.0.0'
 end