mojombo-bertrpc 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bertrpc.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bertrpc}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]

data/lib/bertrpc/fun.rb

@@ -19,8 +19,11 @@ module BERTRPC
       sock = TCPSocket.new(@svc.host, @svc.port)
       sock.write([bert_request.length].pack("N"))
       sock.write(bert_request)
-      len = sock.read(4).unpack('N').first
+      lenheader = sock.read(4)
+      raise ProtocolError.new("Unable to read length header from server.") unless lenheader
+      len = lenheader.unpack('N').first
       bert_response = sock.read(len)
+      raise ProtocolError.new("Unable to read data from server.") unless bert_response
       sock.close
       bert_response
     end

data/test/fun_test.rb

@@ -77,6 +77,29 @@ class FunTest < Test::Unit::TestCase
         TCPSocket.expects(:new).returns(io)
         assert_equal "bar", @fun.sync_request("foo")
       end
+
+      should "raise a ProxyError when the length is invalid" do
+        io = stub()
+        io.expects(:write).with("\000\000\000\003")
+        io.expects(:write).with("foo")
+        io.expects(:read).with(4).returns(nil)
+        TCPSocket.expects(:new).returns(io)
+        assert_raises(BERTRPC::ProtocolError) do
+          @fun.sync_request("foo")
+        end
+      end
+
+      should "raise a ProxyError when the data is invalid" do
+        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)
+        TCPSocket.expects(:new).returns(io)
+        assert_raises(BERTRPC::ProtocolError) do
+          @fun.sync_request("foo")
+        end
+      end
     end
 
     context "ruby request encoder" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojombo-bertrpc
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Tom Preston-Werner