mongo 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 391a49fc68da96ed3daf59dae9e7006edd6eb7c4
-  data.tar.gz: c9b0c470d42785c446fa2c2ae21273bd45f487ea
+  metadata.gz: d2c9b3e878a211c1145f6cbe09912ac0fa3c6463
+  data.tar.gz: d18c8e33629e8915fab3fb76edefb8cc631f65af
 SHA512:
-  metadata.gz: b77002840a210f7bf8c98114529edd2d0a8891dc6518fcd3c3d1337b2648cf2b31b9d3564aab8ab404521232713a452986cfd6202bdaa69c06fde024305befbe
-  data.tar.gz: 146937702a43742e5e678845431b61b071c6b3573084dac4f7cb196f3ec601c97d78a248c39c1066a5fd7860f6195a72837210f6b8bdd84b7b6ed03328063f24
+  metadata.gz: a6ded8b81178ac9561d5f9a3a8ec83edb31dec5528b8365e83f7d24b1b673e23276c1061956db19879d10feb602dacfeb34bbc7f51e5875fd4593ebfea0aa1c0
+  data.tar.gz: 9431cb7dbb2b2b6a18292f454d84835ddbcee391f2a886bd93d398d3f9190a199f9d7a0f6fc2fc27eb95d32b59d900e6fc09317c2b66ec797fc12a42dabaf87c

checksums.yaml.gz.sig

@@ -1,2 +1,5 @@
-����A�
-,
b>�:K�8IM�ASK�yKp@g�pon/�6��U�ŐYm1|f=�0��K%(n
+�"W5c��a�A��S��
+� !~���G	�7U`A��K�$�
+pno�c��)o��u�� �$��
++
++I#W�
��l5���̿�:F��D;��#QnG��*OP:b�[Hٲ+�4�}�V�o}�).�kͯDjݦ�U�|)_�P@<a2*��'���N��!��)��ڴ8�dH>

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
@@ -144,14 +150,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::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

@@ -0,0 +1,191 @@
+# 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
+
+    # 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.
+      #   result.deleted_count
+      #
+      # @return [ Integer ] The number deleted.
+      #
+      # @since 2.1.0
+      def deleted_count
+        @results[REMOVED_COUNT]
+      end
+
+      # Create the new result object from the results document.
+      #
+      # @example Create the new result.
+      #   Result.new({ 'n_inserted' => 10 })
+      #
+      # @param [ BSON::Document, Hash ] results The results document.
+      #
+      # @since 2.1.0
+      def initialize(results)
+        @results = results
+      end
+
+      # Returns the number of documents inserted.
+      #
+      # @example Get the number of inserted documents.
+      #   result.inserted_count
+      #
+      # @return [ Integer ] The number inserted.
+      #
+      # @since 2.1.0
+      def inserted_count
+        @results[INSERTED_COUNT]
+      end
+
+      # Get the inserted document ids, if the operation has inserts.
+      #
+      # @example Get the inserted ids.
+      #   result.inserted_ids
+      #
+      # @return [ Array<BSON::ObjectId> ] The inserted ids.
+      #
+      # @since 2.1.0
+      def inserted_ids
+        @results[INSERTED_IDS]
+      end
+
+      # Returns the number of documents matched.
+      #
+      # @example Get the number of matched documents.
+      #   result.matched_count
+      #
+      # @return [ Integer ] The number matched.
+      #
+      # @since 2.1.0
+      def matched_count
+        @results[MATCHED_COUNT]
+      end
+
+      # Returns the number of documents modified.
+      #
+      # @example Get the number of modified documents.
+      #   result.modified_count
+      #
+      # @return [ Integer ] The number modified.
+      #
+      # @since 2.1.0
+      def modified_count
+        @results[MODIFIED_COUNT]
+      end
+
+      # Returns the number of documents upserted.
+      #
+      # @example Get the number of upserted documents.
+      #   result.upserted_count
+      #
+      # @return [ Integer ] The number upserted.
+      #
+      # @since 2.1.0
+      def upserted_count
+        @results[UPSERTED_COUNT]
+      end
+
+      # Get the upserted document ids, if the operation has inserts.
+      #
+      # @example Get the upserted ids.
+      #   result.upserted_ids
+      #
+      # @return [ Array<BSON::ObjectId> ] The upserted ids.
+      #
+      # @since 2.1.0
+      def upserted_ids
+        @results[UPSERTED_IDS]
+      end
+
+      # Validates the bulk write result.
+      #
+      # @example Validate the result.
+      #   result.validate!
+      #
+      # @raise [ Error::BulkWriteError ] If the result contains errors.
+      #
+      # @return [ Result ] The result.
+      #
+      # @since 2.1.0
+      def validate!
+        if @results[Error::WRITE_ERRORS] || @results[Error::WRITE_CONCERN_ERRORS]
+          raise Error::BulkWriteError.new(@results)
+        else
+          self
+        end
+      end
+    end
+  end
+end

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