moped 1.4.2 → 1.4.3

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Overview
 
+## 1.4.3
+
+### Resolved Issues
+
+* \#156 Collection#drop will raise on any error other than collection
+  does not exist.
+  (Daniel Doubrovkine)
+
+* \#152 Added `errmsg` "not master" to replica set configuration check.
+  (Christos Trochalakis)
+
+* \#151 Dropping collections now always uses primary. (Christos Trochalakis)
+
+* \#150 Handle cases where Mongo does not bring back a `query_failure` flag
+  in the reply, but has an error document present.
+
+* mongoid/mongoid#2849 Supply proper limit to initial query if either
+  limit or batch_size are provided.
+
+* mongoid/mongoid#2831 Fix node refresh when no peers exist.
+
 ## 1.4.1/1.4.2
 
 ### Resolved Issues

data/lib/moped/cluster.rb

@@ -284,7 +284,7 @@ module Moped
 
     def refresh_peers(node, &block)
       peers = node.peers
-      return if peers.empty?
+      return if !peers || peers.empty?
       peers.each do |node|
         block.call(node) unless @nodes.include?(node)
         @peers.push(node) unless peers.include?(node)

data/lib/moped/collection.rb

@@ -35,8 +35,11 @@ module Moped
     # @since 1.0.0
     def drop
       begin
-        database.command(drop: name)
-      rescue Moped::Errors::OperationFailure
+        database.session.with(consistency: :strong) do |session|
+          session.context.command(database.name, drop: name)
+        end
+      rescue Moped::Errors::OperationFailure => e
+        raise e unless e.details["errmsg"] == "ns not found"
         false
       end
     end

data/lib/moped/cursor.rb

@@ -132,7 +132,7 @@ module Moped
       @options[:flags] |= [:no_cursor_timeout] if @options[:no_timeout]
 
       options = @options.clone
-      options[:limit] = @options[:batch_size] if @options[:batch_size]
+      options[:limit] = request_limit
 
       reply, @node = session.context.with_node do |node|
         [ node.query(@database, @collection, @selector, options), node ]

data/lib/moped/errors.rb

@@ -103,7 +103,9 @@ module Moped
       # error with code 13435, or with an error message stating the server is
       # not a master. (This encapsulates codes 10054, 10056, 10058)
       def reconfiguring_replica_set?
-        details["code"] == 13435 || details["err"] == "not master"
+        details["code"] == 13435 ||
+          details["err"] == "not master" ||
+          details["errmsg"] == "not master"
       end
     end
 

data/lib/moped/node.rb

@@ -501,6 +501,23 @@ module Moped
       auth.delete(database)
     end
 
+    private
+
+    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| discover(peer) }.uniq
+    end
+
+    def discover(peer)
+      Node.new(peer, options).tap do |node|
+        node.send(:auth).merge!(auth)
+      end
+    end
+
     def initialize_copy(_)
       @connection = nil
     end

data/lib/moped/protocol/reply.rb

@@ -67,7 +67,7 @@ module Moped
       # @since 1.2.10
       def command_failure?
         result = documents[0]
-        result["ok"] != 1 || result["err"] || result["errmsg"]
+        result["ok"] != 1 || result["err"] || result["errmsg"] || result["$err"]
       end
 
       # Was the provided cursor id not found on the server?
@@ -91,7 +91,8 @@ module Moped
       #
       # @since 1.2.0
       def query_failed?
-        flags.include?(:query_failure)
+        result = documents[0]
+        flags.include?(:query_failure) || (result && result["$err"])
       end
 
       # Is the reply an error message that we are not authorized for the query

data/lib/moped/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moped
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies: []
 description: A MongoDB driver for Ruby.
 email:
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1167017999855921065
+      hash: 2209101216124577451
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1167017999855921065
+      hash: 2209101216124577451
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24