mongo 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aa2e3cfc044a5c4e8c69c0a951c485db0aa93b7
-  data.tar.gz: 86f18a46a73a5d7d0234eb8468833258c441247c
+  metadata.gz: 65cf62fc9f77f84668c204be16c29ecf86f6217a
+  data.tar.gz: dfc97cdbd591e0fd9f539dd8bef21fb46af49829
 SHA512:
-  metadata.gz: 26109683ee810a6af091755feb5a2cbbbf578c28177194abb3601efe2478b77b9cb4cd261e3dfe69d3d7dd33daa40e326c3e10ab2cc5c89b7b0d7c6401b90ca2
-  data.tar.gz: 4109ba38cfb7841490a7216e61b8e16e97edffbeb438afc418a24876f10c6f6b092128402e218786df74c82ee047c1f9917d2e4bb1a4e1d6022bb37631c06819
+  metadata.gz: 937f66f51858557875fc829be722fff81d104c1d4c1cc4522335bcaca7937d5026cee53cbe6a682bb9c649a523ddf213c4a5de1dd29005530c74a8a392538fbe
+  data.tar.gz: b38fbd21f331920971e2fd466147d21d0a9fa866079b57c9618c6aca908ebc20123f6bab467116bb18ac76e432703a74e80d256ce90c58a91ea25e0a6e8901b7

data/bin/test.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH[0, 0] = File.join(File.dirname(__FILE__), '..', 'lib')
+require 'pry'
+require 'mongo'
+
+# include the mongo namespace
+include Mongo
+
+client = Mongo::Client.new("mongodb://localhost:27017/?ssl=true&sslVerify=false")
+
+binding.pry
+
+client
+

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

@@ -43,6 +43,7 @@ module Mongo
             show_disk_loc: 'showRecordId',
             snapshot: 'snapshot',
             tailable: 'tailable',
+            tailable_cursor: 'tailable',
             oplog_replay: 'oplogReplay',
             no_cursor_timeout: 'noCursorTimeout',
             await_data: 'awaitData',
@@ -93,17 +94,26 @@ module Mongo
 
           def find_command
             document = BSON::Document.new('find' => collection.name, 'filter' => filter)
-            command = Options::Mapper.transform_documents(options, MAPPINGS, document)
+            command = Options::Mapper.transform_documents(convert_flags(options), MAPPINGS, document)
             convert_negative_limit(command)
           end
 
           def convert_negative_limit(command)
             if command[:limit] && command[:limit] < 0
-              command.delete('limit')
+              command['limit'] = command['limit'].abs
               command[:singleBatch] = true
             end
             command
           end
+
+          def convert_flags(options)
+            return options if options.empty?
+            opts = options.dup
+            opts.delete(:cursor_type)
+            Flags.map_flags(options).reduce(opts) do |opts, key|
+              opts.merge!(key => true)
+            end
+          end
         end
       end
     end

data/lib/mongo/version.rb

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

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

@@ -159,8 +159,49 @@ describe Mongo::Collection::View::Builder::FindCommand do
         expect(selector['singleBatch']).to be true
       end
 
-      it 'removes the limit from the command' do
-        expect(selector['limit']).to be_nil
+      it 'converts the limit to a positive value' do
+        expect(selector['limit']).to be(options[:limit].abs)
+      end
+    end
+
+    context 'when cursor_type is specified' do
+
+      let(:filter) do
+        { 'name' => 'test' }
+      end
+
+      context 'when cursor_type is :tailable' do
+
+        let(:options) do
+          {
+            cursor_type: :tailable,
+          }
+        end
+
+        it 'maps to tailable' do
+          expect(selector['tailable']).to be true
+        end
+
+        it 'does not map to awaitData' do
+          expect(selector['awaitData']).to be_nil
+        end
+      end
+
+      context 'when cursor_type is :tailable_await' do
+
+        let(:options) do
+          {
+            cursor_type: :tailable_await,
+          }
+        end
+
+        it 'maps to tailable' do
+          expect(selector['tailable']).to be true
+        end
+
+        it 'maps to awaitData' do
+          expect(selector['awaitData']).to be true
+        end
       end
     end
   end

data/spec/mongo/cursor_spec.rb

@@ -136,14 +136,10 @@ describe Mongo::Cursor do
               Mongo::Collection::View.new(authorized_collection, {}, :limit => -2)
             end
 
-            it 'returns the positive number of documents', unless: find_command_enabled? do
+            it 'returns the positive number of documents' do
               expect(cursor.to_a.count).to eq(2)
             end
 
-            it 'returns all documents', if: find_command_enabled? do
-              expect(cursor.to_a.count).to eq(10)
-            end
-
             it 'iterates the documents' do
               cursor.each do |doc|
                 expect(doc).to have_key('field')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Tyler Brock
@@ -32,7 +32,7 @@ cert_chain:
   EhIn2f8suSc9QAqYt7w4T+PMtjxWTVcXs+Uy2PbDtjhtEBz6ZsP6YSsOpJbrCjCV
   wZtXjpRUvWz86V5vjhHCTE8fqfEb85aeDwUCckPzpio=
   -----END CERTIFICATE-----
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -59,6 +59,7 @@ files:
 - README.md
 - Rakefile
 - bin/mongo_console
+- bin/test.rb
 - lib/csasl/csasl.bundle
 - lib/mongo.rb
 - lib/mongo/address.rb