mongo 2.1.2 → 2.2.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5848eb885418bc7cba6b6a44761b1b47f4bbcb7d
-  data.tar.gz: fa960cc01b750a11b49a30a64cc602a6b665898e
+  metadata.gz: dcc9c2c71373a6cf0c7ecc20e34dc665a3609113
+  data.tar.gz: b0586f936825521d4d1b720aaab115094c754b52
 SHA512:
-  metadata.gz: 5b6809a0802bba0bc3bd58d45dff14a15f6bddf4194deaa4063fadebf27bcb1a3af451c28f1076d5094ab18a65522b5571ca62bd5e2ff3baaf3d583e3962ec1c
-  data.tar.gz: da274d6b705a440c81d7fb9f09a413ef3a200ca1af858c1eb0b82db1a4ffd95edba29d07872e031440c5822bcac4114cabf40b3b3b32d1af349e4d80452fdb28
+  metadata.gz: 4bd095acd88b753375c7b32441645a7f79bd6e79fa66c4b49d1d16f98a17a3ebb88628132d863dee8a49132b0ad06cd540fc329b37d3250e1793ecf0ce0fbb55
+  data.tar.gz: 8081fad549d197c92f9b573694b32a1813030fcde279e98ab117dd9d4b601b5bb2139a720c218b03fadd3315a8a9f391066f7ad96c99f194ce1cf186b6a56673

data/README.md

@@ -1,4 +1,4 @@
-MongoDB Ruby Driver [![Build Status][travis-img]][travis-url] [![Code Climate][codeclimate-img]][codeclimate-url] [![Coverage Status][coveralls-img]][coveralls-url] [![Gem Version][rubygems-img]][rubygems-url]
+MongoDB Ruby Driver [![Build Status][travis-img]][travis-url] [![Code Climate][codeclimate-img]][codeclimate-url] [![Gem Version][rubygems-img]][rubygems-url]
 -----
 The officially supported Ruby driver for [MongoDB](http://www.mongodb.org).
 
@@ -40,6 +40,15 @@ When reporting an issue, please keep in mind that all information in JIRA for al
 * Provide any sensitive data or server logs.
 * Report potential security issues publicly (see 'Security Issues').
 
+Running Tests
+-----
+
+The driver uses RSpec as it's primary testing tool. To run all tests simple run `rspec`.
+
+To run a test at a specific location (where `42` is the line number), use:
+
+    rspec path/to/spec.rb:42
+
 Security Issues
 -----
 
@@ -74,5 +83,3 @@ License
 [travis-url]: http://travis-ci.org/mongodb/mongo-ruby-driver?branch=master
 [codeclimate-img]: https://codeclimate.com/github/mongodb/mongo-ruby-driver.png?branch=master
 [codeclimate-url]: https://codeclimate.com/github/mongodb/mongo-ruby-driver?branch=master
-[coveralls-img]: https://coveralls.io/repos/mongodb/mongo-ruby-driver/badge.png?branch=master
-[coveralls-url]: https://coveralls.io/r/mongodb/mongo-ruby-driver?branch=master

data/Rakefile

@@ -19,13 +19,7 @@ RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
 namespace :spec do
-  if RUBY_VERSION > '1.9' && RUBY_VERSION < '2.2'
-    require 'coveralls/rake/task'
-    Coveralls::RakeTask.new
-    task :ci => [:spec, 'coveralls:push']
-  else
-    task :ci => [:spec]
-  end
+  task :ci => [:spec]
 end
 
 task :release => :spec do

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

@@ -112,7 +112,7 @@ module Mongo
         private
 
         def user_query(name)
-          Operation::UserQuery.new(
+          Operation::Commands::UserQuery.new(
             user_name: name,
             db_name: database.name
           ).execute(next_primary.context)

data/lib/mongo/bulk_write.rb

@@ -37,6 +37,8 @@ module Mongo
     # Delegate various methods to the collection.
     def_delegators :@collection, :database, :cluster, :next_primary
 
+    def_delegators :database, :client
+
     # Execute the bulk write operation.
     #
     # @example Execute the bulk write.
@@ -131,7 +133,10 @@ module Mongo
         :coll_name => collection.name,
         :write_concern => write_concern,
         :ordered => ordered?,
-        :operation_id => operation_id
+        :operation_id => operation_id,
+        :bypass_document_validation => !!options[:bypass_document_validation],
+        :options => options,
+        :id_generator => client.options[:id_generator]
       }
     end
 
@@ -143,6 +148,7 @@ module Mongo
           combiner.combine!(send(name, values, server, operation_id), values.size)
         end
       rescue Error::MaxBSONSize, Error::MaxMessageSize => e
+        raise e if values.size <= 1
         split_execute(name, values, server, operation_id, combiner)
       end
     end

data/lib/mongo/client.rb

@@ -33,33 +33,35 @@ module Mongo
     # @since 2.1.2
     VALID_OPTIONS = [
       :auth_mech,
+      :auth_mech_properties,
       :auth_source,
       :connect,
+      :connect_timeout,
       :database,
-      :auth_mech_properties,
       :heartbeat_frequency,
+      :id_generator,
       :local_threshold,
-      :server_selection_timeout,
-      :password,
+      :logger,
       :max_pool_size,
+      :max_read_retries,
       :min_pool_size,
-      :wait_queue_timeout,
-      :connect_timeout,
+      :monitoring,
+      :password,
       :read,
-      :roles,
+      :read_retry_interval,
       :replica_set,
+      :server_selection_timeout,
+      :socket_timeout,
       :ssl,
+      :ssl_ca_cert,
       :ssl_cert,
       :ssl_key,
       :ssl_key_pass_phrase,
       :ssl_verify,
-      :ssl_ca_cert,
-      :socket_timeout,
+      :truncate_logs,
       :user,
-      :write,
-      :monitoring,
-      :logger,
-      :truncate_logs
+      :wait_queue_timeout,
+      :write
     ].freeze
 
     # @return [ Mongo::Cluster ] cluster The cluster of servers for the client.
@@ -160,8 +162,6 @@ module Mongo
     #   and local_threshold.
     #   :mode can be one of :secondary, :secondary_preferred, :primary,
     #   :primary_preferred, :nearest.
-    # @option options [ Array<Hash, String> ] :roles The list of roles for the
-    #   user.
     # @option options [ Symbol ] :replica_set The name of the replica set to
     #   connect to. Servers not in this replica set will be ignored.
     # @option options [ true, false ] :ssl Whether to use SSL.
@@ -180,7 +180,7 @@ module Mongo
     #   execute operations on a socket.
     # @option options [ String ] :user The user name.
     # @option options [ Hash ] :write The write concern options. Can be :w =>
-    #   Integer, :fsync => Boolean, :j => Boolean.
+    #   Integer|String, :fsync => Boolean, :j => Boolean.
     # @option options [ true, false ] :monitoring Initializes a client without
     #   any default monitoring if false is provided.
     # @option options [ Logger ] :logger A custom logger if desired.
@@ -190,6 +190,8 @@ module Mongo
     #   retries on mongos query failures.
     # @option options [ Float ] :read_retry_interval The interval, in seconds,
     #   in which reads on a mongos are retried.
+    # @option options [ Object ] :id_generator A custom object to generate ids
+    #   for documents. Must respond to #generate.
     #
     # @since 2.0.0
     def initialize(addresses_or_uri, options = Options::Redacted.new)

data/lib/mongo/cluster.rb

@@ -131,11 +131,13 @@ module Mongo
     # @example Get the next primary server.
     #   cluster.next_primary
     #
+    # @param [ true, false ] ping Whether to ping the server before selection.
+    #
     # @return [ Mongo::Server ] A primary server.
     #
     # @since 2.0.0
-    def next_primary
-      ServerSelector.get(ServerSelector::PRIMARY.merge(options)).select_server(self)
+    def next_primary(ping = true)
+      ServerSelector.get(ServerSelector::PRIMARY.merge(options)).select_server(self, ping)
     end
 
     # Elect a primary server from the description that has just changed to a

data/lib/mongo/collection.rb

@@ -56,7 +56,7 @@ module Mongo
     # Options that can be updated on a new Collection instance via the #with method.
     #
     # @since 2.1.0
-    CHANGEABLE_OPTIONS = [ :read, :write ]
+    CHANGEABLE_OPTIONS = [ :read, :read_concern, :write ].freeze
 
     # Check if a collection is equal to another object. Will check the name and
     # the database for equality.
@@ -91,6 +91,18 @@ module Mongo
       @options = options.freeze
     end
 
+    # Get the read concern for this collection instance.
+    #
+    # @example Get the read concern.
+    #   collection.read_concern
+    #
+    # @return [ Hash ] The read concern.
+    #
+    # @since 2.2.0
+    def read_concern
+      @read_concern ||= options[:read_concern]
+    end
+
     # Get the read preference on this collection.
     #
     # @example Get the read preference.
@@ -235,6 +247,8 @@ module Mongo
     #   aggregation to run.
     # @option options [ true, false ] :use_cursor Indicates whether the command will request that the server
     #   provide results using a cursor.
+    # @option options [ true, false ] :bypass_document_validation Whether or
+    #   not to skip document level validation.
     #
     # @return [ Aggregation ] The aggregation object.
     #
@@ -326,7 +340,9 @@ module Mongo
           :db_name => database.name,
           :coll_name => name,
           :write_concern => write_concern,
-          :options => options
+          :bypass_document_validation => !!options[:bypass_document_validation],
+          :options => options,
+          :id_generator => client.options[:id_generator]
         ).execute(next_primary.context)
       end
     end
@@ -359,6 +375,8 @@ module Mongo
     #   should be executed in order.
     # @option options [ Hash ] :write_concern The write concern options.
     #   Can be :w => Integer, :fsync => Boolean, :j => Boolean.
+    # @option options [ true, false ] :bypass_document_validation Whether or
+    #   not to skip document level validation.
     #
     # @return [ BulkWrite::Result ] The result of the operation.
     #
@@ -424,6 +442,8 @@ module Mongo
     #
     # @option options [ true, false ] :upsert Whether to upsert if the
     #   document doesn't exist.
+    # @option options [ true, false ] :bypass_document_validation Whether or
+    #   not to skip document level validation.
     #
     # @return [ Result ] The response from the database.
     #
@@ -443,6 +463,8 @@ module Mongo
     #
     # @option options [ true, false ] :upsert Whether to upsert if the
     #   document doesn't exist.
+    # @option options [ true, false ] :bypass_document_validation Whether or
+    #   not to skip document level validation.
     #
     # @return [ Result ] The response from the database.
     #
@@ -462,6 +484,8 @@ module Mongo
     #
     # @option options [ true, false ] :upsert Whether to upsert if the
     #   document doesn't exist.
+    # @option options [ true, false ] :bypass_document_validation Whether or
+    #   not to skip document level validation.
     #
     # @return [ Result ] The response from the database.
     #
@@ -484,6 +508,8 @@ module Mongo
     # @option options [ Hash ] :projection The fields to include or exclude in the returned doc.
     # @option options [ Hash ] :sort The key and direction pairs by which the result set
     #   will be sorted.
+    # @option options [ Hash ] :write_concern The write concern options.
+    #   Defaults to the collection's write concern.
     #
     # @return [ BSON::Document, nil ] The document, if found.
     #
@@ -512,6 +538,10 @@ module Mongo
     #   will be sorted.
     # @option options [ Symbol ] :return_document Either :before or :after.
     # @option options [ true, false ] :upsert Whether to upsert if the document doesn't exist.
+    # @option options [ true, false ] :bypass_document_validation Whether or
+    #   not to skip document level validation.
+    # @option options [ Hash ] :write_concern The write concern options.
+    #   Defaults to the collection's write concern.
     #
     # @return [ BSON::Document ] The document.
     #
@@ -540,6 +570,10 @@ module Mongo
     #   will be sorted.
     # @option options [ Symbol ] :return_document Either :before or :after.
     # @option options [ true, false ] :upsert Whether to upsert if the document doesn't exist.
+    # @option options [ true, false ] :bypass_document_validation Whether or
+    #   not to skip document level validation.
+    # @option options [ Hash ] :write_concern The write concern options.
+    #   Defaults to the collection's write concern.
     #
     # @return [ BSON::Document ] The document.
     #

data/lib/mongo/collection/view.rb

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'mongo/collection/view/builder'
 require 'mongo/collection/view/immutable'
 require 'mongo/collection/view/iterable'
 require 'mongo/collection/view/explainable'
@@ -48,10 +49,11 @@ module Mongo
       include Explainable
       include Writable
 
-      # @return [ View ] The +View+ to query.
+      # @return [ Collection ] The +Collection+ to query.
       attr_reader :collection
-      # @return [ Hash ] The query selector.
-      attr_reader :selector
+
+      # @return [ Hash ] The query filter.
+      attr_reader :filter
 
       # Delegate necessary operations to the collection.
       def_delegators :collection, :client, :cluster, :database, :read_preference, :write_concern
@@ -59,25 +61,27 @@ module Mongo
       # Delegate to the cluster for the next primary.
       def_delegators :cluster, :next_primary
 
+      alias :selector :filter
+
       # Compare two +View+ objects.
       #
       # @example Compare the view with another object.
       #   view == other
       #
-      # @return [ true, false ] Equal if collection, selector, and options of two
+      # @return [ true, false ] Equal if collection, filter, and options of two
       #   +View+ match.
       #
       # @since 2.0.0
       def ==(other)
         return false unless other.is_a?(View)
         collection == other.collection &&
-            selector == other.selector &&
+            filter == other.filter &&
             options == other.options
       end
       alias_method :eql?, :==
 
       # A hash value for the +View+ composed of the collection namespace,
-      # hash of the options and hash of the selector.
+      # hash of the options and hash of the filter.
       #
       # @example Get the hash value.
       #   view.hash
@@ -86,7 +90,7 @@ module Mongo
       #
       # @since 2.0.0
       def hash
-        [ collection.namespace, options.hash, selector.hash ].hash
+        [ collection.namespace, options.hash, filter.hash ].hash
       end
 
       # Creates a new +View+.
@@ -101,7 +105,7 @@ module Mongo
       #   View.new(collection, {:name => 'Emily'}, :read => :secondary_preferred)
       #
       # @param [ Collection ] collection The +Collection+ to query.
-      # @param [ Hash ] selector The query selector.
+      # @param [ Hash ] filter The query filter.
       # @param [ Hash ] options The additional query options.
       #
       # @option options :comment [ String ] Associate a comment with the query.
@@ -125,10 +129,10 @@ module Mongo
       #   results.
       #
       # @since 2.0.0
-      def initialize(collection, selector = {}, options = {})
-        validate_doc!(selector)
+      def initialize(collection, filter = {}, options = {})
+        validate_doc!(filter)
         @collection = collection
-        setup(selector, options)
+        parse_parameters!(BSON::Document.new(filter.freeze), BSON::Document.new(options.freeze))
       end
 
       # Get a human-readable string representation of +View+.
@@ -140,8 +144,8 @@ module Mongo
       #
       # @since 2.0.0
       def inspect
-        "#<Mongo::Collection::View:0x#{object_id} namespace='#{collection.namespace}" +
-            " @selector=#{selector.inspect} @options=#{options.inspect}>"
+        "#<Mongo::Collection::View:0x#{object_id} namespace='#{collection.namespace}'" +
+            " @filter=#{filter.to_s} @options=#{options.to_s}>"
       end
 
       private
@@ -149,19 +153,18 @@ module Mongo
       def initialize_copy(other)
         @collection = other.collection
         @options = other.options.dup
-        @selector = other.selector.dup
+        @filter = other.filter.dup
       end
 
-      def initial_query_op
-        Operation::Read::Query.new(query_spec)
+      def parse_parameters!(filter, options)
+        query = filter.delete(QUERY)
+        modifiers = (filter || {}).merge(options.delete(MODIFIERS) || {})
+        @filter = query || filter
+        @options = Builder::Modifiers.map_driver_options(modifiers).merge!(options)
       end
 
       def new(options)
-        View.new(collection, selector, options)
-      end
-
-      def send_initial_query(server)
-        initial_query_op.execute(server.context)
+        View.new(collection, filter, options)
       end
 
       def view; self; end

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

@@ -39,15 +39,6 @@ module Mongo
         # Delegate necessary operations to the collection.
         def_delegators :collection, :database
 
-        # Options mapping for an aggregation.
-        #
-        # @since 2.1.0
-        OPTIONS_MAP = {
-          :allow_disk_use => :allowDiskUse,
-          :max_time_ms => :maxTimeMS,
-          :explain => :explain
-        }.freeze
-
         # The reroute message.
         #
         # @since 2.1.0
@@ -65,7 +56,7 @@ module Mongo
         #
         # @since 2.0.0
         def allow_disk_use(value = nil)
-          configure(__method__, value)
+          configure(:allow_disk_use, value)
         end
 
         # Initialize the aggregation for the provided collection view, pipeline
@@ -94,41 +85,13 @@ module Mongo
         #
         # @since 2.0.0
         def explain
-          self.class.new(view, pipeline, options.merge(explain_options)).first
+          self.class.new(view, pipeline, options.merge(explain: true)).first
         end
 
         private
 
         def aggregate_spec
-          { :db_name => database.name,
-            :read => read,
-            :selector => {
-              :aggregate => collection.name,
-              :pipeline => pipeline,
-              :cursor => cursor,
-            }.merge!(agg_options)
-          }
-        end
-
-        def agg_options
-          @agg_options ||= options.each.reduce({}) do |opts, (key, value)|
-            OPTIONS_MAP[key] ? opts.merge!(OPTIONS_MAP[key] => value) : opts
-          end
-        end
-
-        def cursor
-          if options[:use_cursor] == true || options[:use_cursor].nil?
-            batch_size_doc
-          end
-        end
-
-        def batch_size_doc
-          (value = options[:batch_size] || view.batch_size) ?
-              { :batchSize => value } : {}
-        end
-
-        def explain_options
-          { :explain => true }
+          Builder::Aggregation.new(pipeline, view, options).specification
         end
 
         def new(options)
@@ -136,7 +99,7 @@ module Mongo
         end
 
         def initial_query_op
-          Operation::Aggregate.new(aggregate_spec)
+          Operation::Commands::Aggregate.new(aggregate_spec)
         end
 
         def valid_server?(server)
@@ -150,7 +113,7 @@ module Mongo
         def send_initial_query(server)
           unless valid_server?(server)
             log_warn(REROUTE)
-            server = cluster.next_primary
+            server = cluster.next_primary(false)
           end
           initial_query_op.execute(server.context)
         end