mongo 1.12.3 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30a88f87ff5e1b827c377ea9bfaee0d089463be6
-  data.tar.gz: af50ecf2fabeeeb7bf92690e19b58ad6fa021c0d
+  metadata.gz: 1b6b30e9444e24523c41b601ac00a03bff9dab89
+  data.tar.gz: 631e4eaec073feb36592c90a107e7e7b4cf2a929
 SHA512:
-  metadata.gz: 04837e7cc054db97d9dbff8c3e1e0da3cf7e90bef449efbedc1b6ef20a255c7627fb3dd58cb7ae750d2fe5eb96f9abdfc210fd66c4cc478c916c71aaa39f2b06
-  data.tar.gz: fe2673d157610550030230c2169ff564089c104d0b23e18e9a9eb2f2a140f65cc6e755656a6bba6583807317b3b3f92f22d4e8e9d9e09402e1882fdc8431b333
+  metadata.gz: 76d017eb530274e2ca8ddd4d1f41f055491df133f187d52b71f9991a00fdbf2e82b525eab723d535ce49dd52f284a38815cbf04f27bb00457aa7ad89cce14729
+  data.tar.gz: 7a3d1e7b145218b191619cc3b0d84cd4089436b43639c7e92d4d36356d18e3ce2dd3c8c386fc2b07807527e153320ab442ae14cd5774075d2e4eae45633abdbe

data/VERSION

@@ -1 +1 @@
-1.12.3
+1.12.4

data/lib/mongo/connection/pool.rb

@@ -148,7 +148,8 @@ module Mongo
 
     def ping
       begin
-        return self.client['admin'].command({:ping => 1}, :socket => @node.socket, :timeout => MAX_PING_TIME)
+        return self.client['admin'].command({:ping => 1}, :socket => @node.socket,
+                                                          :timeout => client.op_timeout || MongoClient::DEFAULT_OP_TIMEOUT)
       rescue ConnectionFailure, OperationFailure, SocketError, SystemCallError, IOError
         return false
       end

data/lib/mongo/db.rb

@@ -453,6 +453,8 @@ module Mongo
     # @param [Integer, Hash] args any additional argument to be passed to the +code+ expression when
     #   it's run on the server.
     #
+    # @note the eval command is deprecated in MongoDB 3.0 and will be removed in a future server version.
+    #
     # @return [String] the return value of the function.
     def eval(code, *args)
       unless code.is_a?(BSON::Code)

data/lib/mongo/mongo_replica_set_client.rb

@@ -223,6 +223,16 @@ module Mongo
       end
     end
 
+    # Reconnect the replica set client.
+    #
+    # @return [Boolean] +true+ unless the refresh lock can't be acquired.
+    #
+    # @since 1.12.4
+    def reconnect
+      close
+      refresh
+    end
+
     # Determine whether a replica set refresh is
     # required. If so, run a hard refresh. You can
     # force a hard refresh by running

data/lib/mongo/utils/core_ext.rb

@@ -30,7 +30,7 @@ class Hash
   def assert_valid_keys(*valid_keys)
     unknown_keys = keys - [valid_keys].flatten
     raise(ArgumentError, "Unknown key(s): #{unknown_keys.join(", ")}") unless unknown_keys.empty?
-  end
+  end unless instance_methods.include?(:assert_valid_keys)
 
 end
 

data/test/replica_set/client_test.rb

@@ -40,6 +40,21 @@ class ReplicaSetClientTest < Test::Unit::TestCase
     assert_equal @client.local_manager, manager
   end
 
+  def test_reconnect_method
+    @client = MongoReplicaSetClient.from_uri(@uri, :op_timeout => TEST_OP_TIMEOUT)
+    assert @client.connected?
+
+    manager = @client.local_manager
+
+    @client.close
+    assert !@client.connected?
+    assert !@client.local_manager
+
+    @client.reconnect
+    assert @client.connected?
+    assert_equal @client.local_manager, manager
+  end
+
   # TODO: test connect timeout.
 
   def test_connect_with_deprecated_multi

data/test/replica_set/refresh_test.rb

@@ -146,6 +146,18 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
     end
   end
 
+  def test_ping_with_op_timeout
+    [nil, 10].each do |op_timeout|
+      client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :op_timeout => op_timeout)
+      pool = client.primary_pool
+      admin_db = pool.client['admin']
+      admin_db.expects(:command).with({:ping => 1}, :socket => pool.node.socket,
+                                      :timeout => op_timeout || MongoClient::DEFAULT_OP_TIMEOUT).returns({'ok' => 1})
+      client.expects(:[]).with('admin').returns(admin_db)
+      assert pool.ping
+    end
+  end
+
 =begin
   def test_automated_refresh_with_removed_node
     client = MongoReplicaSetClient.new(@rs.repl_set_seeds,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 1.12.3
+  version: 1.12.4
 platform: ruby
 authors:
 - Emily Stolfo
@@ -34,7 +34,7 @@ cert_chain:
   XZOS48LlWh15EG4yZo/gRzqNAW2LUIkYA5eMS2Kp6r+KV8IBUO/LaHdrXbdilpa8
   BRsuCo7UZDbFVRns04HLyjVvkj+K/ywIcdKdS0csz5M=
   -----END CERTIFICATE-----
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -42,14 +42,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.3
+        version: 1.12.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.3
+        version: 1.12.4
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
 executables:
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongo
-rubygems_version: 2.4.7
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby driver for MongoDB

metadata.gz.sig

@@ -1,2 +1 @@
-:�){.��	���!ͪG����	���.�G��
-z*�^���Q�("՛��^����vs�;�	�]50����$Ƿ�H�u�2t7;c��UN��v��_��MmZ��?�0�7��&0�@=l�IQj�Y)
+���L�;��Ï`T<=1n��C�{D�z0PX:[(�o/�����M; 	��1�v/w�͎���8�1b��U�x��#��}�F�X�b�7�gN4U�����LZ+^hL���yH�G��XFF����$�ֽ�