moped 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe95b809af3e8ba3e7dcb35684df215cf3a366c5
-  data.tar.gz: ad8d716fd8ec02ab0245dedffe098c1facb71a76
+  metadata.gz: 0527f897994e73459603aa98d9e837a488c049bb
+  data.tar.gz: f400bd0241ab6a512f4cb0b855534cc0eb964fe7
 SHA512:
-  metadata.gz: 1d75ad7ba8d8127addba511ff259755c5b6bbcf94acdbe7fb05448fcf73848682c4bb93307ba0bb81cd3609a3aa58663f0304b1b9721cc90c002ecf37540ffa8
-  data.tar.gz: 90bd44b093930aed15f0a77efe77a347d97ca181a40506a9c976f73e267f7e39199c01e9e09106e8f5acb5a36adb2122e9671f5c0905030308cf34a8a15bcc38
+  metadata.gz: 730d556f8c33c4c720eb7064db0fd61a79fffea1657b9e85e75d690793fe048c709974e0be0b82bb12d5b8a44aeef0ed4cab978efded2515930cfc0802e5348d
+  data.tar.gz: 989d1e898abe6234aecf57972f0cb6b8b85d5a6f37ea77a766921165f53d9b985e561715b35465eb4b1dfc748522b9b921f79dfbca3df7b522d6745b8ebac47f

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Overview
 
+## 1.4.5
+
+### Resolved Issues
+
+* \#174 Check for "unauthorized" in error messages since codes are not always
+  there. (Jon Hyman)
+
+* \#173 Ensure node `refreshed_at` is set even if the node is down, so down nodes
+  don't get hit on every query.
+
 ## 1.4.4
 
 ### Resolved Issues

data/lib/moped/node.rb

@@ -13,7 +13,16 @@ module Moped
     # @attribute [r] resolved_address The host/port pair.
     # @attribute [r] timeout The connection timeout.
     # @attribute [r] options Additional options for the node (ssl).
-    attr_reader :address, :down_at, :ip_address, :peers, :port, :resolved_address, :timeout, :options
+    attr_reader \
+      :address,
+      :down_at,
+      :ip_address,
+      :peers,
+      :port,
+      :resolved_address,
+      :timeout,
+      :options,
+      :refreshed_at
 
     # Is this node equal to another?
     #
@@ -269,7 +278,7 @@ module Moped
     #
     # @since 1.0.0
     def needs_refresh?(time)
-      !@refreshed_at || @refreshed_at < time
+      !refreshed_at || refreshed_at < time
     end
 
     # Execute a pipeline of commands, for example a safe mode persist.
@@ -382,8 +391,8 @@ module Moped
     def refresh
       if resolve_address
         begin
-          info = command("admin", ismaster: 1)
           @refreshed_at = Time.now
+          info = command("admin", ismaster: 1)
           primary = true   if info["ismaster"]
           secondary = true if info["secondary"]
           generate_peers(info)

data/lib/moped/protocol/reply.rb

@@ -68,7 +68,7 @@ module Moped
       # @since 1.2.10
       def command_failure?
         result = documents[0]
-        result["ok"] != 1 || result["err"] || result["errmsg"] || result["$err"]
+        result["ok"] != 1 || error_message(result)
       end
 
       # Was the provided cursor id not found on the server?
@@ -110,7 +110,11 @@ module Moped
       # @since 1.2.10
       def unauthorized?
         result = documents[0]
-        result && (UNAUTHORIZED.include?(result["code"]) || UNAUTHORIZED.include?(result["assertionCode"]))
+        return false if result.nil?
+        err = error_message(result)
+        UNAUTHORIZED.include?(result["code"]) ||
+          UNAUTHORIZED.include?(result["assertionCode"]) ||
+          (err && err =~ /unauthorized/)
       end
 
       class << self
@@ -139,14 +143,16 @@ module Moped
 
       def deserialize_documents(buffer)
         documents = []
-
         count.times do
           documents << BSON::Document.deserialize(buffer)
         end
-
         @documents = documents
       end
 
+      def error_message(result)
+        result["err"] || result["errmsg"] || result["$err"]
+      end
+
     end
   end
 end

data/lib/moped/version.rb

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

metadata

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