mongo 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22155206427257fef9e634311719afb58b03f76c
-  data.tar.gz: c156ef4a3569277ad0c398455d7983c3e2475051
+  metadata.gz: 0246e6a64d501929f4951018f1a8d9ca820279c3
+  data.tar.gz: e417f701dd239a033bff8b40d15e37f8adf2718f
 SHA512:
-  metadata.gz: 4252e5a66f31ee3ba496bd573b37ee08f0dd513b3d1e1b154da01c7d34dc19714fc929de7454cc4ea0415fbb44312a8b1c29cf06c1cfb20adee72e97cd917443
-  data.tar.gz: efb7c93290353223cfc910a383b0a0edd9f2d0cc3b6405389256f48fe1dd1ed3647449db8d07663300303ba07a25a038f46d4c2ee5b1bdc0e804890e73b698b6
+  metadata.gz: '07684a4b81cc5b65e3dff16e1ce48542d165558683c82987a2e21d305434f2b4849688f3f2dad855b7034bfbd9ecb04ff0ce7a5f8572beead07bc0d87db621b8'
+  data.tar.gz: db337b9d0dae7d8ffc41833a770a0a4edd80d847440b05ff6c5d99c66c677624baaae948187443b0ab43195dc9904772e8f6334940ae7a20786c03ed3b956dbf

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-B�l5������ b{�B��Rg ��̢�%r��ϸ�,�fmŮD���|��mEy5�wa1r�k4x
-4�~I� g�;dD��w(��/Cj[��	"t�Ӧ0H0u�����tBeN{�x��"��M �
jǬ����w�}�!��ee��C{�W��9���|d�;�=W������*�5q�2�b��d�̞a��1ػ��Y��-��+���$7Z��Ͼ��s��@��k�C�d�#�C[�o&P��
+�F��Y��Լ����� �������4
+�V7��#��#�|��N�~!G��Hw�5�S��Q#k8+��l��!S.̌�z�Ԙ=o5�;Gb���o����Z�y����;�dy�V�o��mn�"�����
+K�;���K�K�i��Y��w�B��m�� !"�IM/i<�!�a_�5�K3UW$�x���_��$��7�e>��W��l w����k���Jk�ʤaB2��Vl

data/Rakefile

@@ -16,7 +16,7 @@ Bundler.require(*default_groups)
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = "--profile 5" if ENV['CI']
+  #t.rspec_opts = "--profile 5" if ENV['CI']
 end
 
 task :default => :spec

data/lib/mongo/auth/user/view.rb

@@ -44,7 +44,7 @@ module Mongo
         def create(user_or_name, options = {})
           user = generate(user_or_name, options)
           client.send(:with_session, options) do |session|
-            Operation::Write::Command::CreateUser.new(
+            Operation::CreateUser.new(
               user: user,
               db_name: database.name,
               session: session
@@ -79,7 +79,7 @@ module Mongo
         # @since 2.0.0
         def remove(name, options = {})
           client.send(:with_session, options) do |session|
-            Operation::Write::Command::RemoveUser.new(
+            Operation::RemoveUser.new(
               user_name: name,
               db_name: database.name,
               session: session
@@ -103,7 +103,7 @@ module Mongo
         def update(user_or_name, options = {})
           client.send(:with_session, options) do |session|
             user = generate(user_or_name, options)
-            Operation::Write::Command::UpdateUser.new(
+            Operation::UpdateUser.new(
               user: user,
               db_name: database.name,
               session: session
@@ -132,7 +132,7 @@ module Mongo
 
         def user_query(name, options = {})
           client.send(:with_session, options) do |session|
-            Operation::Commands::UsersInfo.new(
+            Operation::UsersInfo.new(
               user_name: name,
               db_name: database.name,
               session: session

data/lib/mongo/bulk_write.rb

@@ -61,7 +61,7 @@ module Mongo
             write_with_retry(session, write_concern) do |server, txn_num|
               execute_operation(
                   operation.keys.first,
-                  operation.values.first,
+                  operation.values.flatten,
                   server,
                   operation_id,
                   result_combiner,
@@ -72,7 +72,7 @@ module Mongo
             legacy_write_with_retry do |server|
               execute_operation(
                   operation.keys.first,
-                  operation.values.first,
+                  operation.values.flatten,
                   server,
                   operation_id,
                   result_combiner,
@@ -175,7 +175,8 @@ module Mongo
         if values.size > server.max_write_batch_size
           split_execute(name, values, server, operation_id, combiner, session, txn_num)
         else
-          combiner.combine!(send(name, values, server, operation_id, session, txn_num), values.size)
+          result = send(name, values, server, operation_id, session, txn_num)
+          combiner.combine!(result, values.size)
         end
       rescue Error::MaxBSONSize, Error::MaxMessageSize => e
         raise e if values.size <= 1
@@ -195,35 +196,29 @@ module Mongo
     end
 
     def delete_one(documents, server, operation_id, session, txn_num)
-      Operation::Write::Bulk::Delete.new(
-        base_spec(operation_id, session).merge(:deletes => documents, :txn_num => txn_num)
-      ).execute(server)
+      spec = base_spec(operation_id, session).merge(:deletes => documents, :txn_num => txn_num)
+      Operation::Delete.new(spec).bulk_execute(server)
     end
 
     def delete_many(documents, server, operation_id, session, txn_num)
-      Operation::Write::Bulk::Delete.new(
-          base_spec(operation_id, session).merge(:deletes => documents)
-      ).execute(server)
+      spec = base_spec(operation_id, session).merge(:deletes => documents)
+      Operation::Delete.new(spec).bulk_execute(server)
     end
 
-
     def insert_one(documents, server, operation_id, session, txn_num)
-      Operation::Write::Bulk::Insert.new(
-        base_spec(operation_id, session).merge(:documents => documents, :txn_num => txn_num)
-      ).execute(server)
+      spec = base_spec(operation_id, session).merge(:documents => documents, :txn_num => txn_num)
+      Operation::Insert.new(spec).bulk_execute(server)
     end
 
     def update_one(documents, server, operation_id, session, txn_num)
-      Operation::Write::Bulk::Update.new(
-        base_spec(operation_id, session).merge(:updates => documents, :txn_num => txn_num)
-      ).execute(server)
+      spec = base_spec(operation_id, session).merge(:updates => documents, :txn_num => txn_num)
+      Operation::Update.new(spec).bulk_execute(server)
     end
     alias :replace_one :update_one
 
     def update_many(documents, server, operation_id, session, txn_num)
-      Operation::Write::Bulk::Update.new(
-          base_spec(operation_id, session).merge(:updates => documents)
-      ).execute(server)
+      spec = base_spec(operation_id, session).merge(:updates => documents)
+      Operation::Update.new(spec).bulk_execute(server)
     end
   end
 end

data/lib/mongo/cluster.rb

@@ -244,14 +244,16 @@ module Mongo
     # @example Get the next primary server.
     #   cluster.next_primary
     #
-    # @param [ true, false ] ping Whether to ping the server before selection.
+    # @param [ true, false ] ping Whether to ping the server before selection. Deprecated,
+    #   not necessary with the implementation of the Server Selection specification.
+    #
     #
     # @return [ Mongo::Server ] A primary server.
     #
     # @since 2.0.0
     def next_primary(ping = true)
       @primary_selector ||= ServerSelector.get(ServerSelector::PRIMARY)
-      @primary_selector.select_server(self, ping)
+      @primary_selector.select_server(self)
     end
 
     # Elect a primary server from the description that has just changed to a

data/lib/mongo/cluster/app_metadata.rb

@@ -52,7 +52,7 @@ module Mongo
       #
       # @since 2.4.0
       def initialize(cluster)
-        @app_name = cluster.options[:app_name]
+        @app_name = cluster.options[:app_name].to_s if cluster.options[:app_name]
         @platform = cluster.options[:platform]
         @compressors = cluster.options[:compressors] || []
       end

data/lib/mongo/cluster/reapers/cursor_reaper.rb

@@ -124,7 +124,7 @@ module Mongo
             if server.features.find_command_enabled?
               Cursor::Builder::KillCursorsCommand.update_cursors(op_spec, active_cursors_copy.to_a)
               if Cursor::Builder::KillCursorsCommand.get_cursors_list(op_spec).size > 0
-                Operation::Commands::Command.new(op_spec).execute(server)
+                Operation::KillCursors.new(op_spec).execute(server)
               end
             else
               Cursor::Builder::OpKillCursors.update_cursors(op_spec, active_cursors_copy.to_a)

data/lib/mongo/collection.rb

@@ -189,12 +189,12 @@ module Mongo
         raise Error::UnsupportedCollation.new
       end
       client.send(:with_session, opts) do |session|
-        Operation::Commands::Create.new({
-                                          selector: operation,
-                                          db_name: database.name,
-                                          write_concern: write_concern,
-                                          session: session
-                                        }).execute(server)
+        Operation::Create.new({
+                                selector: operation,
+                                db_name: database.name,
+                                write_concern: write_concern,
+                                session: session
+                                }).execute(server)
       end
     end
 
@@ -215,12 +215,12 @@ module Mongo
     # @since 2.0.0
     def drop(opts = {})
       client.send(:with_session, opts) do |session|
-        Operation::Commands::Drop.new({
-                                        selector: { :drop => name },
-                                        db_name: database.name,
-                                        write_concern: write_concern,
-                                        session: session
-                                      }).execute(next_primary)
+        Operation::Drop.new({
+                              selector: { :drop => name },
+                              db_name: database.name,
+                              write_concern: write_concern,
+                              session: session
+                              }).execute(next_primary)
       end
     rescue Error::OperationFailure => ex
       raise ex unless ex.message =~ /ns not found/
@@ -420,7 +420,7 @@ module Mongo
     def insert_one(document, opts = {})
       client.send(:with_session, opts) do |session|
         write_with_retry(session, write_concern) do |server, txn_num|
-          Operation::Write::Insert.new(
+          Operation::Insert.new(
               :documents => [ document ],
               :db_name => database.name,
               :coll_name => name,

data/lib/mongo/collection/view.rb

@@ -122,13 +122,14 @@ module Mongo
       # @option options :limit [ Integer ] Max number of docs to return.
       # @option options :max_scan [ Integer ] Constrain the query to only scan the
       #   specified number of docs. Use to prevent queries from running too long.
+      #   Deprecated as of MongoDB server version 4.0.
       # @option options :read [ Symbol ] The read preference to use for the query.
       #   If none is provided, the collection's default read preference is used.
       # @option options :show_disk_loc [ true, false ] Return disk location info as
       #   a field in each doc.
       # @option options :skip [ Integer ] The number of documents to skip.
       # @option options :snapshot [ true, false ] Prevents returning a doc more than
-      #   once.
+      #   once. Deprecated as of MongoDB server version 4.0.
       # @option options :sort [ Hash ] The key and direction pairs used to sort the
       #   results.
       # @option options [ Hash ] :collation The collation to use.

data/lib/mongo/collection/view/aggregation.rb

@@ -103,7 +103,7 @@ module Mongo
         end
 
         def initial_query_op(session)
-          Operation::Commands::Aggregate.new(aggregate_spec(session))
+          Operation::Aggregate.new(aggregate_spec(session))
         end
 
         def valid_server?(server)

data/lib/mongo/collection/view/change_stream.rb

@@ -153,7 +153,7 @@ module Mongo
 
         def create_cursor!
           session = client.send(:get_session, @options)
-          server = server_selector.select_server(cluster, false)
+          server = server_selector.select_server(cluster)
           result = send_initial_query(server, session)
           @cursor = Cursor.new(view, result, server, disable_retry: true, session: session)
         end

data/lib/mongo/collection/view/iterable.rb

@@ -38,7 +38,7 @@ module Mongo
           @cursor = nil
           session = client.send(:get_session, @options)
           read_with_retry do
-            server = server_selector.select_server(cluster, false)
+            server = server_selector.select_server(cluster)
             result = send_initial_query(server, session)
             @cursor = Cursor.new(view, result, server, session: session)
           end
@@ -65,15 +65,15 @@ module Mongo
           if server.features.find_command_enabled?
             initial_command_op(session)
           else
-            Operation::Read::Query.new(Builder::OpQuery.new(self).specification)
+            Operation::Find.new(Builder::OpQuery.new(self).specification)
           end
         end
 
         def initial_command_op(session)
           if explained?
-            Operation::Commands::Explain.new(Builder::FindCommand.new(self, session).explain_specification)
+            Operation::Explain.new(Builder::FindCommand.new(self, session).explain_specification)
           else
-            Operation::Commands::Find.new(Builder::FindCommand.new(self, session).specification)
+            Operation::Find.new(Builder::FindCommand.new(self, session).specification)
           end
         end
 

data/lib/mongo/collection/view/map_reduce.rb

@@ -217,7 +217,7 @@ module Mongo
         end
 
         def initial_query_op(session)
-          Operation::Commands::MapReduce.new(map_reduce_spec(session))
+          Operation::MapReduce.new(map_reduce_spec(session))
         end
 
         def valid_server?(server)
@@ -247,9 +247,9 @@ module Mongo
 
         def fetch_query_op(server, session)
           if server.features.find_command_enabled?
-            Operation::Commands::Find.new(find_command_spec(session))
+            Operation::Find.new(find_command_spec(session))
           else
-            Operation::Read::Query.new(fetch_query_spec)
+            Operation::Find.new(fetch_query_spec)
           end
         end
 

data/lib/mongo/collection/view/readable.rb

@@ -136,16 +136,16 @@ module Mongo
           read_pref = opts[:read] || read_preference
           selector = ServerSelector.get(read_pref || server_selector)
           read_with_retry do
-            server = selector.select_server(cluster, false)
+            server = selector.select_server(cluster)
             apply_collation!(cmd, server, opts)
             with_session(opts) do |session|
-              Operation::Commands::Count.new({
-                                                   :selector => cmd,
-                                                   :db_name => database.name,
-                                                   :options => {:limit => -1},
-                                                   :read => read_pref,
-                                                   :session => session
-                                               }).execute(server)
+              Operation::Count.new({
+                                     :selector => cmd,
+                                     :db_name => database.name,
+                                     :options => {:limit => -1},
+                                     :read => read_pref,
+                                     :session => session
+                                    }).execute(server)
             end.n.to_i
           end
         end
@@ -176,16 +176,16 @@ module Mongo
           read_pref = opts[:read] || read_preference
           selector = ServerSelector.get(read_pref || server_selector)
           read_with_retry do
-            server = selector.select_server(cluster, false)
+            server = selector.select_server(cluster)
             apply_collation!(cmd, server, opts)
             with_session(opts) do |session|
-              Operation::Commands::Distinct.new({
-                                                   :selector => cmd,
-                                                   :db_name => database.name,
-                                                   :options => {:limit => -1},
-                                                   :read => read_pref,
-                                                   :session => session
-                                               }).execute(server)
+              Operation::Distinct.new({
+                                        :selector => cmd,
+                                        :db_name => database.name,
+                                        :options => {:limit => -1},
+                                        :read => read_pref,
+                                        :session => session
+                                       }).execute(server)
             end.first['values']
           end
         end
@@ -244,6 +244,9 @@ module Mongo
         # @return [ Integer, View ] The value or a new +View+.
         #
         # @since 2.0.0
+        #
+        # @deprecated This option is deprecated as of MongoDB server
+        #   version 4.0.
         def max_scan(value = nil)
           configure(:max_scan, value)
         end
@@ -380,6 +383,9 @@ module Mongo
         # @param [ true, false ] value The snapshot value.
         #
         # @since 2.0.0
+        #
+        # @deprecated This option is deprecated as of MongoDB server
+        #   version 4.0.
         def snapshot(value = nil)
           configure(:snapshot, value)
         end
@@ -473,8 +479,8 @@ module Mongo
 
         def parallel_scan(cursor_count, options = {})
           session = client.send(:get_session, @options)
-          server = server_selector.select_server(cluster, false)
-          cmd = Operation::Commands::ParallelScan.new({
+          server = server_selector.select_server(cluster)
+          cmd = Operation::ParallelScan.new({
                   :coll_name => collection.name,
                   :db_name => database.name,
                   :cursor_count => cursor_count,
@@ -483,14 +489,14 @@ module Mongo
                 }.merge!(options))
           cmd.execute(server).cursor_ids.map do |cursor_id|
             result = if server.features.find_command_enabled?
-                       Operation::Commands::GetMore.new({
+                       Operation::GetMore.new({
                          :selector => {:getMore => cursor_id,
                                        :collection => collection.name},
                          :db_name => database.name,
                          :session => session
                        }).execute(server)
                      else
-                       Operation::Read::GetMore.new({
+                       Operation::GetMore.new({
                          :to_return => 0,
                          :cursor_id => cursor_id,
                          :db_name => database.name,

data/lib/mongo/collection/view/writable.rb

@@ -49,7 +49,7 @@ module Mongo
           with_session(opts) do |session|
             write_with_retry(session, write_concern) do |server, txn_num|
               apply_collation!(cmd, server, opts)
-              Operation::Commands::Command.new(
+              Operation::Command.new(
                   :selector => cmd,
                   :db_name => database.name,
                   :session => session,
@@ -121,7 +121,7 @@ module Mongo
             write_with_retry(session, write_concern) do |server, txn_num|
               apply_collation!(cmd, server, opts)
               apply_array_filters!(cmd, server, opts)
-              Operation::Commands::Command.new(
+              Operation::Command.new(
                   :selector => cmd,
                   :db_name => database.name,
                   :session => session,
@@ -149,8 +149,8 @@ module Mongo
           with_session(opts) do |session|
             legacy_write_with_retry do |server|
               apply_collation!(delete_doc, server, opts)
-              Operation::Write::Delete.new(
-                  :delete => delete_doc,
+              Operation::Delete.new(
+                  :deletes => [ delete_doc ],
                   :db_name => collection.database.name,
                   :coll_name => collection.name,
                   :write_concern => collection.write_concern,
@@ -178,8 +178,8 @@ module Mongo
           with_session(opts) do |session|
             write_with_retry(session, write_concern) do |server, txn_num|
               apply_collation!(delete_doc, server, opts)
-              Operation::Write::Delete.new(
-                  :delete => delete_doc,
+              Operation::Delete.new(
+                  :deletes => [ delete_doc ],
                   :db_name => collection.database.name,
                   :coll_name => collection.name,
                   :write_concern => write_concern,
@@ -217,8 +217,8 @@ module Mongo
               apply_collation!(update_doc, server, opts)
               apply_array_filters!(update_doc, server, opts)
 
-              Operation::Write::Update.new(
-                  :update => update_doc,
+              Operation::Update.new(
+                  :updates => [ update_doc ],
                   :db_name => collection.database.name,
                   :coll_name => collection.name,
                   :write_concern => write_concern,
@@ -256,8 +256,8 @@ module Mongo
             legacy_write_with_retry do |server|
               apply_collation!(update_doc, server, opts)
               apply_array_filters!(update_doc, server, opts)
-              Operation::Write::Update.new(
-                  :update => update_doc,
+              Operation::Update.new(
+                  :updates => [ update_doc ],
                   :db_name => collection.database.name,
                   :coll_name => collection.name,
                   :write_concern => collection.write_concern,
@@ -296,8 +296,8 @@ module Mongo
               apply_collation!(update_doc, server, opts)
               apply_array_filters!(update_doc, server, opts)
 
-              Operation::Write::Update.new(
-                  :update => update_doc,
+              Operation::Update.new(
+                  :updates => [ update_doc ],
                   :db_name => collection.database.name,
                   :coll_name => collection.name,
                   :write_concern => write_concern,