mongo 2.4.1 → 2.4.2

data/spec/support/crud_tests/write/updateOne-collation.yml

@@ -18,6 +18,7 @@ tests:
             result:
                 matchedCount: 1
                 modifiedCount: 1
+                upsertedCount: 0
             collection:
                 data:
                     - {_id: 1, x: 11}

data/spec/support/crud_tests/write/updateOne-pre_2.6.yml

@@ -0,0 +1,83 @@
+data:
+    - {_id: 1, x: 11}
+    - {_id: 2, x: 22}
+    - {_id: 3, x: 33}
+# This file includes the same test cases as updateOne.yml with some omissions
+# for pre-2.6 servers. We cannot verify the update result's modifiedCount as it
+# is not available with legacy write operations and getLastError.
+maxServerVersion: '2.4.99'
+
+tests:
+    -
+        description: "UpdateOne when many documents match"
+        operation:
+            name: "updateOne"
+            arguments:
+                filter: 
+                    _id: {$gt: 1}
+                update: 
+                    $inc: {x: 1}
+
+        outcome:
+            result:
+                matchedCount: 1
+                upsertedCount: 0
+            # Can't verify collection data because we don't have a way of
+            # knowing which document gets updated.
+    -
+        description: "UpdateOne when one document matches"
+        operation:
+            name: "updateOne"
+            arguments:
+                filter: {_id: 1}
+                update: 
+                    $inc: {x: 1}
+
+        outcome:
+            result:
+                matchedCount: 1
+                upsertedCount: 0
+            collection:
+                data:
+                    - {_id: 1, x: 12}
+                    - {_id: 2, x: 22}
+                    - {_id: 3, x: 33}
+    -
+        description: "UpdateOne when no documents match"
+        operation:
+            name: "updateOne"
+            arguments:
+                filter: {_id: 4}
+                update: 
+                    $inc: {x: 1}
+
+        outcome:
+            result:
+                matchedCount: 0
+                upsertedCount: 0
+            collection:
+                data:
+                    - {_id: 1, x: 11}
+                    - {_id: 2, x: 22}
+                    - {_id: 3, x: 33}
+    -
+        description: "UpdateOne with upsert when no documents match"
+        operation:
+            name: "updateOne"
+            arguments:
+                filter: {_id: 4}
+                update: 
+                    $inc: {x: 1}
+                upsert: true
+
+        outcome:
+            result:
+                matchedCount: 0
+                upsertedCount: 1
+                upsertedId: 4
+            collection:
+                data:
+                    - {_id: 1, x: 11}
+                    - {_id: 2, x: 22}
+                    - {_id: 3, x: 33}
+                    - {_id: 4, x: 1}

data/spec/support/crud_tests/write/updateOne.yml

@@ -2,6 +2,7 @@ data:
     - {_id: 1, x: 11}
     - {_id: 2, x: 22}
     - {_id: 3, x: 33}
+minServerVersion: '2.6'
 
 tests:
     -
@@ -18,8 +19,9 @@ tests:
             result:
                 matchedCount: 1
                 modifiedCount: 1
-            # can't verify collection because we don't have a way
-            # of knowing which document gets updated.
+                upsertedCount: 0
+            # Can't verify collection data because we don't have a way of
+            # knowing which document gets updated.
     -
         description: "UpdateOne when one document matches"
         operation:
@@ -33,6 +35,7 @@ tests:
             result:
                 matchedCount: 1
                 modifiedCount: 1
+                upsertedCount: 0
             collection:
                 data:
                     - {_id: 1, x: 12}
@@ -51,6 +54,7 @@ tests:
             result:
                 matchedCount: 0
                 modifiedCount: 0
+                upsertedCount: 0
             collection:
                 data:
                     - {_id: 1, x: 11}
@@ -70,6 +74,7 @@ tests:
             result:
                 matchedCount: 0
                 modifiedCount: 0
+                upsertedCount: 1
                 upsertedId: 4
             collection:
                 data:

data/spec/support/gridfs.rb

@@ -312,6 +312,7 @@ module Mongo
         else
           @operation = SuccessfulOp.new(self, test)
         end
+        @result = nil
       end
 
       # Whether the expected  and actual collections should be compared after the test runs.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Tyler Brock
@@ -32,7 +32,7 @@ cert_chain:
   JORAC0isugdrjOh+7HDizWC+9xpvSdKSuNso9bVKO3czaBeR+i+IA43wWeUliq95
   5mp49lUwPrMEh694iPac5m+oxYlcU5U+sUyArQXg+lk=
   -----END CERTIFICATE-----
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -140,6 +140,7 @@ files:
 - lib/mongo/error/invalid_document.rb
 - lib/mongo/error/invalid_file.rb
 - lib/mongo/error/invalid_file_revision.rb
+- lib/mongo/error/invalid_min_pool_size.rb
 - lib/mongo/error/invalid_nonce.rb
 - lib/mongo/error/invalid_replacement_document.rb
 - lib/mongo/error/invalid_server_preference.rb
@@ -444,6 +445,7 @@ files:
 - spec/mongo/server_selector/secondary_spec.rb
 - spec/mongo/server_selector_spec.rb
 - spec/mongo/server_spec.rb
+- spec/mongo/shell_examples_spec.rb
 - spec/mongo/socket/ssl_spec.rb
 - spec/mongo/socket/unix_spec.rb
 - spec/mongo/uri_spec.rb
@@ -499,24 +501,27 @@ files:
 - spec/support/crud_tests/write/findOneAndDelete.yml
 - spec/support/crud_tests/write/findOneAndReplace-collation.yml
 - spec/support/crud_tests/write/findOneAndReplace-upsert.yml
+- spec/support/crud_tests/write/findOneAndReplace-upsert_pre_2.6.yml
 - spec/support/crud_tests/write/findOneAndReplace.yml
 - spec/support/crud_tests/write/findOneAndUpdate-collation.yml
 - spec/support/crud_tests/write/findOneAndUpdate.yml
 - spec/support/crud_tests/write/insertMany.yml
 - spec/support/crud_tests/write/insertOne.yml
 - spec/support/crud_tests/write/replaceOne-collation.yml
+- spec/support/crud_tests/write/replaceOne-pre_2.6.yml
 - spec/support/crud_tests/write/replaceOne-upsert.yml
 - spec/support/crud_tests/write/replaceOne.yml
 - spec/support/crud_tests/write/updateMany-collation.yml
+- spec/support/crud_tests/write/updateMany-pre_2.6.yml
 - spec/support/crud_tests/write/updateMany.yml
 - spec/support/crud_tests/write/updateOne-collation.yml
+- spec/support/crud_tests/write/updateOne-pre_2.6.yml
 - spec/support/crud_tests/write/updateOne.yml
 - spec/support/gridfs.rb
 - spec/support/gridfs_tests/delete.yml
 - spec/support/gridfs_tests/download.yml
 - spec/support/gridfs_tests/download_by_name.yml
 - spec/support/gridfs_tests/upload.yml
-- spec/support/helpers.rb
 - spec/support/matchers.rb
 - spec/support/max_staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml
 - spec/support/max_staleness/ReplicaSetNoPrimary/Incompatible.yml
@@ -797,6 +802,7 @@ test_files:
 - spec/mongo/server_selector/secondary_spec.rb
 - spec/mongo/server_selector_spec.rb
 - spec/mongo/server_spec.rb
+- spec/mongo/shell_examples_spec.rb
 - spec/mongo/socket/ssl_spec.rb
 - spec/mongo/socket/unix_spec.rb
 - spec/mongo/uri_spec.rb
@@ -852,24 +858,27 @@ test_files:
 - spec/support/crud_tests/write/findOneAndDelete.yml
 - spec/support/crud_tests/write/findOneAndReplace-collation.yml
 - spec/support/crud_tests/write/findOneAndReplace-upsert.yml
+- spec/support/crud_tests/write/findOneAndReplace-upsert_pre_2.6.yml
 - spec/support/crud_tests/write/findOneAndReplace.yml
 - spec/support/crud_tests/write/findOneAndUpdate-collation.yml
 - spec/support/crud_tests/write/findOneAndUpdate.yml
 - spec/support/crud_tests/write/insertMany.yml
 - spec/support/crud_tests/write/insertOne.yml
 - spec/support/crud_tests/write/replaceOne-collation.yml
+- spec/support/crud_tests/write/replaceOne-pre_2.6.yml
 - spec/support/crud_tests/write/replaceOne-upsert.yml
 - spec/support/crud_tests/write/replaceOne.yml
 - spec/support/crud_tests/write/updateMany-collation.yml
+- spec/support/crud_tests/write/updateMany-pre_2.6.yml
 - spec/support/crud_tests/write/updateMany.yml
 - spec/support/crud_tests/write/updateOne-collation.yml
+- spec/support/crud_tests/write/updateOne-pre_2.6.yml
 - spec/support/crud_tests/write/updateOne.yml
 - spec/support/gridfs.rb
 - spec/support/gridfs_tests/delete.yml
 - spec/support/gridfs_tests/download.yml
 - spec/support/gridfs_tests/download_by_name.yml
 - spec/support/gridfs_tests/upload.yml
-- spec/support/helpers.rb
 - spec/support/matchers.rb
 - spec/support/max_staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml
 - spec/support/max_staleness/ReplicaSetNoPrimary/Incompatible.yml

metadata.gz.sig

@@ -1 +1,2 @@
-6�ﰊ4t]�����t������F	��ꄒ$�X�{nk�'�
gu��R�0��mf,�n�3���?e��"�zRs��d�Rc�ܴ�0;���ZE�l��1O�U?�o������(�Z������cv��og=��Ԛ*bP�����s���E1�p�qm8�~������܌���mhtT���J>�4�x���{����#��Jo��
+M!+��^Ktj�?P�1��J^Թ��\���D"͒��l��N|Ě�-�BͤД�"�w
+��B�3�";�=��

data/spec/support/helpers.rb

@@ -1,140 +0,0 @@
-# Copyright (C) 2009-2014 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.
-
-# Helper methods and utilities for testing.
-module Helpers
-
-  # Helper method to allow temporary redirection of $stdout.
-  #
-  # @example
-  # silence do
-  #   # your noisey code here
-  # end
-  #
-  # @param A code block to execute.
-  # @return Original $stdout value.
-  def silence(&block)
-    original_stdout = $stdout
-    original_stderr = $stderr
-    $stdout = $stderr = File.new('/dev/null', 'w')
-    yield block
-  ensure
-    $stdout = original_stdout
-    $stderr = original_stderr
-  end
-
-  TEST_KEY_RSA1024 = OpenSSL::PKey::RSA.new <<-_end_of_pem_
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDLwsSw1ECnPtT+PkOgHhcGA71nwC2/nL85VBGnRqDxOqjVh7Cx
-aKPERYHsk4BPCkE3brtThPWc9kjHEQQ7uf9Y1rbCz0layNqHyywQEVLFmp1cpIt/
-Q3geLv8ZD9pihowKJDyMDiN6ArYUmZczvW4976MU3+l54E6lF/JfFEU5hwIDAQAB
-AoGBAKSl/MQarye1yOysqX6P8fDFQt68VvtXkNmlSiKOGuzyho0M+UVSFcs6k1L0
-maDE25AMZUiGzuWHyaU55d7RXDgeskDMakD1v6ZejYtxJkSXbETOTLDwUWTn618T
-gnb17tU1jktUtU67xK/08i/XodlgnQhs6VoHTuCh3Hu77O6RAkEA7+gxqBuZR572
-74/akiW/SuXm0SXPEviyO1MuSRwtI87B02D0qgV8D1UHRm4AhMnJ8MCs1809kMQE
-JiQUCrp9mQJBANlt2ngBO14us6NnhuAseFDTBzCHXwUUu1YKHpMMmxpnGqaldGgX
-sOZB3lgJsT9VlGf3YGYdkLTNVbogQKlKpB8CQQDiSwkb4vyQfDe8/NpU5Not0fII
-8jsDUCb+opWUTMmfbxWRR3FBNu8wnym/m19N4fFj8LqYzHX4KY0oVPu6qvJxAkEA
-wa5snNekFcqONLIE4G5cosrIrb74sqL8GbGb+KuTAprzj5z1K8Bm0UW9lTjVDjDi
-qRYgZfZSL+x1P/54+xTFSwJAY1FxA/N3QPCXCjPh5YqFxAMQs2VVYTfg+t0MEcJD
-dPMQD5JX6g5HKnHFg2mZtoXQrWmJSn7p8GJK8yNTopEErA==
------END RSA PRIVATE KEY-----
-  _end_of_pem_
-
-  def issue_cert(dn, key, serial, not_before, not_after, extensions, issuer, issuer_key, digest)
-    cert = OpenSSL::X509::Certificate.new
-    issuer = cert unless issuer
-    issuer_key = key unless issuer_key
-    cert.version = 2
-    cert.serial = serial
-    cert.subject = dn
-    cert.issuer = issuer.subject
-    cert.public_key = key.public_key
-    cert.not_before = not_before
-    cert.not_after = not_after
-    ef = OpenSSL::X509::ExtensionFactory.new
-    ef.subject_certificate = cert
-    ef.issuer_certificate = issuer
-    extensions.each do |oid, value, critical|
-      cert.add_extension(ef.create_extension(oid, value, critical))
-    end
-    cert.sign(issuer_key, digest)
-    cert
-  end
-
-  def collection(name, db)
-    documents = []
-    double(name.to_s).tap do |coll|
-
-      allow(coll).to receive(:db) { db }
-
-      allow(coll).to receive(:save) do |doc|
-        coll.remove({ :_id => doc[:_id] })
-        coll.insert(doc)
-      end
-
-      allow(coll).to receive(:count) { documents.length }
-
-      allow(coll).to receive(:insert) do |doc|
-        if !coll.find({ :_id => doc[:_id] }).empty?
-          raise GridError, "duplicate key error, _id"
-        end
-        documents.push(doc)
-      end
-
-      allow(coll).to receive(:find_one) do |query|
-        result = nil
-        documents.each do |doc|
-          if matches(doc, query)
-            result = doc
-            break
-          end
-        end
-        result
-      end
-
-      allow(coll).to receive(:remove) do |query|
-        documents.dup.each do |doc|
-          if matches(doc, query)
-            documents.delete(doc)
-          end
-        end
-      end
-
-      allow(coll).to receive(:find) do |query|
-        results = []
-        documents.each do |doc|
-          if matches(doc, query)
-            results.push(doc)
-          end
-        end
-        results
-      end
-    end
-  end
-
-  # does only strict equivalence,
-  # {:n => 4} should work
-  # {:n => {"$gt" => 3}} will not work.
-  def matches(doc, query={})
-    match = true
-    query.each do |field, value|
-      if !doc[field] || doc[field] != value
-        match = false
-        break
-      end
-    end
-    match
-  end
-end