mongo 2.1.0.beta → 2.1.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6616ddb03b3417535c99796a74defa18bb90777
-  data.tar.gz: 300c32fe7122805036f67b387f0bb68648a8b759
+  metadata.gz: 3a265ed462b59e6b5130e74d96dcd8fd03bd1cf8
+  data.tar.gz: df80f1545fc13f8cbbbaa41b7b2994a396eea58d
 SHA512:
-  metadata.gz: 8046a19889e6f15481690eca65e8696834925bb7c1727a387af1d29e22fc63cb2d2640d5ddebf48e80d641e518dfc5a753d3a79713f655cccbbdba94215da1f3
-  data.tar.gz: 50f48316c5d9b17cb516467609667b5792472dbd0cbd43accc70c62a99ead9bdee595679f9d9b564db865606bbb55d7fc81176dd1669e0abd5c696803bd01132
+  metadata.gz: f8fda95db660cc8690ebb838e7bc037614b34c67e03cb8a397dc9c467acbc27d2b8b39ff9af9ec396a03d86ab4e818dd4f3a333744e2727b7e0612d7e7069f30
+  data.tar.gz: 5845e5ca349dea175a1001e696d0df2600578cb7163bd236eefa4700f9492ee247feccbd46f9c2ef5e1400e31050629738820c824da69fe25f70dff4f86b7465

data/Rakefile

@@ -29,8 +29,8 @@ namespace :spec do
 end
 
 task :release => :spec do
-  system "git tag -a #{Mongo::VERSION} -m 'Tagging release: #{Mongo::VERSION}'"
-  system "git push --tags"
+  #system "git tag -a #{Mongo::VERSION} -m 'Tagging release: #{Mongo::VERSION}'"
+  #system "git push --tags"
   system "gem build mongo.gemspec"
   system "gem push mongo-#{Mongo::VERSION}.gem"
   system "rm mongo-#{Mongo::VERSION}.gem"

data/lib/mongo.rb

@@ -15,14 +15,14 @@
 require 'forwardable'
 require 'bson'
 require 'openssl'
-require 'mongo/monitoring'
 require 'mongo/loggable'
+require 'mongo/monitoring'
 require 'mongo/logger'
+require 'mongo/operation'
 require 'mongo/error'
 require 'mongo/event'
 require 'mongo/address'
 require 'mongo/auth'
-require 'mongo/bulk_write'
 require 'mongo/client'
 require 'mongo/cluster'
 require 'mongo/collection'
@@ -31,7 +31,6 @@ require 'mongo/database'
 require 'mongo/dbref'
 require 'mongo/grid'
 require 'mongo/index'
-require 'mongo/operation'
 require 'mongo/options'
 require 'mongo/protocol'
 require 'mongo/server'

data/lib/mongo/address.rb

@@ -144,14 +144,16 @@ module Mongo
     private
 
     def initialize_resolver!(timeout, ssl_options)
+      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/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/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,6 +82,10 @@ 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
           @reply = reply

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

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

@@ -95,8 +95,29 @@ module Mongo
           ).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/bulk_write.rb

@@ -12,42 +12,174 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/bulk_write/bulk_writable'
-require 'mongo/bulk_write/ordered_bulk_write'
-require 'mongo/bulk_write/unordered_bulk_write'
 require 'mongo/bulk_write/result'
+require 'mongo/bulk_write/transformable'
+require 'mongo/bulk_write/validatable'
+require 'mongo/bulk_write/combineable'
+require 'mongo/bulk_write/ordered_combiner'
+require 'mongo/bulk_write/unordered_combiner'
+require 'mongo/bulk_write/result_combiner'
 
 module Mongo
-  module BulkWrite
-    extend self
+  class BulkWrite
+    extend Forwardable
 
-    # Get a bulk write object either of type ordered or unordered.
+    # @return [ Mongo::Collection ] collection The collection.
+    attr_reader :collection
+
+    # @return [ Array<Hash, BSON::Document> ] requests The requests.
+    attr_reader :requests
+
+    # @return [ Hash, BSON::Document ] options The options.
+    attr_reader :options
+
+    # Delegate various methods to the collection.
+    def_delegators :@collection, :database, :cluster, :next_primary
+
+    # Execute the bulk write operation.
+    #
+    # @example Execute the bulk write.
+    #   bulk_write.execute
+    #
+    # @return [ Mongo::BulkWrite::Result ] The result.
+    #
+    # @since 2.1.0
+    def execute
+      server = next_primary
+      operation_id = Monitoring.next_operation_id
+      result_combiner = ResultCombiner.new
+      operations.each do |operation|
+        execute_operation(
+          operation.keys.first,
+          operation.values.first,
+          server,
+          operation_id,
+          result_combiner
+        )
+      end
+      result_combiner.result
+    end
+
+    # Create the new bulk write operation.
     #
-    # @example Get a bulk write object.
-    #   Mongo::BulkWrite.get(collection, operations, ordered: true)
+    # @api private
     #
-    # @param [ Collection ] collection The collection on which the operations
-    #   will be executed.
+    # @example Create an ordered bulk write.
+    #   Mongo::BulkWrite.new(collection, [{ insert_one: { _id: 1 }}])
     #
-    # @param [ Array<Hash> ] operations The operations to execute.
+    # @example Create an unordered bulk write.
+    #   Mongo::BulkWrite.new(collection, [{ insert_one: { _id: 1 }}], ordered: false)
     #
-    # @param [ Hash ] options The options for the bulk write object.
+    # @example Create an ordered mixed bulk write.
+    #   Mongo::BulkWrite.new(
+    #     collection,
+    #     [
+    #       { insert_one: { _id: 1 }},
+    #       { update_one: { filter: { _id: 0 }, update: { '$set' => { name: 'test' }}}},
+    #       { delete_one: { filter: { _id: 2 }}}
+    #     ]
+    #   )
+    #
+    # @param [ Mongo::Collection ] collection The collection.
+    # @param [ Array<Hash, BSON::Document> ] requests The requests.
+    # @param [ Hash, BSON::Document ] options The options.
+    #
+    # @since 2.1.0
+    def initialize(collection, requests, options = {})
+      @collection = collection
+      @requests = requests
+      @options = options || {}
+    end
+
+    # Is the bulk write ordered?
+    #
+    # @api private
+    #
+    # @example Is the bulk write ordered?
+    #   bulk_write.ordered?
+    #
+    # @return [ true, false ] If the bulk write is ordered.
+    #
+    # @since 2.1.0
+    def ordered?
+      @ordered ||= options.fetch(:ordered, true)
+    end
+
+    # Get the write concern for the bulk write.
     #
-    # @option options [ true, false ] :ordered Whether the operations
-    #   should be executed in order.
-    # @option options [ Hash ] :write_concern The write concern options.
-    #   Can be :w => Integer, :fsync => Boolean, :j => Boolean.
+    # @api private
     #
-    # @return [ OrderedBulkWrite, UnorderedBulkWrite ] The appropriate bulk
-    #   write object.
+    # @example Get the write concern.
+    #   bulk_write.write_concern
     #
-    # @since 2.0.0
-    def get(collection, operations, options)
-      if options.fetch(:ordered, true)
-        OrderedBulkWrite.new(collection, operations, options)
+    # @return [ WriteConcern ] The write concern.
+    #
+    # @since 2.1.0
+    def write_concern
+      @write_concern ||= options[:write_concern] ?
+        WriteConcern.get(options[:write_concern]) : collection.write_concern
+    end
+
+    private
+
+    def base_spec(operation_id)
+      {
+        :db_name => database.name,
+        :coll_name => collection.name,
+        :write_concern => write_concern,
+        :ordered => ordered?,
+        :operation_id => operation_id
+      }
+    end
+
+    def execute_operation(name, values, server, operation_id, combiner)
+      begin
+        if values.size > server.max_write_batch_size
+          split_execute(name, values, server, operation_id, combiner)
+        else
+          combiner.combine!(send(name, values, server, operation_id), values.size)
+        end
+      rescue Error::MaxBSONSize, Error::MaxMessageSize => e
+        split_execute(name, values, server, operation_id, combiner)
+      end
+    end
+
+    def operations
+      if ordered?
+        OrderedCombiner.new(requests).combine
       else
-        UnorderedBulkWrite.new(collection, operations, options)
+        UnorderedCombiner.new(requests).combine
       end
     end
+
+    def split_execute(name, values, server, operation_id, combiner)
+      execute_operation(name, values.shift(values.size / 2), server, operation_id, combiner)
+      execute_operation(name, values, server, operation_id, combiner)
+    end
+
+    def delete(documents, server, operation_id)
+      Operation::Write::Bulk::Delete.new(
+        base_spec(operation_id).merge(:deletes => documents)
+      ).execute(server.context)
+    end
+
+    alias :delete_one :delete
+    alias :delete_many :delete
+
+    def insert_one(documents, server, operation_id)
+      Operation::Write::Bulk::Insert.new(
+        base_spec(operation_id).merge(:documents => documents)
+      ).execute(server.context)
+    end
+
+    def update(documents, server, operation_id)
+      Operation::Write::Bulk::Update.new(
+        base_spec(operation_id).merge(:updates => documents)
+      ).execute(server.context)
+    end
+
+    alias :replace_one :update
+    alias :update_one :update
+    alias :update_many :update
   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