mongo 2.1.0.beta → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6616ddb03b3417535c99796a74defa18bb90777
-  data.tar.gz: 300c32fe7122805036f67b387f0bb68648a8b759
+  metadata.gz: 0b03a2e7ce5246f9d38690f731f53d29a5469d30
+  data.tar.gz: aaca95e6f570d466155c87d4c549a4f3c5bc0341
 SHA512:
-  metadata.gz: 8046a19889e6f15481690eca65e8696834925bb7c1727a387af1d29e22fc63cb2d2640d5ddebf48e80d641e518dfc5a753d3a79713f655cccbbdba94215da1f3
-  data.tar.gz: 50f48316c5d9b17cb516467609667b5792472dbd0cbd43accc70c62a99ead9bdee595679f9d9b564db865606bbb55d7fc81176dd1669e0abd5c696803bd01132
+  metadata.gz: f6fa180a5c94bcb5d7a809d170c8ec12ec28d0d6035575ef0cc677b9f4c68ec81c26411948f071945b2b2d829b192e0312f29416d2c3a589830c5ee40f90b133
+  data.tar.gz: fce85899375de257592434225cd1db4e3d3971e8b85b6ec111ef30c967e0fa0e817569b843dc0f3c342d7e58749c259a8111cc2b9d741ef321dc335a1ad08bab

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/address/ipv4.rb

@@ -35,6 +35,11 @@ module Mongo
       # @since 2.0.0
       MATCH = Regexp.new('/\./').freeze
 
+      # Split value constant.
+      #
+      # @since 2.1.0
+      SPLIT = ':'.freeze
+
       # Parse an IPv4 address into its host and port.
       #
       # @example Parse the address.
@@ -46,7 +51,7 @@ module Mongo
       #
       # @since 2.0.0
       def self.parse(address)
-        parts = address.split(':')
+        parts = address.split(SPLIT)
         host = parts[0]
         port = (parts[1] || 27017).to_i
         [ host, port ]

data/lib/mongo/address/unix.rb

@@ -60,7 +60,7 @@ module Mongo
       # Get a socket for the provided address type, given the options.
       #
       # @example Get a Unix socket.
-      #   ipv4.socket(5)
+      #   address.socket(5)
       #
       # @param [ Float ] timeout The socket timeout.
       # @param [ Hash ] ssl_options SSL options - ignored.
@@ -69,7 +69,7 @@ module Mongo
       #
       # @since 2.0.0
       def socket(timeout, ssl_options = {})
-        Socket::Unix.new(host, timeout, Socket::AF_UNIX)
+        Socket::Unix.new(host, timeout)
       end
     end
   end

data/lib/mongo/address.rb

@@ -28,10 +28,16 @@ module Mongo
     # Mapping from socket family to resolver class.
     #
     # @since 2.0.0
-    FAMILY_MAP = { ::Socket::PF_UNIX => Unix,
-                   ::Socket::AF_INET6 => IPv6,
-                   ::Socket::AF_INET => IPv4
-                 }
+    FAMILY_MAP = {
+      ::Socket::PF_UNIX => Unix,
+      ::Socket::AF_INET6 => IPv6,
+      ::Socket::AF_INET => IPv4
+    }.freeze
+
+    # The localhost constant.
+    #
+    # @since 2.1.0
+    LOCALHOST = 'localhost'.freeze
 
     # @return [ String ] seed The seed address.
     attr_reader :seed
@@ -57,6 +63,20 @@ module Mongo
       host == other.host && port == other.port
     end
 
+    # Check equality for hashing.
+    #
+    # @example Check hashing equality.
+    #   address.eql?(other)
+    #
+    # @param [ Object ] other The other object.
+    #
+    # @return [ true, false ] If the objects are equal.
+    #
+    # @since 2.2.0
+    def eql?(other)
+      self == other
+    end
+
     # Calculate the hash value for the address.
     #
     # @example Calculate the hash value.
@@ -144,14 +164,16 @@ module Mongo
     private
 
     def initialize_resolver!(timeout, ssl_options)
-      family = (host == 'localhost') ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
+      return Unix.new(seed.downcase) if seed.downcase =~ Unix::MATCH
+
+      family = (host == LOCALHOST) ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
       error = nil
-      ::Socket.getaddrinfo(host, nil, family, ::Socket::SOCK_STREAM).detect do |info|
+      ::Socket.getaddrinfo(host, nil, family, ::Socket::SOCK_STREAM).each do |info|
         begin
-          return FAMILY_MAP[info[4]].new(info[3], port, host).tap do |res|
-            res.socket(timeout, ssl_options).connect!
-          end
-        rescue IOError, SystemCallError => e
+          res = FAMILY_MAP[info[4]].new(info[3], port, host)
+          res.socket(timeout, ssl_options).connect!.close
+          return res
+        rescue IOError, SystemCallError, Error::SocketError => e
           error = e
         end
       end

data/lib/mongo/auth/cr/conversation.rb

@@ -111,7 +111,7 @@ module Mongo
         private
 
         def validate!(reply)
-          raise Unauthorized.new(user) if reply.documents[0]['ok'] != 1
+          raise Unauthorized.new(user) if reply.documents[0][Operation::Result::OK] != 1
           @nonce = reply.documents[0][Auth::NONCE]
           @reply = reply
         end

data/lib/mongo/auth/ldap/conversation.rb

@@ -25,7 +25,7 @@ module Mongo
         # The login message.
         #
         # @since 2.0.0
-        LOGIN = { authenticate: 1, digestPassword: false }.freeze
+        LOGIN = { saslStart: 1, autoAuthorize: 1 }.freeze
 
         # @return [ Protocol::Reply ] reply The current reply in the
         #   conversation.
@@ -63,7 +63,7 @@ module Mongo
           Protocol::Query.new(
             Auth::EXTERNAL,
             Database::COMMAND,
-            LOGIN.merge(user: user.name, password: user.password, mechanism: LDAP::MECHANISM),
+            LOGIN.merge(payload: payload, mechanism: LDAP::MECHANISM),
             limit: -1
           )
         end
@@ -82,8 +82,12 @@ module Mongo
 
         private
 
+        def payload
+          BSON::Binary.new("\x00#{user.name}\x00#{user.password}")
+        end
+
         def validate!(reply)
-          raise Unauthorized.new(user) if reply.documents[0]['ok'] != 1
+          raise Unauthorized.new(user) if reply.documents[0][Operation::Result::OK] != 1
           @reply = reply
         end
       end

data/lib/mongo/auth/scram/conversation.rb

@@ -417,7 +417,7 @@ module Mongo
         #
         # @since 2.0.0
         def without_proof
-          @withoout_proof ||= "c=biws,r=#{rnonce}"
+          @without_proof ||= "c=biws,r=#{rnonce}"
         end
 
         # XOR operation for two strings.
@@ -429,9 +429,15 @@ module Mongo
           first.bytes.zip(second.bytes).map{ |(a,b)| (a ^ b).chr }.join('')
         end
 
+        def compare_digest(a, b)
+          check = a.bytesize ^ b.bytesize
+          a.bytes.zip(b.bytes){ |x, y| check |= x ^ y.to_i }
+          check == 0
+        end
+
         def validate_final_message!(reply)
           validate!(reply)
-          unless verifier == server_signature
+          unless compare_digest(verifier, server_signature)
             raise Error::InvalidSignature.new(verifier, server_signature)
           end
         end
@@ -442,7 +448,7 @@ module Mongo
         end
 
         def validate!(reply)
-          raise Unauthorized.new(user) unless reply.documents[0]['ok'] == 1
+          raise Unauthorized.new(user) unless reply.documents[0][Operation::Result::OK] == 1
           @reply = reply
         end
       end

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

@@ -90,13 +90,34 @@ module Mongo
         def update(user_or_name, options = {})
           user = generate(user_or_name, options)
           Operation::Write::UpdateUser.new(
-              user: user,
-              db_name: database.name
+            user: user,
+            db_name: database.name
           ).execute(next_primary.context)
         end
 
+        # Get info for a particular user in the database.
+        #
+        # @example Get a particular user's info.
+        #   view.info('emily')
+        #
+        # @param [ String ] name The user name.
+        #
+        # @return [ Hash ] A document containing information on a particular user.
+        #
+        # @since 2.1.0
+        def info(name)
+          user_query(name).documents
+        end
+
         private
 
+        def user_query(name)
+          Operation::Commands::UserQuery.new(
+            user_name: name,
+            db_name: database.name
+          ).execute(next_primary.context)
+        end
+
         def generate(user, options)
           user.is_a?(String) ? Auth::User.new({ user: user }.merge(options)) : user
         end

data/lib/mongo/auth/x509/conversation.rb

@@ -83,7 +83,7 @@ module Mongo
         private
 
         def validate!(reply)
-          raise Unauthorized.new(user) if reply.documents[0]['ok'] != 1
+          raise Unauthorized.new(user) if reply.documents[0][Operation::Result::OK] != 1
           @reply = reply
         end
       end

data/lib/mongo/bulk_write/combineable.rb

@@ -0,0 +1,51 @@
+# Copyright (C) 2015 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  class BulkWrite
+
+    # Defines behaviour around combiners
+    #
+    # @api private
+    #
+    # @since 2.1.0
+    module Combineable
+
+      # @return [ Array<Hash, BSON::Document> ] requests The provided requests.
+      attr_reader :requests
+
+      # Create the ordered combiner.
+      #
+      # @api private
+      #
+      # @example Create the ordered combiner.
+      #   OrderedCombiner.new([{ insert_one: { _id: 0 }}])
+      #
+      # @param [ Array<Hash, BSON::Document> ] requests The bulk requests.
+      #
+      # @since 2.1.0
+      def initialize(requests)
+        @requests = requests
+      end
+
+      private
+
+      def combine_requests(ops)
+        requests.reduce(ops) do |operations, request|
+          add(operations, request.keys.first, request.values.first)
+        end
+      end
+    end
+  end
+end

data/lib/mongo/bulk_write/ordered_combiner.rb

@@ -0,0 +1,55 @@
+# Copyright (C) 2015 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  class BulkWrite
+
+    # Combines groups of bulk write operations in order.
+    #
+    # @api private
+    #
+    # @since 2.1.0
+    class OrderedCombiner
+      include Transformable
+      include Validatable
+      include Combineable
+
+      # Combine the requests in order.
+      #
+      # @api private
+      #
+      # @example Combine the requests.
+      #   combiner.combine
+      #
+      # @return [ Array<Hash> ] The combined requests.
+      #
+      # @since 2.1.0
+      def combine
+        combine_requests([])
+      end
+
+      private
+
+      def add(operations, name, document)
+        operations.push({ name => []}) if next_group?(name, operations)
+        operations[-1][name].push(transform(name, document))
+        operations
+      end
+
+      def next_group?(name, operations)
+        !operations[-1] || !operations[-1].key?(name)
+      end
+    end
+  end
+end

data/lib/mongo/bulk_write/result.rb

@@ -13,13 +13,66 @@
 # limitations under the License.
 
 module Mongo
-  module BulkWrite
+  class BulkWrite
 
     # Wraps a series of bulk write operations in a result object.
     #
     # @since 2.0.6
     class Result
 
+      # Constant for number removed.
+      #
+      # @since 2.1.0
+      REMOVED_COUNT = 'n_removed'.freeze
+
+      # Constant for number inserted.
+      #
+      # @since 2.1.0
+      INSERTED_COUNT = 'n_inserted'.freeze
+
+      # Constant for inserted ids.
+      #
+      # @since 2.1.0
+      INSERTED_IDS = 'inserted_ids'.freeze
+
+      # Constant for number matched.
+      #
+      # @since 2.1.0
+      MATCHED_COUNT = 'n_matched'.freeze
+
+      # Constant for number modified.
+      #
+      # @since 2.1.0
+      MODIFIED_COUNT = 'n_modified'.freeze
+
+      # Constant for upserted.
+      #
+      # @since 2.1.0
+      UPSERTED = 'upserted'.freeze
+
+      # Constant for number upserted.
+      #
+      # @since 2.1.0
+      UPSERTED_COUNT = 'n_upserted'.freeze
+
+      # Constant for upserted ids.
+      #
+      # @since 2.1.0
+      UPSERTED_IDS = 'upserted_ids'.freeze
+
+      # The fields contained in the result document returned from executing the
+      # operations.
+      #
+      # @since 2.1.0.
+      FIELDS = [
+        INSERTED_COUNT,
+        REMOVED_COUNT,
+        MODIFIED_COUNT,
+        UPSERTED_COUNT,
+        MATCHED_COUNT,
+        Operation::Result::N
+      ].freeze
+
       # Returns the number of documents deleted.
       #
       # @example Get the number of deleted documents.
@@ -29,7 +82,7 @@ module Mongo
       #
       # @since 2.1.0
       def deleted_count
-        @results[BulkWritable::REMOVED_COUNT]
+        @results[REMOVED_COUNT]
       end
 
       # Create the new result object from the results document.
@@ -53,7 +106,7 @@ module Mongo
       #
       # @since 2.1.0
       def inserted_count
-        @results[BulkWritable::INSERTED_COUNT]
+        @results[INSERTED_COUNT]
       end
 
       # Get the inserted document ids, if the operation has inserts.
@@ -65,7 +118,7 @@ module Mongo
       #
       # @since 2.1.0
       def inserted_ids
-        @results[BulkWritable::INSERTED_IDS]
+        @results[INSERTED_IDS]
       end
 
       # Returns the number of documents matched.
@@ -77,7 +130,7 @@ module Mongo
       #
       # @since 2.1.0
       def matched_count
-        @results[BulkWritable::MATCHED_COUNT]
+        @results[MATCHED_COUNT]
       end
 
       # Returns the number of documents modified.
@@ -89,7 +142,7 @@ module Mongo
       #
       # @since 2.1.0
       def modified_count
-        @results[BulkWritable::MODIFIED_COUNT]
+        @results[MODIFIED_COUNT]
       end
 
       # Returns the number of documents upserted.
@@ -101,7 +154,7 @@ module Mongo
       #
       # @since 2.1.0
       def upserted_count
-        @results[BulkWritable::UPSERTED_COUNT]
+        @results[UPSERTED_COUNT]
       end
 
       # Get the upserted document ids, if the operation has inserts.
@@ -113,7 +166,7 @@ module Mongo
       #
       # @since 2.1.0
       def upserted_ids
-        @results[BulkWritable::UPSERTED_IDS]
+        @results[UPSERTED_IDS]
       end
 
       # Validates the bulk write result.

data/lib/mongo/bulk_write/result_combiner.rb

@@ -0,0 +1,117 @@
+# Copyright (C) 2015 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  class BulkWrite
+
+    # Combines bulk write results together.
+    #
+    # @api private
+    #
+    # @since 2.1.0
+    class ResultCombiner
+
+      # @return [ Integer ] count The count of documents in the entire batch.
+      attr_reader :count
+
+      # @return [ Hash ] results The results hash.
+      attr_reader :results
+
+      # Create the new result combiner.
+      #
+      # @api private
+      #
+      # @example Create the result combiner.
+      #   ResultCombiner.new
+      #
+      # @since 2.1.0
+      def initialize
+        @results = {}
+        @count = 0
+      end
+
+      # Combines a result into the overall results.
+      #
+      # @api private
+      #
+      # @example Combine the result.
+      #   combiner.combine!(result, count)
+      #
+      # @param [ Operation::Result ] result The result to combine.
+      # @param [ Integer ] count The count of requests in the batch.
+      #
+      # @since 2.1.0
+      def combine!(result, count)
+        combine_counts!(result)
+        combine_ids!(result)
+        combine_errors!(result)
+        @count += count
+      end
+
+      # Get the final result.
+      #
+      # @api private
+      #
+      # @example Get the final result.
+      #   combinator.result
+      #
+      # @return [ BulkWrite::Result ] The final result.
+      #
+      # @since 2.1.0
+      def result
+        BulkWrite::Result.new(results).validate!
+      end
+
+      private
+
+      def combine_counts!(result)
+        Result::FIELDS.each do |field|
+          if result.respond_to?(field)
+            results.merge!(field => (results[field] || 0) + result.send(field))
+          end
+        end
+      end
+
+      def combine_ids!(result)
+        if result.respond_to?(Result::INSERTED_IDS)
+          results.merge!(Result::INSERTED_IDS => result.inserted_ids)
+        end
+        if result.respond_to?(Result::UPSERTED)
+          results.merge!(Result::UPSERTED_IDS => result.upserted.map{ |doc| doc['_id'] })
+        end
+      end
+
+      def combine_errors!(result)
+        combine_write_errors!(result)
+        combine_write_concern_errors!(result)
+      end
+
+      def combine_write_errors!(result)
+        if write_errors = result.aggregate_write_errors(count)
+          results.merge!(
+            Error::WRITE_ERRORS => ((results[Error::WRITE_ERRORS] || []) << write_errors).flatten
+          )
+        else
+          result.validate!
+        end
+      end
+
+      def combine_write_concern_errors!(result)
+        if write_concern_errors = result.aggregate_write_concern_errors(count)
+          results.merge!(Error::WRITE_CONCERN_ERRORS => write_concern_errors)
+        end
+      end
+    end
+  end
+end