mongo 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5da2e7df100dcc00d786b3839cce847de888bb3d
-  data.tar.gz: 858a508aa78ac85c6fc5a7506bdd660cdc384a9f
+  metadata.gz: b2d9e9f00a79f50cd0a8acbfde72ceb13993a77d
+  data.tar.gz: 90cea8a2fe4251801c0cc40fdca77856c1c6b153
 SHA512:
-  metadata.gz: 7a017939e8bfdc94ea78635128b71c5b837f725243777cf32f3d46b380cffc9b7c3e40b9558257af917b2eabf58e145dc8af7d36443b3342e55e08e16ff845b3
-  data.tar.gz: e22e1fbfe7908b55d0289f027483d56891f57757c5f29ff23bfaae1dd7140dfe3856b9e936d27402910fb7874d37576878c6d48e4de74765bac37c28251f9342
+  metadata.gz: c39d5f4e21bf2ce5390f3cd9baab0dd67f350794b33f41f0deb08a65993b9c669cdbfbe7d2008d8a8105cfcf319da526e557848580f41c1e7c78ac63a40267f9
+  data.tar.gz: 55be4b7a6f20d2ed52dfd15d010391112927925bd3261c8c7d14a468460151a5dba91197983061004c600cf40b84b402a8d5227a670bdae1495fa845951b8a9c

data.tar.gz.sig

@@ -1 +1,3 @@
-��#@�8�^�b3�̚���Z�	���E���a���,�������5Jo�B��a�p�mHm�EG��*lv۫�:�{-IRPd^mt��UN��M[F��
���*��Q��+K�=/�5����_O�_�s�Ǽ�CZL��j���E��f��0~�y]��:1�̣��Ȝo��]j+J�f��>Hc�=�]�|�;l��9��#����K_\�A�kw����o�Z�%ý. &T����b[n�])9h��Ήt�
+��V+f�ӱAbc��F�>��NRή��{�#2�%�S!����!TKV�ض�x�	�*�9�z+2�c�;�`v_��o�>�/��C،Ve�J��pH�AL��I�{�m8���r3��m%��Y��$0ρ_ií�X�o�:*�����0����l��u�\j͎h]�-���7]4fy�����a.t#�Q'��mR�2/�/{����
+z+|79��3(���C�����P�����-
+�\E�zݝ���"��Y�

data/lib/mongo/collection/view/builder/find_command.rb

@@ -95,15 +95,30 @@ module Mongo
           def find_command
             document = BSON::Document.new('find' => collection.name, 'filter' => filter)
             command = Options::Mapper.transform_documents(convert_flags(options), MAPPINGS, document)
-            convert_negative_limit(command)
+            convert_limit_and_batch_size(command)
+            command
           end
 
-          def convert_negative_limit(command)
-            if command[:limit] && command[:limit] < 0
-              command['limit'] = command['limit'].abs
+          def convert_limit_and_batch_size(command)
+            if command[:limit] && command[:limit] < 0 &&
+                command[:batchSize] && command[:batchSize] < 0
+
+              command[:limit] = command[:limit].abs
+              command[:batchSize] = command[:limit].abs
               command[:singleBatch] = true
+
+            else
+              [:limit, :batchSize].each do |opt|
+                if command[opt]
+                  if command[opt] < 0
+                    command[opt] = command[opt].abs
+                    command[:singleBatch] = true
+                  elsif command[opt] == 0
+                    command.delete(opt)
+                  end
+                end
+              end
             end
-            command
           end
 
           def convert_flags(options)

data/lib/mongo/cursor/builder/get_more_command.rb

@@ -25,7 +25,8 @@ module Mongo
         # @return [ Cursor ] cursor The cursor.
         attr_reader :cursor
 
-        def_delegators :@cursor, :batch_size, :collection_name, :database, :view
+        def_delegators :@cursor, :collection_name, :database, :view
+        def_delegators :view, :batch_size
 
         # Create the new builder.
         #
@@ -55,7 +56,7 @@ module Mongo
 
         def get_more_command
           command = { :getMore => cursor.id, :collection => collection_name }
-          command[:batchSize] = batch_size if batch_size
+          command[:batchSize] = batch_size.abs if batch_size && batch_size != 0
           # If the max_await_time_ms option is set, then we set maxTimeMS on
           # the get more command.
           if view.respond_to?(:max_await_time_ms)

data/lib/mongo/operation/write/create_index.rb

@@ -59,7 +59,7 @@ module Mongo
         end
 
         def message
-          Protocol::Insert.new(db_name, Index::COLLECTION, index_documents)
+          Protocol::Insert.new(db_name, Index::COLLECTION, index_documents, validating_keys: false)
         end
       end
     end

data/lib/mongo/protocol/insert.rb

@@ -54,6 +54,7 @@ module Mongo
         @documents = documents
         @flags = options[:flags] || []
         @upconverter = Upconverter.new(collection, documents, options)
+        @options = options
       end
 
       # Return the event payload for monitoring.
@@ -76,7 +77,7 @@ module Mongo
       private
 
       def validating_keys?
-        true
+        @options.fetch(:validating_keys, true)
       end
 
       attr_reader :upconverter

data/lib/mongo/protocol/query.rb

@@ -252,7 +252,7 @@ module Mongo
         #
         # @since 2.1.0
         def command_name
-          command? ? filter.keys.first : FIND
+          (filter[:$query] || !command?) ? FIND : filter.keys.first
         end
 
         private
@@ -261,9 +261,13 @@ module Mongo
           collection == Database::COMMAND
         end
 
+        def query_filter
+          filter[:$query] || filter
+        end
+
         def op_command
           document = BSON::Document.new
-          filter.each do |field, value|
+          query_filter.each do |field, value|
             document.store(field.to_s, value)
           end
           document
@@ -272,7 +276,7 @@ module Mongo
         def find_command
           document = BSON::Document.new
           document.store(FIND, collection)
-          document.store(FILTER, filter[:$query] ? filter[:$query] : filter)
+          document.store(FILTER, query_filter)
           OPTION_MAPPINGS.each do |legacy, option|
             document.store(option, options[legacy]) unless options[legacy].nil?
           end

data/lib/mongo/version.rb

@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.3.0'.freeze
+  VERSION = '2.3.1'.freeze
 end

data/spec/mongo/collection/view/builder/find_command_spec.rb

@@ -145,14 +145,256 @@ describe Mongo::Collection::View::Builder::FindCommand do
       end
     end
 
-    context 'when limit is negative' do
+
+    context 'when there is a limit' do
+
+      let(:filter) do
+        { 'name' => 'test' }
+      end
+
+      context 'when limit is 0' do
+
+        context 'when batch_size is also 0' do
+
+          let(:options) do
+            { limit: 0, batch_size: 0 }
+          end
+
+          it 'does not set the singleBatch' do
+            expect(selector['singleBatch']).to be nil
+          end
+
+          it 'does not set the limit' do
+            expect(selector['limit']).to be nil
+          end
+
+          it 'does not set the batch size' do
+            expect(selector['batchSize']).to be nil
+          end
+        end
+
+        context 'when batch_size is not set' do
+
+          let(:options) do
+            { limit: 0 }
+          end
+
+          it 'does not set the singleBatch' do
+            expect(selector['singleBatch']).to be nil
+          end
+
+          it 'does not set the limit' do
+            expect(selector['limit']).to be nil
+          end
+
+          it 'does not set the batch size' do
+            expect(selector['batchSize']).to be nil
+          end
+        end
+      end
+
+      context 'when the limit is negative' do
+
+        context 'when there is a batch_size' do
+
+          context 'when the batch_size is positive' do
+
+            let(:options) do
+              { limit: -1, batch_size: 3 }
+            end
+
+            it 'sets single batch to true' do
+              expect(selector['singleBatch']).to be true
+            end
+
+            it 'converts the limit to a positive value' do
+              expect(selector['limit']).to be(options[:limit].abs)
+            end
+
+            it 'sets the batch size' do
+              expect(selector['batchSize']).to be(options[:batch_size])
+            end
+          end
+
+          context 'when the batch_size is negative' do
+
+            let(:options) do
+              { limit: -1, batch_size: -3 }
+            end
+
+            it 'sets single batch to true' do
+              expect(selector['singleBatch']).to be true
+            end
+
+            it 'converts the limit to a positive value' do
+              expect(selector['limit']).to be(options[:limit].abs)
+            end
+
+            it 'sets the batch size to the limit' do
+              expect(selector['batchSize']).to be(options[:limit].abs)
+            end
+          end
+        end
+
+        context 'when there is not a batch_size' do
+
+          let(:options) do
+            { limit: -5 }
+          end
+
+          it 'sets single batch to true' do
+            expect(selector['singleBatch']).to be true
+          end
+
+          it 'converts the limit to a positive value' do
+            expect(selector['limit']).to be(options[:limit].abs)
+          end
+
+          it 'does not set the batch size' do
+            expect(selector['batchSize']).to be_nil
+          end
+        end
+      end
+
+      context 'when the limit is positive' do
+
+        context 'when there is a batch_size' do
+
+          context 'when the batch_size is positive' do
+
+            let(:options) do
+              { limit: 5, batch_size: 3 }
+            end
+
+            it 'does not set singleBatch' do
+              expect(selector['singleBatch']).to be nil
+            end
+
+            it 'sets the limit' do
+              expect(selector['limit']).to be(options[:limit])
+            end
+
+            it 'sets the batch size' do
+              expect(selector['batchSize']).to be(options[:batch_size])
+            end
+          end
+
+          context 'when the batch_size is negative' do
+
+            let(:options) do
+              { limit: 5, batch_size: -3 }
+            end
+
+            it 'sets the singleBatch' do
+              expect(selector['singleBatch']).to be true
+            end
+
+            it 'sets the limit' do
+              expect(selector['limit']).to be(options[:limit])
+            end
+
+            it 'sets the batch size to a positive value' do
+              expect(selector['batchSize']).to be(options[:batch_size].abs)
+            end
+          end
+        end
+
+        context 'when there is not a batch_size' do
+
+          let(:options) do
+            { limit: 5 }
+          end
+
+          it 'does not set the singleBatch' do
+            expect(selector['singleBatch']).to be nil
+          end
+
+          it 'sets the limit' do
+            expect(selector['limit']).to be(options[:limit])
+          end
+
+          it 'does not set the batch size' do
+            expect(selector['batchSize']).to be nil
+          end
+        end
+      end
+    end
+
+    context 'when there is a batch_size' do
+
+      let(:filter) do
+        { 'name' => 'test' }
+      end
+
+      context 'when there is no limit' do
+
+        context 'when the batch_size is positive' do
+
+          let(:options) do
+            { batch_size: 3 }
+          end
+
+          it 'does not set the singleBatch' do
+            expect(selector['singleBatch']).to be nil
+          end
+
+          it 'does not set the limit' do
+            expect(selector['limit']).to be nil
+          end
+
+          it 'sets the batch size' do
+            expect(selector['batchSize']).to be(options[:batch_size])
+          end
+        end
+
+        context 'when the batch_size is negative' do
+
+          let(:options) do
+            { batch_size: -3 }
+          end
+
+          it 'sets the singleBatch' do
+            expect(selector['singleBatch']).to be true
+          end
+
+          it 'does not set the limit' do
+            expect(selector['limit']).to be nil
+          end
+
+          it 'sets the batch size to a positive value' do
+            expect(selector['batchSize']).to be(options[:batch_size].abs)
+          end
+        end
+
+        context 'when batch_size is 0' do
+
+          let(:options) do
+            { batch_size: 0 }
+          end
+
+          it 'does not set the singleBatch' do
+            expect(selector['singleBatch']).to be nil
+          end
+
+          it 'does not set the limit' do
+            expect(selector['limit']).to be nil
+          end
+
+          it 'does not set the batch size' do
+            expect(selector['batchSize']).to be nil
+          end
+        end
+      end
+    end
+
+    context 'when limit and batch_size are negative' do
 
       let(:filter) do
         { 'name' => 'test' }
       end
 
       let(:options) do
-        { limit: -1 }
+        { limit: -1, batch_size: -3 }
       end
 
       it 'sets single batch to true' do

data/spec/mongo/index/view_spec.rb

@@ -141,12 +141,31 @@ describe Mongo::Index::View do
       end
 
       after do
-        view.drop_one('random_1')
+        begin; view.drop_one('random_1'); rescue; end
       end
 
       it 'returns ok' do
         expect(result).to be_successful
       end
+
+      context 'when the index is created on an subdocument field' do
+
+        let(:spec) do
+          { 'sub_document.random' => 1 }
+        end
+
+        let(:result) do
+          view.create_one(spec, unique: true)
+        end
+
+        after do
+          begin; view.drop_one('sub_document.random_1'); rescue; end
+        end
+
+        it 'returns ok' do
+          expect(result).to be_successful
+        end
+      end
     end
 
     context 'when index creation fails' do

data/spec/support/crud/read.rb

@@ -31,6 +31,16 @@ module Mongo
                          :limit => 'limit'
                        }
 
+        # Map of read preference mode names to their equivalent Ruby-formatted symbols.
+        #
+        # @since 2.4.0
+        READ_PREFERENCE_MAP = { 'primary' => :primary,
+                                'secondary' => :secondary,
+                                'primaryPreferred' => :primary_preferred,
+                                'secondaryPreferred' => :secondary_preferred,
+                                'nearest' => :nearest
+                              }
+
         # The operation name.
         #
         # @return [ String ] name The operation name.
@@ -109,7 +119,8 @@ module Mongo
         end
 
         def find(collection)
-          collection.find(filter, options.merge(modifiers: BSON::Document.new(modifiers) || {})).to_a
+          opts = modifiers ? options.merge(modifiers: BSON::Document.new(modifiers)) : options
+          (read_preference ? collection.with(read: read_preference) : collection).find(filter, opts).to_a
         end
 
         def options
@@ -141,6 +152,12 @@ module Mongo
         def arguments
           @spec['arguments']
         end
+
+        def read_preference
+          if @spec['read_preference'] && @spec['read_preference']['mode']
+            { mode: READ_PREFERENCE_MAP[@spec['read_preference']['mode']] }
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Tyler Brock
@@ -32,7 +32,7 @@ cert_chain:
   EhIn2f8suSc9QAqYt7w4T+PMtjxWTVcXs+Uy2PbDtjhtEBz6ZsP6YSsOpJbrCjCV
   wZtXjpRUvWz86V5vjhHCTE8fqfEb85aeDwUCckPzpio=
   -----END CERTIFICATE-----
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -60,6 +60,7 @@ files:
 - README.md
 - Rakefile
 - bin/mongo_console
+- lib/csasl/csasl.bundle
 - lib/mongo.rb
 - lib/mongo/address.rb
 - lib/mongo/address/ipv4.rb