moped 1.2.8 → 1.2.9

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Overview
 
-## 1.2.8 (branch: 1.2.0-stable)
+## 1.2.9
+
+* Moped now ensures that when reading bytes from the socket that it continues
+  to read until the requested number of bytes have been received. In the case
+  of getting `nil` back it will raise a `ConnectionFailure` and go through the
+  normal failover motions.
+
+## 1.2.8
 
 ### Resolved Issues
 

data/lib/moped/collection.rb

@@ -24,7 +24,7 @@ module Moped
     def drop
       begin
         database.command(drop: name)
-      rescue Moped::Errors::OperationFailure => e
+      rescue Moped::Errors::OperationFailure
         false
       end
     end

data/lib/moped/connection.rb

@@ -85,10 +85,7 @@ module Moped
     def read
       with_connection do |socket|
         reply = Protocol::Reply.allocate
-        data = socket.read(36)
-        unless data
-          raise Errors::ConnectionFailure, "Attempted read from socket which returned no data."
-        end
+        data = read_data(socket, 36)
         response = data.unpack('l<5q<l<2')
         reply.length,
             reply.request_id,
@@ -102,10 +99,8 @@ module Moped
         if reply.count == 0
           reply.documents = []
         else
-          sock_read = socket.read(reply.length - 36)
-
+          sock_read = read_data(socket, reply.length - 36)
           buffer = StringIO.new(sock_read)
-
           reply.documents = reply.count.times.map do
             BSON::Document.deserialize(buffer)
           end
@@ -157,6 +152,33 @@ module Moped
       @sock = TCPSocket.connect @host, @port, @timeout
     end
 
+    # Read data from the socket until we get back the number of bytes that we
+    # are expecting.
+    #
+    # @api private
+    #
+    # @example Read the number of bytes.
+    #   connection.read_data(socket, 36)
+    #
+    # @param [ TCPSocket ] socket The socket to read from.
+    # @param [ Integer ] length The number of bytes to read.
+    #
+    # @return [ String ] The read data.
+    #
+    # @since 1.2.9
+    def read_data(socket, length)
+      data = socket.read(length)
+      unless data
+        raise Errors::ConnectionFailure.new(
+          "Attempted to read #{length} bytes from the socket but nothing was returned."
+        )
+      end
+      if data.length < length
+        data << read_data(socket, length - data.length)
+      end
+      data
+    end
+
     # Yields a connected socket to the calling back. It will attempt to reconnect
     # the socket if it is not connected.
     #

data/lib/moped/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moped
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
+date: 2012-11-12 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: 2810220741565392289
+      hash: 450437274289811416
 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: 2810220741565392289
+      hash: 450437274289811416
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24