moped 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ee6fb2a3b2395275c90d12e0cb85b544e1cf77c
-  data.tar.gz: 3593beca8c3839f69b0fb0e7a502160f30a59ac6
+  metadata.gz: 8fa0eef7f132d7a550f49134bd92a7b3ff4fa314
+  data.tar.gz: 156ccfc04d3f34face6722535bc9cbddfd60c24d
 SHA512:
-  metadata.gz: a746e180afb880cc3f88e81d2930344003d3dd2bac25442a10f940dbf06294c4beacf8d705309bd96aa7fd9a32e49646688c62fc31bf69fc0c02a5cb4dbb62c0
-  data.tar.gz: 49a996a976ed143fb515352f1b602b35f9d5bba27fe809a9546a8db3114286ab9ba001415d607aec2dcb1d0dc5be777581454218ddf8943006fc1cada8a371ab
+  metadata.gz: 178d8f39f368836fd846172eb03850c3bd193c31a6bb6ba7daae5003988faf0de71294be7123f329fe17181fc813f760c7b01e4b3932e667c196b346383d9758
+  data.tar.gz: 579ecfe14e1f22aa954cf55f2f935cae889d4d35d48d60eecb4c11123ecca7af2690d41b85797054cd01385b88e77aa59728709fd1a8609acb9d8cf576715177

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Overview
 
+## 2.0.1
+
+### Resolved Issues
+
+* \#288, \#278, \#252, \#247, \#275, \#290
+  Re-apply credentials when connection is lost with the server. (zarqman)
+
+* mongoid/mongoid\#3790 Allow Session pool_timeout option. (Niels Ganser)
+
+* \#297 Better retry on authentication. (Jonathan Hyman)
+
 ## 2.0.0
 
 ### API Changes (Backwards Incompatible)

data/README.md

@@ -1,4 +1,4 @@
-Moped [![Build Status](https://secure.travis-ci.org/mongoid/moped.png?branch=master)](http://travis-ci.org/mongoid/moped) [![Code Climate](https://codeclimate.com/github/mongoid/moped.png)](https://codeclimate.com/github/mongoid/moped) [![Coverage Status](https://coveralls.io/repos/mongoid/moped/badge.png?branch=master)](https://coveralls.io/r/mongoid/moped?branch=master)
+Moped [![Build Status](https://secure.travis-ci.org/mongoid/moped.svg?branch=master)](http://travis-ci.org/mongoid/moped) [![Code Climate](https://codeclimate.com/github/mongoid/moped.svg)](https://codeclimate.com/github/mongoid/moped) [![Coverage Status](https://coveralls.io/repos/mongoid/moped/badge.png?branch=master)](https://coveralls.io/r/mongoid/moped?branch=master)
 ========
 
 Moped is a MongoDB driver for Ruby, which exposes a simple, elegant, and fast

data/lib/moped/authenticatable.rb

@@ -28,6 +28,7 @@ module Moped
             login(database, username, password)
           end
         end
+        @original_credentials = credentials.dup
       end
       self
     end
@@ -71,7 +72,17 @@ module Moped
       self.write([ authenticate ])
       document = self.read.documents.first
 
-      raise Errors::AuthenticationFailure.new(authenticate, document) unless document["ok"] == 1
+      unless result["ok"] == 1
+        # See if we had connectivity issues so we can retry
+        e = Errors::PotentialReconfiguration.new(authenticate, document)
+        if e.reconfiguring_replica_set?
+          raise Errors::ReplicaSetReconfigured.new(e.command, e.details)
+        elsif e.connection_failure?
+          raise Errors::ConnectionFailure.new(e.inspect)
+        end
+
+        raise Errors::AuthenticationFailure.new(authenticate, document)
+      end
       credentials[database] = [username, password]
     end
 

data/lib/moped/cluster.rb

@@ -174,7 +174,13 @@ module Moped
       seen = {}
       # Set up a recursive lambda function for refreshing a node and it's peers.
       refresh_node = ->(node) do
-        unless seen[node]
+        unless node.address.resolved
+          begin
+            node.refresh
+          rescue Errors::ConnectionFailure
+          end
+        end
+        unless seen[node] || !node.address.resolved
           seen[node] = true
           # Add the node to the global list of known nodes.
           seeds.push(node) unless seeds.include?(node)
@@ -264,11 +270,11 @@ module Moped
     #
     # @since 1.0.0
     def with_secondary(&block)
-      available_nodes = nodes.select(&:secondary?).shuffle!
+      available_nodes = available_secondary_nodes
       while node = available_nodes.shift
         begin
           return yield(node)
-        rescue Errors::ConnectionFailure => e
+        rescue Errors::ConnectionFailure, Errors::ReplicaSetReconfigured => e
           next
         end
       end
@@ -277,6 +283,10 @@ module Moped
 
     private
 
+    def available_secondary_nodes
+      nodes.select(&:secondary?).shuffle!
+    end
+
     # Apply the credentials on all nodes
     #
     # @api private
@@ -365,8 +375,10 @@ module Moped
     # @since 1.0.0
     def refresh_peers(node, &block)
       node.peers.each do |node|
-        block.call(node) unless seeds.include?(node)
-        peers.push(node) unless peers.include?(node)
+        if node.address.resolved
+          block.call(node) unless seeds.include?(node)
+          peers.push(node) unless peers.include?(node)
+        end
       end
     end
   end

data/lib/moped/connection.rb

@@ -46,6 +46,7 @@ module Moped
     #
     # @since 1.0.0
     def connect
+      credentials.clear
       @sock = if !!options[:ssl]
         Socket::SSL.connect(host, port, timeout)
       else
@@ -74,7 +75,6 @@ module Moped
     #
     # @since 1.0.0
     def disconnect
-      credentials.clear
       @sock.close
     rescue
     ensure
@@ -217,7 +217,10 @@ module Moped
     #
     # @since 1.3.0
     def with_connection
-      connect if @sock.nil? || !@sock.alive?
+      if @sock.nil? || !@sock.alive?
+        connect
+        apply_credentials(@original_credentials || {})
+      end
       yield @sock
     end
   end

data/lib/moped/errors.rb

@@ -115,7 +115,7 @@ module Moped
       NOT_MASTER = [ 13435, 13436, 10009 ]
 
       # Error codes received around reconfiguration
-      CONNECTION_ERRORS_RECONFIGURATION = [ 15988, 10276, 11600, 9001, 13639, 10009 ]
+      CONNECTION_ERRORS_RECONFIGURATION = [ 15988, 10276, 11600, 9001, 13639, 10009, 11002 ]
 
       # Replica set reconfigurations can be either in the form of an operation
       # error with code 13435, or with an error message stating the server is

data/lib/moped/node.rb

@@ -137,7 +137,7 @@ module Moped
     #
     # @since 1.2.0
     def disconnect
-      connection{ |conn| conn.disconnect }
+      connection{ |conn| conn.disconnect } if address.resolved
       true
     end
 
@@ -175,9 +175,9 @@ module Moped
 
       begin
         connection do |conn|
-          stack(:connection) << conn
-          connect(conn) unless conn.connected?
+          connect(conn) unless conn.alive?
           conn.apply_credentials(@credentials)
+          stack(:connection) << conn
           yield(conn)
         end
       rescue Exception => e

data/lib/moped/session.rb

@@ -210,6 +210,11 @@ module Moped
     # @since 2.0.0
     option(:pool_size).allow(Optionable.any(Integer))
 
+    # Setup validation of allowed pool timeout options. (Any numeric)
+    #
+    # @since 2.0.0
+    option(:pool_timeout).allow(Optionable.any(Numeric))
+
     # Setup validation of allowed retry interval options. (Any numeric)
     #
     # @since 2.0.0

data/lib/moped/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Moped
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moped
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Durran Jordan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson