moped 1.4.5 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0527f897994e73459603aa98d9e837a488c049bb
-  data.tar.gz: f400bd0241ab6a512f4cb0b855534cc0eb964fe7
+  metadata.gz: c161ed1156380d43da8e438ce1c4777089e84e5a
+  data.tar.gz: 606d2329d6b50ec8a08d425b1094b0d572ec989a
 SHA512:
-  metadata.gz: 730d556f8c33c4c720eb7064db0fd61a79fffea1657b9e85e75d690793fe048c709974e0be0b82bb12d5b8a44aeef0ed4cab978efded2515930cfc0802e5348d
-  data.tar.gz: 989d1e898abe6234aecf57972f0cb6b8b85d5a6f37ea77a766921165f53d9b985e561715b35465eb4b1dfc748522b9b921f79dfbca3df7b522d6745b8ebac47f
+  metadata.gz: 58f9af192a2de8b18aaa1e6ff2a7a5b5652a5db8c38624143c8fc057a02daf974d81cf053f6b963b70e99d54849c866ab0b82c02a5c9abd7949e11a842020d75
+  data.tar.gz: 0e012db8dfb2fa04c3ecbfb3dfa20c125f3691428a0937c29d15f9f7872f07d2277c9d867273ab1b899c73fba85a454bc7aa65db31197bad1e3ffbb304bc7a81

data/CHANGELOG.md

@@ -1,5 +1,33 @@
 # Overview
 
+## 1.5.0
+
+### New Features
+
+* The session now has an additional configuration option, called `auto_discover`.
+  which defaults to `true`. Auto-discovery means that nodes that are not provided
+  explicitly to the session but are visible will become available for read/write
+  in the application. This behavior is the same as the existing behavior.
+
+  The change here is to be able to turn this off by setting `auto_discover: false`.
+  This will tell Moped to only send messages to nodes explicitly provided when
+  instantiating the session.
+
+  Example:
+
+        Moped::Session.new([ "127.0.0.1:27017" ], auto_discover: false)
+
+* \#189 Moped now logs connection attempts during retries. (Jan Paul Posma)
+
+## 1.4.6
+
+### Resolved Issues
+
+* \#192 Return the proper result after reauthentication attempts.
+  (Jonathan Hyman)
+
+* \#191 Checking for "not authorized" in error messages. (Jonathan Hyman)
+
 ## 1.4.5
 
 ### Resolved Issues

data/lib/moped/cluster.rb

@@ -8,7 +8,7 @@ module Moped
     # @attribute [r] seeds The seeds the cluster was initialized with.
     attr_reader :options, :seeds
 
-    # Get the authentication details for the cluster.
+    # Get the credentials for the cluster.
     #
     # @example Get the authentication details.
     #   cluster.auth
@@ -216,6 +216,7 @@ module Moped
 
       if retries > 0
         # We couldn't find a primary node, so refresh the list and try again.
+        warning("  MOPED: Retrying connection to primary for replica set #{inspect}")
         sleep(retry_interval)
         refresh
         with_primary(retries - 1, &block)
@@ -249,6 +250,7 @@ module Moped
         begin
           return yield node.apply_auth(auth)
         rescue Errors::ConnectionFailure
+          warning("  MOPED: Connection failed to secondary node #{node.inspect}, trying next node.")
           # That node's no good, so let's try the next one.
           next
         end
@@ -257,6 +259,7 @@ module Moped
       if retries > 0
         # We couldn't find a secondary or primary node, so refresh the list and
         # try again.
+        warning("  MOPED: Could not connect to any node in replica set #{inspect}, refreshing list.")
         sleep(retry_interval)
         refresh
         with_secondary(retries - 1, &block)
@@ -290,5 +293,11 @@ module Moped
         @peers.push(node) unless peers.include?(node)
       end
     end
+
+    def warning(message)
+      if logger = Moped.logger
+        logger.warn(message)
+      end
+    end
   end
 end

data/lib/moped/node.rb

@@ -60,6 +60,18 @@ module Moped
       self
     end
 
+    # Is the cluster auto-discovering new nodes in the cluster?
+    #
+    # @example Is the cluster auto discovering?
+    #   cluster.auto_discovering?
+    #
+    # @return [ true, false ] If the cluster is auto discovering.
+    #
+    # @since 2.0.0
+    def auto_discovering?
+      @auto_discovering ||= options[:auto_discover].nil? ? true : options[:auto_discover]
+    end
+
     # Execute a command against a database.
     #
     # @example Execute a command.
@@ -82,7 +94,7 @@ module Moped
         if reply.command_failure?
           if reply.unauthorized? && auth.has_key?(database)
             login(database, *auth[database])
-            command(database, cmd, options)
+            return command(database, cmd, options)
           else
             raise Errors::OperationFailure.new(operation, result)
           end
@@ -365,7 +377,7 @@ module Moped
             # connection. In this case we need to requthenticate and try again,
             # otherwise we'll just raise the error to the user.
             login(database, *auth[database])
-            query(database, collection, selector, options)
+            return query(database, collection, selector, options)
           else
             raise Errors::QueryFailure.new(operation, reply.documents.first)
           end
@@ -480,15 +492,6 @@ module Moped
       @auth ||= {}
     end
 
-    def generate_peers(info)
-      peers = []
-      peers.push(info["primary"]) if info["primary"]
-      peers.concat(info["hosts"]) if info["hosts"]
-      peers.concat(info["passives"]) if info["passives"]
-      peers.concat(info["arbiters"]) if info["arbiters"]
-      @peers = peers.map { |peer| Node.new(peer, options) }.uniq
-    end
-
     def login(database, username, password)
       getnonce = Protocol::Command.new(database, getnonce: 1)
       connection.write [getnonce]
@@ -514,10 +517,12 @@ module Moped
 
     def generate_peers(info)
       peers = []
-      peers.push(info["primary"]) if info["primary"]
-      peers.concat(info["hosts"]) if info["hosts"]
-      peers.concat(info["passives"]) if info["passives"]
-      peers.concat(info["arbiters"]) if info["arbiters"]
+      if auto_discovering?
+        peers.push(info["primary"]) if info["primary"]
+        peers.concat(info["hosts"]) if info["hosts"]
+        peers.concat(info["passives"]) if info["passives"]
+        peers.concat(info["arbiters"]) if info["arbiters"]
+      end
       @peers = peers.map{ |peer| discover(peer) }.uniq
     end
 

data/lib/moped/protocol/reply.rb

@@ -93,7 +93,7 @@ module Moped
       # @since 1.2.0
       def query_failed?
         result = documents[0]
-        flags.include?(:query_failure) || (result && result["$err"])
+        flags.include?(:query_failure) || (result && (result["err"] || result["errmsg"] || result["$err"]))
       end
 
       # Is the reply an error message that we are not authorized for the query

data/lib/moped/query.rb

@@ -352,7 +352,7 @@ module Moped
     #
     # @since 1.3.0
     def tailable
-      operation.flags.push(:tailable)
+      operation.flags.push(:tailable, :await_data)
       self
     end
 

data/lib/moped/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moped
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.5.0
 platform: ruby
 authors:
 - Bernerd Schaefer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies: []
 description: A MongoDB driver for Ruby.
 email: