mongo 2.0.0.rc → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05111deea6c32629a6dea5c78f42502e4667f42e
-  data.tar.gz: c83465c51c98355b68843b3e9cdf5f9c89621a8e
+  metadata.gz: f1b1c17b52cc160be41aa083e33789a71d99b6b8
+  data.tar.gz: ba505d3b59d858a210a570670a98c6baded60489
 SHA512:
-  metadata.gz: ef54dd2b1941e7b27aae4887e1c8661d929a0c8efe06b00fc3a4ec56541f75023111efbbe7e6dd0934acf48e2147b883d4c68d6756c62c305b374b512ba1ff4a
-  data.tar.gz: 38079d819c3d24a50f7f8b4346196b37936ae04074175a06c0aff4dbeee1564544eb10d91cbc97453326b7e0e41461cc79b3239faa836a9ef94c8a3f8ab9e70a
+  metadata.gz: 9e770b0aee96c3226681ae96fb0de826fbb4c10ddb8851bd4d9ce763b0cd6d8c1067ec50f42748d84ac31e1ca009e641d2f7f66e780166a8cd4adc33e9db6183
+  data.tar.gz: 5a34d970f35bcd33d06dbfc61ae533cd05a5f585bb242d9e591805d3545902d2cfd74071587bbd47f997318ad9012012c3ad4d951ca0f79ce9c5488324d890cf

data.tar.gz.sig

@@ -1 +1,2 @@
-$��H�C'�N迮�g��+����f�ߴ!2as����W�|�RK�F�O��zj$��H�x6K��U��~c����/��u;���=ɼș�=�$-|J��v�/�菞�m���˷8�y�4&��8�m70��6Z;�URZ�7+4��u�3d�/�
+�W^�}�*�m��`�q��_�cN�m(1=pz�,1G����|EE!��	�L�xU��G�uŝ$6H���u׭VZC��m�_;����@/���R$����o�caU>�z���jB@[�d@��Wt��?J;��k/{�
B$�k(���:�pZ�K��PC�Dz��X;[� �e�<뤩=�����J��Zf��j�՝��<��;�Fx���j$v�U
+��k��r;��b|����?���

data/README.md

@@ -2,13 +2,10 @@ MongoDB Ruby Driver [![Build Status][travis-img]][travis-url] [![Code Climate][c
 -----
 The officially supported Ruby driver for [MongoDB](http://www.mongodb.org).
 
-> **Note: You are viewing the 2.x version of the MongoDB Ruby driver which is currently in beta and under heavy development. To view the current stable version of driver, please use the [1.x-stable](https://github.com/mongodb/mongo-ruby-driver/tree/1.x-stable) branch.**
-
 Documentation
 -----
 
-Documentation for the 2.x series is currently a work in progress, but that work can
-be seen in the meantime [here](https://github.com/durran/docs-ecosystem/blob/RUBY-684/source/tutorial/ruby-driver-tutorial.txt).
+Documentation is located [here](http://docs.mongodb.org/ecosystem/drivers/ruby/).
 
 API docs can be found [here](http://api.mongodb.org/ruby/).
 

data/lib/mongo/client.rb

@@ -154,7 +154,7 @@ module Mongo
     #
     # @since 2.0.0
     def inspect
-      "<Mongo::Client:0x#{object_id} cluster=#{cluster.addresses.join(', ')}>"
+      "#<Mongo::Client:0x#{object_id} cluster=#{cluster.addresses.join(', ')}>"
     end
 
     # Get the read preference from the options passed to the client.

data/lib/mongo/collection.rb

@@ -152,7 +152,7 @@ module Mongo
     #
     # @since 2.0.0
     def inspect
-      "<Mongo::Collection:0x#{object_id} namespace=#{namespace}>"
+      "#<Mongo::Collection:0x#{object_id} namespace=#{namespace}>"
     end
 
     # Insert a single document into the collection.

data/lib/mongo/collection/view.rb

@@ -139,7 +139,7 @@ module Mongo
       #
       # @since 2.0.0
       def inspect
-        "<Mongo::Collection::View:0x#{object_id} namespace='#{collection.namespace}" +
+        "#<Mongo::Collection::View:0x#{object_id} namespace='#{collection.namespace}" +
             " @selector=#{selector.inspect} @options=#{options.inspect}>"
       end
 

data/lib/mongo/collection/view/writable.rb

@@ -77,9 +77,10 @@ module Mongo
           cmd[:update] = document
           cmd[:fields] = projection if projection
           cmd[:sort] = sort if sort
-          cmd[:new] = (opts[:return_document] == :after ? true : false) if opts[:return_document]
+          cmd[:new] = !!(opts[:return_document] && opts[:return_document] == :after)
           cmd[:upsert] = opts[:upsert] if opts[:upsert]
-          database.command(cmd).first['value']
+          value = database.command(cmd).first['value']
+          value unless value.nil? || value.empty?
         end
 
         # Remove documents from the collection.
@@ -112,36 +113,48 @@ module Mongo
         #   collection_view.replace_one({ name: 'test' })
         #
         # @param [ Hash ] document The document to replace.
+        # @param [ Hash ] opts The options.
+        #
+        # @option opts [ true, false ] :upsert Whether to upsert if the
+        #   document doesn't exist.
         #
         # @return [ Result ] The response from the database.
         #
         # @since 2.0.0
-        def replace_one(document)
-          update(document, false)
+        def replace_one(document, opts = {})
+          update(document, false, opts)
         end
 
         # Update documents in the collection.
         #
         # @example Update multiple documents in the collection.
         #   collection_view.update_many('$set' => { name: 'test' })
+        # @param [ Hash ] opts The options.
+        #
+        # @option opts [ true, false ] :upsert Whether to upsert if the
+        #   document doesn't exist.
         #
         # @return [ Result ] The response from the database.
         #
         # @since 2.0.0
-        def update_many(spec)
-          update(spec, true)
+        def update_many(spec, opts = {})
+          update(spec, true, opts)
         end
 
         # Update a single document in the collection.
         #
         # @example Update a single document in the collection.
         #   collection_view.update_one('$set' => { name: 'test' })
+        # @param [ Hash ] opts The options.
+        #
+        # @option opts [ true, false ] :upsert Whether to upsert if the
+        #   document doesn't exist.
         #
         # @return [ Result ] The response from the database.
         #
         # @since 2.0.0
-        def update_one(spec)
-          update(spec, false)
+        def update_one(spec, opts = {})
+          update(spec, false, opts)
         end
 
         private
@@ -155,9 +168,12 @@ module Mongo
           ).execute(next_primary.context)
         end
 
-        def update(spec, multi)
+        def update(spec, multi, opts)
           Operation::Write::Update.new(
-            :update => { q: selector, u: spec, multi: multi, upsert: false },
+            :update => { q: selector,
+                         u: spec,
+                         multi: multi,
+                         upsert: !!opts[:upsert] },
             :db_name => collection.database.name,
             :coll_name => collection.name,
             :write_concern => collection.write_concern

data/lib/mongo/database.rb

@@ -176,7 +176,7 @@ module Mongo
     #
     # @since 2.0.0
     def inspect
-      "<Mongo::Database:0x#{object_id} name=#{name}>"
+      "#<Mongo::Database:0x#{object_id} name=#{name}>"
     end
 
     # Get the Grid "filesystem" for this database.

data/lib/mongo/grid/file.rb

@@ -72,6 +72,18 @@ module Mongo
         initialize_chunks!(data)
       end
 
+      # Gets a pretty inspection of the file.
+      #
+      # @example Get the file inspection.
+      #   file.inspect
+      #
+      # @return [ String ] The file inspection.
+      #
+      # @since 2.0.0
+      def inspect
+        "#<Mongo::Grid::File:0x#{object_id} filename=#{filename}>"
+      end
+
       private
 
       # @note If we have provided an array of BSON::Documents to initialize

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

@@ -168,7 +168,7 @@ module Mongo
           def split(data, metadata)
             chunks, index, n = [], 0, 0
             while index < data.length
-              bytes = data.slice(index, DEFAULT_SIZE)
+              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)
               chunks.push(chunk)

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

@@ -133,6 +133,19 @@ module Mongo
           @client_md5 = Digest::MD5.new
         end
 
+        # Get a readable inspection for the object.
+        #
+        # @example Inspect the metadata.
+        #   metadata.inspect
+        #
+        # @return [ String ] The nice inspection.
+        #
+        # @since 2.0.0
+        def inspect
+          "#<Mongo::Grid::File::Metadata:0x#{object_id} chunk_size=#{chunk_size} " +
+            "filename=#{filename} content_type=#{content_type} id=#{id} md5=#{md5}>"
+        end
+
         # Get the length of the document in bytes.
         #
         # @example Get the length

data/lib/mongo/operation/aggregate.rb

@@ -62,7 +62,7 @@ module Mongo
       #
       # @since 2.0.0
       def execute(context)
-        unless context.standalone? || context.primary? || secondary_ok?
+        unless context.standalone? || context.mongos? || context.primary? || secondary_ok?
           raise Error::NeedPrimaryServer.new(ERROR_MESSAGE)
         end
         execute_message(context)

data/lib/mongo/operation/write.rb

@@ -12,14 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/write/bulk_mergable'
-require 'mongo/operation/write/legacy_bulk_mergable'
+require 'mongo/operation/write/bulk'
 require 'mongo/operation/write/delete'
-require 'mongo/operation/write/bulk_delete'
 require 'mongo/operation/write/insert'
-require 'mongo/operation/write/bulk_insert'
 require 'mongo/operation/write/update'
-require 'mongo/operation/write/bulk_update'
 require 'mongo/operation/write/create_index'
 require 'mongo/operation/write/drop_index'
 require 'mongo/operation/write/create_user'

data/lib/mongo/operation/write/bulk.rb

@@ -0,0 +1,17 @@
+# 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.
+
+require 'mongo/operation/write/bulk/bulk_delete'
+require 'mongo/operation/write/bulk/bulk_insert'
+require 'mongo/operation/write/bulk/bulk_update'

data/lib/mongo/operation/write/{bulk_delete.rb → bulk/bulk_delete.rb}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/bulk_delete/result'
+require 'mongo/operation/write/bulk/bulk_delete/result'
 
 module Mongo
   module Operation

data/lib/mongo/operation/{bulk_delete → write/bulk/bulk_delete}/result.rb

@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'mongo/operation/write/bulk/bulk_mergable'
+require 'mongo/operation/write/bulk/legacy_bulk_mergable'
+
 module Mongo
   module Operation
     module Write

data/lib/mongo/operation/write/{bulk_insert.rb → bulk/bulk_insert.rb}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/bulk_insert/result'
+require 'mongo/operation/write/bulk/bulk_insert/result'
 
 module Mongo
   module Operation

data/lib/mongo/operation/{bulk_insert → write/bulk/bulk_insert}/result.rb

@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'mongo/operation/write/bulk/bulk_mergable'
+require 'mongo/operation/write/bulk/legacy_bulk_mergable'
+
 module Mongo
   module Operation
     module Write

data/lib/mongo/operation/write/{bulk_update.rb → bulk/bulk_update.rb}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/bulk_update/result'
+require 'mongo/operation/write/bulk/bulk_update/result'
 
 module Mongo
   module Operation

data/lib/mongo/operation/{bulk_update → write/bulk/bulk_update}/result.rb

@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'mongo/operation/write/bulk/bulk_mergable'
+require 'mongo/operation/write/bulk/legacy_bulk_mergable'
+
 module Mongo
   module Operation
     module Write
@@ -146,7 +149,11 @@ module Mongo
           private
 
           def upsert?(reply)
-            !reply.documents.first[UPDATED_EXISTING]
+            !updated_existing?(reply) && reply.documents.first[N] == 1
+          end
+
+          def updated_existing?(reply)
+            reply.documents.first[UPDATED_EXISTING]
           end
         end
       end

data/lib/mongo/operation/write/delete.rb

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'mongo/operation/write/delete/result'
+
 module Mongo
   module Operation
     module Write

data/lib/mongo/operation/write/delete/result.rb

@@ -0,0 +1,40 @@
+# 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
+  module Operation
+    module Write
+      class Delete
+
+        # Defines custom behaviour of results for a delete.
+        #
+        # @since 2.0.0
+        class Result < Operation::Result
+
+          # Get the number of documents deleted.
+          #
+          # @example Get the deleted count.
+          #   result.deleted_count
+          #
+          # @return [ Integer ] The deleted count.
+          #
+          # @since 2.0.0
+          def deleted_count
+            n
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongo/operation/write/insert.rb

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'mongo/operation/write/insert/result'
+
 module Mongo
   module Operation
     module Write

data/lib/mongo/operation/write/insert/result.rb

@@ -0,0 +1,32 @@
+# 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
+  module Operation
+    module Write
+      class Insert
+
+        # Defines custom behaviour of results for an insert.
+        #
+        # According to the CRUD spec, reporting the inserted ids
+        # is optional. It can be added to this class later, if needed.
+        #
+        # @since 2.0.0
+        class Result < Operation::Result
+
+        end
+      end
+    end
+  end
+end

data/lib/mongo/operation/write/update.rb

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'mongo/operation/write/update/result'
+
 module Mongo
   module Operation
     module Write
@@ -79,7 +81,7 @@ module Mongo
 
         def execute_message(context)
           context.with_connection do |connection|
-            Result.new(connection.dispatch([ message, gle ].compact)).validate!
+            LegacyResult.new(connection.dispatch([ message, gle ].compact)).validate!
           end
         end
 
@@ -88,9 +90,12 @@ module Mongo
           @spec[:updates] = original.spec[:updates].dup
         end
 
-        def message(update_spec = {})
-          opts = update[:multi] ? { :flags => [:multi_update] } : {}
-          Protocol::Update.new(db_name, coll_name, update[:q], update[:u], opts)
+        def message
+          flags = []
+          flags << :multi_update if update[:multi]
+          flags << :upsert if update[:upsert]
+          Protocol::Update.new(db_name, coll_name, update[:q], update[:u],
+                               flags.empty? ? {} : { flags: flags })
         end
       end
     end