mongo 2.0.6 → 2.1.0

data/spec/support/crud/write.rb

@@ -21,7 +21,7 @@ module Mongo
       #
       # @since 2.0.0
       class Write
-  
+
         # Map of CRUD operation names to method names.
         #
         # @since 2.0.0
@@ -34,7 +34,8 @@ module Mongo
                        'updateOne' => :update_one,
                        'findOneAndDelete' => :find_one_and_delete,
                        'findOneAndReplace' => :find_one_and_replace,
-                       'findOneAndUpdate' => :find_one_and_update
+                       'findOneAndUpdate' => :find_one_and_update,
+                       'bulkWrite' => :bulk_write
                      }
 
         # Map of operation options to method names.
@@ -42,7 +43,11 @@ module Mongo
         # @since 2.0.0
         ARGUMENT_MAP = {
                         :sort => 'sort',
-                        :projection => 'projection'
+                        :projection => 'projection',
+                        :return_document => 'returnDocument',
+                        :upsert => 'upsert',
+                        :ordered => 'ordered',
+                        :write_concern => 'writeConcern'
                        }
 
         # Operations that need a check if results on < 2.6 will match.
@@ -52,7 +57,7 @@ module Mongo
                         'updateMany',
                         'updateOne',
                         'replaceOne']
-  
+
         # The operation name.
         #
         # @return [ String ] name The operation name.
@@ -107,21 +112,25 @@ module Mongo
         def requires_2_6?(collection)
           REQUIRES_2_6.include?(name) && upsert
         end
-  
+
         private
-  
+
+        def bulk_write(collection)
+          collection.bulk_write(requests, options)
+        end
+
         def delete_many(collection)
-          result = collection.find(filter).delete_many
+          result = collection.delete_many(filter)
           { 'deletedCount' => result.deleted_count }
         end
 
         def delete_one(collection)
-          result = collection.find(filter).delete_one
+          result = collection.delete_one(filter)
           { 'deletedCount' => result.deleted_count }
         end
 
         def insert_many(collection)
-          result = collection.insert_many(documents)
+          result = collection.insert_many(documents, options)
           { 'insertedIds' => result.inserted_ids }
         end
 
@@ -137,48 +146,50 @@ module Mongo
         end
 
         def replace_one(collection)
-          result = collection.find(filter).replace_one(replacement, upsert: upsert)
+          result = collection.replace_one(filter, replacement, options)
           update_return_doc(result)
         end
 
         def update_many(collection)
-          result = collection.find(filter).update_many(update, upsert: upsert)
+          result = collection.update_many(filter, update, options)
           update_return_doc(result)
         end
 
         def update_one(collection)
-          result = collection.find(filter).update_one(update, upsert: upsert)
+          result = collection.update_one(filter, update, options)
           update_return_doc(result)
         end
 
         def find_one_and_delete(collection)
-          view = collection.find(filter)
-          ARGUMENT_MAP.each do |key, value|
-            view = view.send(key, arguments[value]) if arguments[value]
-          end
-          view.find_one_and_delete
+          collection.find_one_and_delete(filter, options)
         end
 
         def find_one_and_replace(collection)
-          view = collection.find(filter)
-          ARGUMENT_MAP.each do |key, value|
-            view = view.send(key, arguments[value]) if arguments[value]
-          end
-          view.find_one_and_replace(replacement, upsert: upsert, return_document: return_document)
+          collection.find_one_and_replace(filter, replacement, options)
         end
 
         def find_one_and_update(collection)
-          view = collection.find(filter)
-          ARGUMENT_MAP.each do |key, value|
-            view = view.send(key, arguments[value]) if arguments[value]
+          collection.find_one_and_update(filter, update, options)
+        end
+
+        def options
+          ARGUMENT_MAP.reduce({}) do |opts, (key, value)|
+            arguments.key?(value) ? opts.merge!(key => send(key)) : opts
           end
-          view.find_one_and_update(update, upsert: upsert, return_document: return_document)
         end
 
         def replacement
           arguments['replacement']
         end
 
+        def sort
+          arguments['sort']
+        end
+
+        def projection
+          arguments['projection']
+        end
+
         def documents
           arguments['documents']
         end
@@ -187,10 +198,30 @@ module Mongo
           arguments['document']
         end
 
+        def write_concern
+          arguments['writeConcern']
+        end
+
+        def ordered
+          arguments['ordered']
+        end
+
         def filter
           arguments['filter']
         end
 
+        def requests
+          arguments['requests'].map do |request|
+            case request.keys.first
+            when 'insertOne' then
+              { insert_one: request['insertOne']['document'] }
+            when 'updateOne' then
+              update = request['updateOne']
+              { update_one: { filter: update['filter'], update: update['update'] }}
+            end
+          end
+        end
+
         def upsert
           arguments['upsert']
         end
@@ -209,4 +240,4 @@ module Mongo
       end
     end
   end
-end
+end

data/spec/support/crud.rb

@@ -53,7 +53,9 @@ module Mongo
       #
       # @since 2.0.0
       def initialize(file)
-        @spec = YAML.load(ERB.new(File.new(file).read).result)
+        file = File.new(file)
+        @spec = YAML.load(ERB.new(file.read).result)
+        file.close
         @description = File.basename(file)
         @data = @spec['data']
         @crud_tests = @spec['tests']
@@ -142,7 +144,13 @@ module Mongo
       #
       # @since 2.0.0
       def compare_collection_data
-        actual_collection_data == outcome_collection_data
+        if actual_collection_data.nil?
+          outcome_collection_data.nil?
+        else
+          actual_collection_data.all? do |doc|
+            outcome_collection_data.include?(doc)
+          end
+        end
       end
 
       # Whether this test requires server version >= 2.6 for its results to match