bertrpc 1.1.2 → 1.2.0

data/History.txt

@@ -1,3 +1,8 @@
+= 1.2.0 / 2010-02-09
+  * Enhancements
+    * Better timeouts courtesy of select(2)
+    * BERTRPCError gives self for original_exception if nil
+
 = 1.1.2 / 2009-11-27
   * Minor Changes
     * Add useful debugging information to ReadTimeoutError

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/bertrpc.gemspec

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

data/lib/bertrpc/action.rb

@@ -23,8 +23,21 @@ module BERTRPC
       sock.write(bert)
     end
 
+    def read(sock, len, timeout)
+      data, size = [], 0
+      while size < len
+        r, w, e = IO.select([sock], [], [], timeout)
+        raise Errno::EAGAIN if r.nil?
+        msg, sender = sock.recvfrom(len - size)
+        size += msg.size
+        data << msg
+      end
+      data.join ''
+    end
+
     def transaction(bert_request)
-      sock = connect_to(@svc.host, @svc.port, @svc.timeout)
+      timeout = @svc.timeout && Float(@svc.timeout)
+      sock = connect_to(@svc.host, @svc.port, timeout)
 
       if @req.options
         if @req.options[:cache] && @req.options[:cache][0] == :validation
@@ -35,10 +48,10 @@ module BERTRPC
       end
 
       write(sock, bert_request)
-      lenheader = sock.read(4)
+      lenheader = read(sock, 4, timeout)
       raise ProtocolError.new(ProtocolError::NO_HEADER) unless lenheader
       len = lenheader.unpack('N').first
-      bert_response = sock.read(len)
+      bert_response = read(sock, len, timeout)
       raise ProtocolError.new(ProtocolError::NO_DATA) unless bert_response
       sock.close
       bert_response
@@ -57,7 +70,8 @@ module BERTRPC
     #   +port+ Integer port of the target TCP server
     #   +timeout+ Optional Integer (in seconds) of the read timeout
     def connect_to(host, port, timeout = nil)
-      sock = TCPSocket.new(host, port)
+      addr = Socket.getaddrinfo(host, nil)
+      sock = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
       sock.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
 
       if timeout
@@ -68,6 +82,7 @@ module BERTRPC
         sock.setsockopt Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, optval
       end
 
+      sock.connect(Socket.pack_sockaddr_in(port, addr[0][3]))
       sock
     end
   end

data/lib/bertrpc/errors.rb

@@ -13,6 +13,8 @@ module BERTRPC
       if klass
         self.original_exception = RemoteError.new("#{klass}: #{message}")
         self.original_exception.set_backtrace(bt)
+      else
+        self.original_exception = self
       end
 
       self.code = code

data/test/action_test.rb

@@ -54,8 +54,8 @@ class ActionTest < Test::Unit::TestCase
         io = stub()
         io.expects(:write).with("\000\000\000\003")
         io.expects(:write).with("foo")
-        io.expects(:read).with(4).returns("\000\000\000\003")
-        io.expects(:read).with(3).returns("bar")
+        @call.expects(:read).with(io, 4, nil).returns("\000\000\000\003")
+        @call.expects(:read).with(io, 3, nil).returns("bar")
         io.expects(:close)
         @call.expects(:connect_to).returns(io)
         assert_equal "bar", @call.transaction("foo")
@@ -65,7 +65,7 @@ class ActionTest < Test::Unit::TestCase
         io = stub()
         io.expects(:write).with("\000\000\000\003")
         io.expects(:write).with("foo")
-        io.expects(:read).with(4).returns(nil)
+        @call.expects(:read).with(io, 4, nil).returns(nil)
         @call.expects(:connect_to).returns(io)
         begin
           @call.transaction("foo")
@@ -79,8 +79,8 @@ class ActionTest < Test::Unit::TestCase
         io = stub()
         io.expects(:write).with("\000\000\000\003")
         io.expects(:write).with("foo")
-        io.expects(:read).with(4).returns("\000\000\000\003")
-        io.expects(:read).with(3).returns(nil)
+        @call.expects(:read).with(io, 4, nil).returns("\000\000\000\003")
+        @call.expects(:read).with(io, 3, nil).returns(nil)
         @call.expects(:connect_to).returns(io)
          begin
           @call.transaction("foo")
@@ -94,7 +94,7 @@ class ActionTest < Test::Unit::TestCase
         io = stub()
         io.expects(:write).with("\000\000\000\003")
         io.expects(:write).with("foo")
-        io.expects(:read).with(4).raises(Errno::EAGAIN)
+        @call.expects(:read).with(io, 4, nil).raises(Errno::EAGAIN)
         @call.expects(:connect_to).returns(io)
         begin
           @call.transaction("foo")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bertrpc
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-28 00:00:00 -08:00
+date: 2010-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency