moped 1.3.1 → 1.3.2

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Overview
 
+## 1.3.2
+
+### Resolved Issues
+
+* \#131 Give better error messages when assertion and assertionCode are
+  present in the result.
+
+* \#130 Flag down as down in refresh when not primary or secondary.
+  (Nilson Santos Figueiredo Jr)
+
+* \#128 Fix refresh check to only check nodes that have been down longer
+  than the refresh boundary using the proper interval.
+
+* \#125 Batch size and no timeout are now respected by queries.
+  (Derek Buttineau)
+
+* \#124 Fix packing of bytes in core messages for big endian systems.
+
 ## 1.3.1
 
 ### Resolved Issues

data/lib/moped/cluster.rb

@@ -127,7 +127,7 @@ module Moped
       # Find the nodes that were down but are ready to be refreshed, or those
       # with stale connection information.
       needs_refresh, available = @nodes.partition do |node|
-        (node.down? && node.down_at < down_boundary) || node.needs_refresh?(refresh_boundary)
+        node.down? ? (node.down_at < down_boundary) : node.needs_refresh?(refresh_boundary)
       end
 
       # Refresh those nodes.

data/lib/moped/cursor.rb

@@ -41,12 +41,29 @@ module Moped
     #
     # @since 1.0.0
     def get_more
-      reply = @node.get_more @database, @collection, @cursor_id, @limit
+      reply = @node.get_more @database, @collection, @cursor_id, request_limit
       @limit -= reply.count if limited?
       @cursor_id = reply.cursor_id
       reply.documents
     end
 
+    # Determine the request limit for the query
+    #
+    # @example What is the cursor request_limit
+    #   cursor.request_limit
+    #
+    # @return [ Integer ]
+    #
+    # @since 1.0.0
+
+    def request_limit
+      if limited?
+        @batch_size < @limit ? @batch_size : @limit
+      else
+        @batch_size
+      end
+    end
+
     # Initialize the new cursor.
     #
     # @example Create the new cursor.
@@ -66,13 +83,14 @@ module Moped
       @cursor_id = 0
       @limit = query_operation.limit
       @limited = @limit > 0
+      @batch_size = query_operation.batch_size || @limit
 
       @options = {
         request_id: query_operation.request_id,
         flags: query_operation.flags,
         limit: query_operation.limit,
         skip: query_operation.skip,
-        fields: query_operation.fields
+        fields: query_operation.fields,
       }
     end
 
@@ -111,9 +129,13 @@ module Moped
     def load_docs
       consistency = session.consistency
       @options[:flags] |= [:slave_ok] if consistency == :eventual
+      @options[:flags] |= [:no_cursor_timeout] if @options[:no_timeout]
+
+      options = @options.clone
+      options[:limit] = @options[:batch_size] if @options[:batch_size]
 
       reply, @node = session.context.with_node do |node|
-        [ node.query(@database, @collection, @selector, @options), node ]
+        [ node.query(@database, @collection, @selector, options), node ]
       end
 
       @limit -= reply.count if limited?

data/lib/moped/errors.rb

@@ -80,10 +80,13 @@ module Moped
       # @since 1.0.0
       def error_message
         err = details["err"] || details["errmsg"] || details["$err"]
-
         if code = details["code"]
           "failed with error #{code}: #{err.inspect}\n\n" <<
             "See #{ERROR_REFERENCE}\nfor details about this error."
+        elsif code = details["assertionCode"]
+          assertion = details["assertion"]
+          "failed with error #{code}: #{assertion.inspect}\n\n" <<
+            "See #{ERROR_REFERENCE}\nfor details about this error."
         else
           "failed with error #{err.inspect}"
         end

data/lib/moped/node.rb

@@ -142,7 +142,7 @@ module Moped
         # We might have a replica set change with:
         # MongoDB uses 3 different error codes for "not master", [10054, 10056, 10058]
         # thus it is easier to capture the "err"
-        if e.details["err"] == "not master" 
+        if e.details["err"] == "not master"
           raise Errors::ReplicaSetReconfigured
         end
         raise
@@ -416,6 +416,10 @@ module Moped
 
           if !primary && Threaded.executing?(:ensure_primary)
             raise Errors::ReplicaSetReconfigured, "#{inspect} is no longer the primary node."
+          elsif !primary && !secondary
+            # not primary or secondary so mark it as down, since it's probably
+            # a recovering node withing the replica set
+            down!
           end
         rescue Timeout::Error
           @peers = []

data/lib/moped/protocol/message.rb

@@ -245,7 +245,7 @@ module Moped
               end
 
               def serialize_#{name}(buffer)
-                buffer << #{name}.pack('q*<')
+                buffer << #{name}.pack('q<*')
               end
 
               def deserialize_#{name}(buffer)

data/lib/moped/protocol/query.rb

@@ -78,6 +78,12 @@ module Moped
       # @return [String, Symbol] the collection to query
       attr_reader :collection
 
+      attr_accessor :batch_size
+
+      def no_timeout=(enable)
+        @flags |= [:no_cursor_timeout] if enable
+      end
+
       # Create a new query command.
       #
       # @example
@@ -105,10 +111,11 @@ module Moped
         @full_collection_name = "#{database}.#{collection}"
         @selector             = selector
         @request_id           = options[:request_id]
-        @flags                = options[:flags]
+        @flags                = options[:flags] || []
         @limit                = options[:limit]
         @skip                 = options[:skip]
         @fields               = options[:fields]
+        @batch_size           = options[:batch_size]
       end
 
       def log_inspect
@@ -121,6 +128,7 @@ module Moped
         fields << ["flags=%s", flags.inspect]
         fields << ["limit=%s", limit.inspect]
         fields << ["skip=%s", skip.inspect]
+        fields << ["batch_size=%s", batch_size.inspect]
         fields << ["fields=%s", self.fields.inspect]
         f, v = fields.transpose
         f.join(" ") % v

data/lib/moped/query.rb

@@ -173,6 +173,34 @@ module Moped
       self
     end
 
+    # Set the query's batch size.
+    #
+    # @example Set the batch size.
+    #   db[:people].find.batch_size(20)
+    #
+    # @param [ Integer ] limit The number of documents per batch.
+    #
+    # @return [ Query ] self
+    #
+    # @since 1.0.0
+    def batch_size(batch_size)
+      operation.batch_size = batch_size
+      self
+    end
+
+    # Disable cursor timeout
+    #
+    # @example Disable cursor timeout.
+    #   db[:people].find.no_timeout
+    #
+    # @return [ Query ] self
+    #
+    # @since 1.0.0
+    def no_timeout
+      operation.no_timeout = true
+      self
+    end
+
     # Execute a $findAndModify on the query.
     #
     # @example Find and modify a document, returning the original.

data/lib/moped/sockets/connectable.rb

@@ -76,8 +76,6 @@ module Moped
       # @since 1.0.0
       def handle_socket_errors
         yield
-      rescue Timeout::Error
-        raise Errors::ConnectionFailure, "Timed out connection to Mongo on #{host}:#{port}"
       rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EPIPE
         raise Errors::ConnectionFailure, "Could not connect to Mongo on #{host}:#{port}"
       rescue Errno::ECONNRESET
@@ -101,11 +99,15 @@ module Moped
         #
         # @since 1.0.0
         def connect(host, port, timeout)
-          Timeout::timeout(timeout) do
-            sock = new(host, port)
-            sock.set_encoding('binary')
-            sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-            sock
+          begin
+            Timeout::timeout(timeout) do
+              sock = new(host, port)
+              sock.set_encoding('binary')
+              sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+              sock
+            end
+          rescue Timeout::Error
+            raise Errors::ConnectionFailure, "Timed out connection to Mongo on #{host}:#{port}"
           end
         end
       end

data/lib/moped/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moped
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-02 00:00:00.000000000 Z
+date: 2012-12-24 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: 3571351846230510378
+      hash: 1373323481754772077
 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: 3571351846230510378
+      hash: 1373323481754772077
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24