mongo 2.1.0.beta → 2.2.0

data/lib/mongo/database/view.rb

@@ -50,10 +50,15 @@ module Mongo
       # @since 2.0.0
       def collection_names(options = {})
         @batch_size = options[:batch_size]
-        server = next_primary
+        server = next_primary(false)
+        @limit = -1 if server.features.list_collections_enabled?
         collections_info(server).collect do |info|
-          server.context.features.list_collections_enabled? ?
-            info['name'] : info['name'].sub("#{@database.name}.", '')
+          if server.features.list_collections_enabled?
+            info[Database::NAME]
+          else
+            (info[Database::NAME] &&
+              info[Database::NAME].sub("#{@database.name}.", ''))
+          end
         end
       end
 
@@ -66,7 +71,7 @@ module Mongo
       #
       # @since 2.0.5
       def list_collections
-        collections_info(next_primary)
+        collections_info(next_primary(false))
       end
 
       # Create the new database view.
@@ -80,7 +85,7 @@ module Mongo
       def initialize(database)
         @database = database
         @batch_size =  nil
-        @limit = -1
+        @limit = nil
         @collection = @database[Database::COMMAND]
       end
 
@@ -102,7 +107,7 @@ module Mongo
       end
 
       def initial_query_op
-        Operation::Read::CollectionsInfo.new(collections_info_spec)
+        Operation::Commands::CollectionsInfo.new(collections_info_spec)
       end
 
       def send_initial_query(server)

data/lib/mongo/database.rb

@@ -36,7 +36,17 @@ module Mongo
     # The default database options.
     #
     # @since 2.0.0
-    DEFAULT_OPTIONS = { :database => ADMIN }.freeze
+    DEFAULT_OPTIONS = Options::Redacted.new(:database => ADMIN).freeze
+
+    # Database name field constant.
+    #
+    # @since 2.1.0
+    NAME = 'name'.freeze
+
+    # Databases constant.
+    #
+    # @since 2.1.0
+    DATABASES = 'databases'.freeze
 
     # The name of the collection that holds all the collection names.
     #
@@ -138,9 +148,9 @@ module Mongo
     #
     # @return [ Hash ] The result of the command execution.
     def command(operation, opts = {})
-      preference = opts[:read] ? ServerSelector.get(opts[:read], options) : read_preference
-      server = preference.select_server(cluster)
-      Operation::Command.new({
+      preference = ServerSelector.get(client.options.merge(opts[:read])) if opts[:read]
+      server = preference ? preference.select_server(cluster, false) : cluster.next_primary(false)
+      Operation::Commands::Command.new({
         :selector => operation,
         :db_name => name,
         :options => { :limit => -1 },
@@ -196,11 +206,11 @@ module Mongo
     # @example Get the GridFS.
     #   database.fs
     #
-    # @return [ Grid::FS ] The GridFS for the database.
+    # @return [ Grid::FSBucket ] The GridFS for the database.
     #
     # @since 2.0.0
     def fs(options = {})
-      Grid::FS.new(self, options)
+      Grid::FSBucket.new(self, options)
     end
 
     # Get the user view for this database.

data/lib/mongo/dbref.rb

@@ -53,8 +53,8 @@ module Mongo
     #
     # @since 2.1.0
     def as_json(*args)
-      document = { '$ref' => collection, '$id' => id }
-      document.merge!('$db' => database) if database
+      document = { COLLECTION => collection, ID => id }
+      document.merge!(DATABASE => database) if database
       document
     end
 
@@ -79,30 +79,30 @@ module Mongo
     # @example Convert the DBRef to raw BSON.
     #   dbref.to_bson
     #
-    # @param [ String ] encoded The encoded BSON to append to.
+    # @param [ String ] buffer The encoded BSON buffer to append to.
     #
     # @return [ String ] The raw BSON.
     #
     # @since 2.1.0
-    def to_bson(encoded = ''.force_encoding(BSON::BINARY))
-      as_json.to_bson(encoded)
+    def to_bson(buffer = BSON::ByteBuffer.new)
+      as_json.to_bson(buffer)
     end
 
     module ClassMethods
 
       # Deserialize the hash from BSON, converting to a DBRef if appropriate.
       #
-      # @param [ IO ] bson The bson representing a hash.
+      # @param [ String ] buffer The bson representing a hash.
       #
       # @return [ Hash, DBRef ] The decoded hash or DBRef.
       #
       # @see http://bsonspec.org/#/specification
       #
       # @since 2.0.0
-      def from_bson(bson)
+      def from_bson(buffer)
         decoded = super
-        if ref = decoded['$ref']
-          decoded = DBRef.new(ref, decoded['$id'], decoded['$db'])
+        if ref = decoded[COLLECTION]
+          decoded = DBRef.new(ref, decoded[ID], decoded[DATABASE])
         end
         decoded
       end

data/lib/mongo/{bulk_write/unordered_bulk_write.rb → error/closed_stream.rb}

@@ -13,30 +13,21 @@
 # limitations under the License.
 
 module Mongo
-  module BulkWrite
+  class Error
 
-    # Encapsulates behaviour around an unordered bulk write operation.
+    # Raised if the GridFS::Stream object is closed and an operation is attempted.
     #
-    # @since 2.0.0
-    class UnorderedBulkWrite
-      include BulkWritable
+    # @since 2.1.0
+    class ClosedStream < Error
 
-      private
-
-      def ordered?
-        false
-      end
-
-      def merged_ops
-        merge_consecutive_ops(merge_ops_by_type)
-      end
-
-      def process(result, indexes)
-        combine_results(result, indexes)
-      end
-
-      def finalize
-        Result.new(@results).validate!
+      # Create the new exception.
+      #
+      # @example Create the new exception.
+      #   Mongo::Error::ClosedStream.new
+      #
+      # @since 2.1.0
+      def initialize
+        super("The stream is closed and cannot be written to or read from.")
       end
     end
   end

data/lib/mongo/{bulk_write/ordered_bulk_write.rb → error/extra_file_chunk.rb}

@@ -13,35 +13,21 @@
 # limitations under the License.
 
 module Mongo
-  module BulkWrite
+  class Error
 
-    # Encapsulates behaviour around an ordered bulk write operation.
+    # Raised if an extra chunk is found.
     #
-    # @since 2.0.0
-    class OrderedBulkWrite
-      include BulkWritable
-
-      private
-
-      def ordered?
-        true
-      end
-
-      def merged_ops
-        merge_consecutive_ops(@operations)
-      end
-
-      def process(result, indexes)
-        combine_results(result, indexes)
-        raise Error::BulkWriteError.new(@results) if stop?
-      end
-
-      def stop?
-        @results.keys.include?(Error::WRITE_ERRORS)
-      end
-
-      def finalize
-        Result.new(@results).validate!
+    # @since 2.1.0
+    class ExtraFileChunk < Error
+
+      # Create the new exception.
+      #
+      # @example Create the new exception.
+      #   Mongo::Error::ExtraFileChunk.new
+      #
+      # @since 2.1.0
+      def initialize
+        super("Extra file chunk found.")
       end
     end
   end

data/lib/mongo/error/file_not_found.rb

@@ -0,0 +1,37 @@
+# Copyright (C) 2014-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 Error
+
+    # Raised if a file is deleted from a GridFS but it is not found.
+    #
+    # @since 2.1.0
+    class FileNotFound < Error
+
+      # Create the new exception.
+      #
+      # @example Create the new exception.
+      #   Mongo::Error::FileNotFound.new(id, :id)
+      #
+      # @param [ Object ] value The property value used to find the file.
+      # @param [ String, Symbol ] property The name of the property used to find the file.
+      #
+      # @since 2.1.0
+      def initialize(value, property)
+        super("File with #{property} '#{value}' not found.")
+      end
+    end
+  end
+end

data/lib/mongo/error/invalid_file.rb

@@ -21,9 +21,9 @@ module Mongo
     # @since 2.0.0
     class InvalidFile < Error
 
-      # Create the nex exception.
+      # Create the new exception.
       #
-      # @example Create the mew exception.
+      # @example Create the new exception.
       #   Mongo::Error::InvalidFile.new(file_md5, server_md5)
       #
       # @param [ String ] client_md5 The client side file md5.

data/lib/mongo/error/invalid_file_revision.rb

@@ -0,0 +1,37 @@
+# Copyright (C) 2014-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 Error
+
+    # Raised if the requested file revision is not found.
+    #
+    # @since 2.1.0
+    class InvalidFileRevision < Error
+
+      # Create the new exception.
+      #
+      # @example Create the new exception.
+      #   Mongo::Error::InvalidFileRevision.new('some-file.txt', 3)
+      #
+      # @param [ String ] filename The name of the file.
+      # @param [ Integer ] revision The requested revision.
+      #
+      # @since 2.1.0
+      def initialize(filename, revision)
+        super("No revision #{revision} found for file '#{filename}'.")
+      end
+    end
+  end
+end

data/lib/mongo/error/invalid_uri.rb

@@ -27,10 +27,11 @@ module Mongo
       #   Mongo::Error::InvalidURI.new(uri)
       #
       # @since 2.0.0
-      def initialize(uri)
-        super("MongoDB URI must be in the following format: #{Mongo::URI::FORMAT}\n" +
-        "Please see the following URL for more information: #{Mongo::URI::HELP}\n" +
-        "Bad URI: #{uri}")
+      def initialize(uri, details)
+        super("Bad URI: #{uri}\n" +
+        "#{details}\n" +
+        "MongoDB URI must be in the following format: #{Mongo::URI::FORMAT}\n" +
+        "Please see the following URL for more information: #{Mongo::URI::HELP}\n")
       end
     end
   end

data/lib/mongo/error/invalid_write_concern.rb

@@ -0,0 +1,35 @@
+# Copyright (C) 2014-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 Error
+
+    # Raised when an invalid write concern is provided.
+    #
+    # @since 2.2.0
+    class InvalidWriteConcern < Error
+
+      # Instantiate the new exception.
+      #
+      # @example Instantiate the exception.
+      #   Mongo::Error::InvalidWriteConcern.new
+      #
+      # @since 2.2.0
+      def initialize
+        super('Invalid write concern options. If w is an Integer, it must be greater than or equal to 0. ' +
+              'If w is 0, it cannot be combined with a true value for fsync or j (journal).')
+      end
+    end
+  end
+end

data/lib/mongo/error/missing_file_chunk.rb

@@ -0,0 +1,38 @@
+# Copyright (C) 2014-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 Error
+
+    # Raised if the next chunk when reading from a GridFSBucket does not have the
+    # expected sequence number (n).
+    #
+    # @since 2.1.0
+    class MissingFileChunk < Error
+
+      # Create the new exception.
+      #
+      # @example Create the new exception.
+      #   Mongo::Error::MissingFileChunk.new(expected_n, chunk)
+      #
+      # @param [ Integer ] expected_n The expected index value.
+      # @param [ Grid::File::Chunk ] chunk The chunk read from GridFS.
+      #
+      # @since 2.1.0
+      def initialize(expected_n, chunk)
+        super("Unexpected chunk in sequence. Expected next chunk to have index #{expected_n} but it has index #{chunk.n}")
+      end
+    end
+  end
+end

data/lib/mongo/error/operation_failure.rb

@@ -15,9 +15,40 @@
 module Mongo
   class Error
 
-    # Raised when a command failes for some reason.
+    # Raised when an operation fails for some reason.
     #
     # @since 2.0.0
-    class OperationFailure < Error; end
+    class OperationFailure < Error
+
+      # These are magic error messages that could indicate a cluster
+      # reconfiguration behind a mongos. We cannot check error codes as they
+      # change between versions, for example 15988 which has 2 completely
+      # different meanings between 2.4 and 3.0.
+      #
+      # @since 2.1.1
+      RETRY_MESSAGES = [
+        'transport error',
+        'socket exception',
+        "can't connect",
+        'no master',
+        'not master',
+        'connect failed',
+        'error querying',
+        'could not get last error',
+        'connection attempt failed'
+      ].freeze
+
+      # Can the operation that caused the error be retried?
+      #
+      # @example Is the error retryable?
+      #   error.retryable?
+      #
+      # @return [ true, false ] If the error is retryable.
+      #
+      # @since 2.1.1
+      def retryable?
+        RETRY_MESSAGES.any?{ |m| message.include?(m) }
+      end
+    end
   end
 end

data/lib/mongo/error/unchangeable_collection_option.rb

@@ -0,0 +1,38 @@
+# Copyright (C) 2014-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 Error
+
+    # Raised if a new collection is created from an existing one and options other than the
+    # changeable ones are provided.
+    #
+    # @since 2.1.0
+    class UnchangeableCollectionOption < Error
+
+      # Create the new exception.
+      #
+      # @example Create the new exception.
+      #   Mongo::Error::UnchangeableCollectionOption.new(option)
+      #
+      # @param [ String, Symbol ] option The option that was attempted to be changed.
+      #
+      # @since 2.1.0
+      def initialize(option)
+        super("The option #{option} cannot be set on a new collection instance." +
+                  " The options that can be updated are #{Collection::CHANGEABLE_OPTIONS}")
+      end
+    end
+  end
+end

data/lib/mongo/error/unexpected_chunk_length.rb

@@ -0,0 +1,39 @@
+# Copyright (C) 2014-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 Error
+
+    # Raised if the next chunk when reading from a GridFSBucket does not have the
+    # expected length.
+    #
+    # @since 2.1.0
+    class UnexpectedChunkLength < Error
+
+      # Create the new exception.
+      #
+      # @example Create the new exception.
+      #   Mongo::Error::UnexpectedChunkLength.new(expected_len, chunk)
+      #
+      # @param [ Integer ] expected_len The expected length.
+      # @param [ Grid::File::Chunk ] chunk The chunk read from GridFS.
+      #
+      # @since 2.1.0
+      def initialize(expected_len, chunk)
+        super("Unexpected chunk length. Chunk has length #{chunk.data.data.size} but expected length " +
+          "#{expected_len} or for it to be the last chunk in the sequence.")
+      end
+    end
+  end
+end

data/lib/mongo/error.rb

@@ -67,6 +67,9 @@ end
 
 require 'mongo/error/parser'
 require 'mongo/error/bulk_write_error'
+require 'mongo/error/closed_stream'
+require 'mongo/error/extra_file_chunk'
+require 'mongo/error/file_not_found'
 require 'mongo/error/operation_failure'
 require 'mongo/error/invalid_bulk_operation'
 require 'mongo/error/invalid_bulk_operation_type'
@@ -74,12 +77,14 @@ require 'mongo/error/invalid_collection_name'
 require 'mongo/error/invalid_database_name'
 require 'mongo/error/invalid_document'
 require 'mongo/error/invalid_file'
+require 'mongo/error/invalid_file_revision'
 require 'mongo/error/invalid_nonce'
 require 'mongo/error/invalid_replacement_document'
 require 'mongo/error/invalid_server_preference'
 require 'mongo/error/invalid_signature'
 require 'mongo/error/invalid_update_document'
 require 'mongo/error/invalid_uri'
+require 'mongo/error/invalid_write_concern'
 require 'mongo/error/max_bson_size'
 require 'mongo/error/max_message_size'
 require 'mongo/error/multi_index_drop'
@@ -87,4 +92,7 @@ require 'mongo/error/need_primary_server'
 require 'mongo/error/no_server_available'
 require 'mongo/error/socket_error'
 require 'mongo/error/socket_timeout_error'
+require 'mongo/error/unchangeable_collection_option'
+require 'mongo/error/unexpected_chunk_length'
+require 'mongo/error/missing_file_chunk'
 require 'mongo/error/unsupported_features'

data/lib/mongo/grid/file/chunk.rb

@@ -128,13 +128,13 @@ module Mongo
         # @example Convert the chunk to BSON.
         #   chunk.to_bson
         #
-        # @param [ String ] encoded The encoded data to append to.
+        # @param [ String ] buffer The encoded data buffer to append to.
         #
         # @return [ String ] The raw BSON data.
         #
         # @since 2.0.0
-        def to_bson(encoded = ''.force_encoding(BSON::BINARY))
-          document.to_bson(encoded)
+        def to_bson(buffer = BSON::ByteBuffer.new)
+          document.to_bson(buffer)
         end
 
         class << self
@@ -160,17 +160,17 @@ module Mongo
           #   Chunks.split(data)
           #
           # @param [ String ] data The raw bytes.
-          # @param [ Metadata ] metadata The file metadata.
+          # @param [ File::Info ] file_info The files collection file doc.
           #
           # @return [ Array<Chunk> ] The chunks of the data.
           #
           # @since 2.0.0
-          def split(data, metadata)
-            chunks, index, n = [], 0, 0
+          def split(data, file_info, offset = 0)
+            chunks, index, n = [], 0, offset
             while index < data.length
-              bytes = data.slice(index, metadata.chunk_size)
-              metadata.md5.update(bytes)
-              chunk = Chunk.new(:data => BSON::Binary.new(bytes), :files_id => metadata.id, :n => n)
+              bytes = data.slice(index, file_info.chunk_size)
+              file_info.md5.update(bytes)
+              chunk = Chunk.new(:data => BSON::Binary.new(bytes), :files_id => file_info.id, :n => n)
               chunks.push(chunk)
               index += bytes.length
               n += 1