moped 1.2.7 → 1.2.8

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Overview
 
+## 1.2.8 (branch: 1.2.0-stable)
+
+### Resolved Issues
+
+* \#108 Connection drops that would result in a `nil` response on socket read or
+  a `SocketError` now re-raise a `ConnectionFailure` error which causes the
+  replica set to go through it's failover behavor with node refreshing.
+
+* \#104 `Query#explain` now respects limit.
+
+* \#103 Port defaults to 27017 instead of zero if not provided. (Chris Winslett)
+
+* \#100 Fix duplicate object id potential issue for JRuby. (Tim Olsen)
+
+* \#97 Propagate node options to newly discovered nodes. (Adam Lebsack)
+
+* \#91 Added more graceful replica set handling when safe mode is enabled
+  and replica sets were reconfigured. (Nicolas Viennot)
+
+* \#90 Include arbiters in the list of nodes to disconnect. (Matt Parlane)
+
 ## 1.2.7
 
 ### Resolved Issues

data/lib/moped/bson/object_id.rb

@@ -111,7 +111,8 @@ module Moped
 
         # Generate object id data for a given time using the provided +counter+.
         def generate(time, counter = 0)
-          [time, @machine_id, Process.pid, counter << 8].pack("N NX lXX NX")
+          process_thread_id = "#{Process.pid}#{Thread.current.object_id}".hash % 0xFFFF
+          [time, @machine_id, process_thread_id, counter << 8].pack("N NX lXX NX")
         end
       end
 

data/lib/moped/cluster.rb

@@ -28,7 +28,7 @@ module Moped
     #
     # @since 1.2.0
     def disconnect
-      nodes.each { |node| node.disconnect } and true
+      nodes(include_arbiters: true).each { |node| node.disconnect } and true
     end
 
     # Get the interval at which a node should be flagged as down before
@@ -117,7 +117,7 @@ module Moped
     # @return [ Array<Node> ] the list of available nodes.
     #
     # @since 1.0.0
-    def nodes
+    def nodes(opts = {})
       current_time = Time.new
       down_boundary = current_time - down_interval
       refresh_boundary = current_time - refresh_interval
@@ -133,7 +133,7 @@ module Moped
 
       # Now return all the nodes that are available and participating in the
       # replica set.
-      available.reject { |node| node.down? || node.arbiter? }
+      available.reject { |node| node.down? || (!opts[:include_arbiters] && node.arbiter?) }
     end
 
     # Refreshes information for each of the nodes provided. The node list

data/lib/moped/connection.rb

@@ -85,7 +85,11 @@ module Moped
     def read
       with_connection do |socket|
         reply = Protocol::Reply.allocate
-        response = socket.read(36).unpack('l<5q<l<2')
+        data = socket.read(36)
+        unless data
+          raise Errors::ConnectionFailure, "Attempted read from socket which returned no data."
+        end
+        response = data.unpack('l<5q<l<2')
         reply.length,
             reply.request_id,
             reply.response_to,

data/lib/moped/node.rb

@@ -125,7 +125,21 @@ module Moped
         # Someone else wrapped this in an #ensure_primary block, so let the
         # reconfiguration exception bubble up.
         raise
-      rescue Errors::OperationFailure, Errors::AuthenticationFailure, Errors::QueryFailure, Errors::CursorNotFound
+      rescue Errors::QueryFailure => e
+        # We might have a replica set change with:
+        # "failed with error 13435: "not master and slaveOk=false"
+        if e.details['code'] == 13435
+          raise Errors::ReplicaSetReconfigured
+        end
+        raise
+      rescue Errors::OperationFailure => e
+        # We might have a replica set change with:
+        # "failed with error 10054: "not master"
+        if e.details['code'] == 10054
+          raise Errors::ReplicaSetReconfigured
+        end
+        raise
+      rescue Errors::AuthenticationFailure, Errors::CursorNotFound
         # These exceptions are "expected" in the normal course of events, and
         # don't necessitate disconnecting.
         raise
@@ -578,7 +592,7 @@ module Moped
 
     def parse_address
       host, port = address.split(":")
-      @port = port.to_i
+      @port = (port || 27017).to_i
       @ip_address = ::Socket.getaddrinfo(host, nil, ::Socket::AF_INET, ::Socket::SOCK_STREAM).first[3]
       @resolved_address = "#{@ip_address}:#{@port}"
     end

data/lib/moped/query.rb

@@ -89,15 +89,16 @@ module Moped
     #
     # @since 1.0.0
     def explain
-      hint, sort = operation.selector["$hint"], operation.selector["$orderby"]
-      operation.selector = {
+      explanation = operation.selector.dup
+      hint = explanation["$hint"]
+      sort = explanation["$orderby"]
+      explanation = {
         "$query" => selector,
         "$explain" => true,
-        "$limit" => operation.selector.fetch("$limit", 1).abs * -1
       }
-      operation.selector["$orderby"] = sort if sort
-      operation.selector["$hint"] = hint if hint
-      each { |doc| return doc }
+      explanation["$orderby"] = sort if sort
+      explanation["$hint"] = hint if hint
+      Query.new(collection, explanation).limit(-(operation.limit.abs)).each { |doc| return doc }
     end
 
     # Get the first matching document.

data/lib/moped/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moped
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-06 00:00:00.000000000 Z
+date: 2012-11-04 00:00:00.000000000 Z
 dependencies: []
 description: A MongoDB driver for Ruby.
 email:
@@ -85,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1523010636318133543
+      hash: 2810220741565392289
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1523010636318133543
+      hash: 2810220741565392289
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24