mongo 2.1.0.beta → 2.1.0.rc0

data/lib/mongo/cursor.rb

@@ -118,7 +118,11 @@ module Mongo
     end
 
     def kill_cursors_spec
-      { :cursor_ids => [ @cursor_id ]}
+      {
+        :coll_name => @coll_name || collection.name,
+        :db_name => database.name,
+        :cursor_ids => [ @cursor_id ]
+      }
     end
 
     def limited?

data/lib/mongo/database.rb

@@ -138,7 +138,7 @@ module Mongo
     #
     # @return [ Hash ] The result of the command execution.
     def command(operation, opts = {})
-      preference = opts[:read] ? ServerSelector.get(opts[:read], options) : read_preference
+      preference = opts[:read] ? ServerSelector.get(opts[:read].merge(options)) : read_preference
       server = preference.select_server(cluster)
       Operation::Command.new({
         :selector => operation,
@@ -196,11 +196,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/database/view.rb

@@ -102,7 +102,7 @@ module Mongo
       end
 
       def initial_query_op
-        Operation::Read::CollectionsInfo.new(collections_info_spec)
+        Operation::CollectionsInfo.new(collections_info_spec)
       end
 
       def send_initial_query(server)

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,6 +77,7 @@ 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'
@@ -87,4 +91,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/{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/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,7 +15,7 @@
 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

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/grid.rb

@@ -13,4 +13,5 @@
 # limitations under the License.
 
 require 'mongo/grid/file'
-require 'mongo/grid/fs'
+require 'mongo/grid/fs_bucket'
+require 'mongo/grid/stream'

data/lib/mongo/grid/file.rb

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 require 'mongo/grid/file/chunk'
-require 'mongo/grid/file/metadata'
+require 'mongo/grid/file/info'
 
 module Mongo
   module Grid
@@ -24,8 +24,8 @@ module Mongo
     class File
       extend Forwardable
 
-      # Delegate to metadata for convenience.
-      def_delegators :metadata, :chunk_size, :content_type, :filename, :id, :md5, :upload_date
+      # Delegate to file info for convenience.
+      def_delegators :info, :chunk_size, :content_type, :filename, :id, :md5, :upload_date
 
       # @return [ Array<Chunk> ] chunks The file chunks.
       attr_reader :chunks
@@ -33,8 +33,8 @@ module Mongo
       # @return [ IO ] data The raw data for the file.
       attr_reader :data
 
-      # @return [ Metadata ] metadata The file metadata.
-      attr_reader :metadata
+      # @return [ File::Info ] info The file information.
+      attr_reader :info
 
       # Check equality of files.
       #
@@ -48,7 +48,7 @@ module Mongo
       # @since 2.0.0
       def ==(other)
         return false unless other.is_a?(File)
-        chunks == other.chunks && data == other.data && metadata == other.metadata
+        chunks == other.chunks && data == other.data && info == other.info
       end
 
       # Initialize the file.
@@ -58,17 +58,20 @@ module Mongo
       #
       # @param [ IO, Array<BSON::Document> ] data The file or IO object or
       #   chunks.
-      # @param [ BSON::Document, Hash ] options The metadata options.
+      # @param [ BSON::Document, Hash ] options The info options.
       #
       # @option options [ String ] :filename Required name of the file.
       # @option options [ String ] :content_type The content type of the file.
+      #   Deprecated, please use the metadata document instead.
       # @option options [ String ] :metadata Optional file metadata.
       # @option options [ Integer ] :chunk_size Override the default chunk
       #   size.
+      # @option opts [ Array<String> ] :aliases A list of aliases.
+      #   Deprecated, please use the metadata document instead.
       #
       # @since 2.0.0
       def initialize(data, options = {})
-        @metadata = Metadata.new({ :length => data.length }.merge(options))
+        @info = Info.new(options.merge(:length => data.length))
         initialize_chunks!(data)
       end
 
@@ -97,7 +100,7 @@ module Mongo
           @chunks = chks
           @data = Chunk.assemble(chks)
         else
-          @chunks = Chunk.split(value, metadata)
+          @chunks = Chunk.split(value, info)
           @data = value
         end
       end