bertrpc 1.2.1 → 1.3.0

data/History.txt

@@ -1,3 +1,7 @@
+= 1.3.0 / 2010-02-24
+  * Enhancements
+    * Raise BERTRPC::ReadTimeout if remote connection is closed
+
 = 1.2.1 / 2010-02-10
   * Bug fixes
     * Restrict to IPv4

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.3.0

data/bertrpc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bertrpc}
-  s.version = "1.2.1"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2010-02-10}
+  s.date = %q{2010-02-24}
   s.email = %q{tom@mojombo.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/bertrpc/action.rb

@@ -29,6 +29,7 @@ module BERTRPC
         r, w, e = IO.select([sock], [], [], timeout)
         raise Errno::EAGAIN if r.nil?
         msg, sender = sock.recvfrom(len - size)
+        raise Errno::ECONNRESET if msg.size == 0
         size += msg.size
         data << msg
       end
@@ -56,9 +57,11 @@ module BERTRPC
       sock.close
       bert_response
     rescue Errno::ECONNREFUSED
-      raise ConnectionError.new("Unable to connect to #{@svc.host}:#{@svc.port}")
+      raise ConnectionError.new(@svc.host, @svc.port)
     rescue Errno::EAGAIN
       raise ReadTimeoutError.new(@svc.host, @svc.port, @svc.timeout)
+    rescue Errno::ECONNRESET
+      raise ReadError.new(@svc.host, @svc.port)
     end
 
     # Creates a socket object which does speedy, non-blocking reads

data/lib/bertrpc/errors.rb

@@ -27,7 +27,11 @@ module BERTRPC
   end
 
   class ConnectionError < BERTRPCError
-
+    attr_reader :host, :port
+    def initialize(host, port)
+      @host, @port = host, port
+      super("Unable to connect to #{host}:#{port}")
+    end
   end
 
   # Raised when we don't get a response from a server in a timely
@@ -40,6 +44,15 @@ module BERTRPC
     end
   end
 
+  # Raised when unexpected EOF is reached on the socket.
+  class ReadError < BERTRPCError
+    attr_reader :host, :port
+    def initialize(host, port)
+      @host, @port = host, port
+      super("Unable to read from #{host}:#{port}")
+    end
+  end
+
   class ProtocolError < BERTRPCError
     NO_HEADER = [0, "Unable to read length header from server."]
     NO_DATA = [1, "Unable to read data from server."]

data/test/action_test.rb

@@ -105,6 +105,22 @@ class ActionTest < Test::Unit::TestCase
           assert_equal 9941, e.port
         end
       end
+
+      should "raise a ReadError when the socket becomes unreadable" do
+        io = stub()
+        io.expects(:write).with("\000\000\000\003")
+        io.expects(:write).with("foo")
+        @call.expects(:read).with(io, 4, nil).raises(Errno::ECONNRESET)
+        @call.expects(:connect_to).returns(io)
+        begin
+          @call.transaction("foo")
+          fail "Should have thrown an error"
+        rescue BERTRPC::ReadError => e
+          assert_equal 0, e.code
+          assert_equal 'localhost', e.host
+          assert_equal 9941, e.port
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bertrpc
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 -08:00
+date: 2010-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency