mojombo-bertrpc 0.3.0 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.2

data/bertrpc.gemspec

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

data/lib/bertrpc/action.rb

@@ -36,12 +36,14 @@ module BERTRPC
 
       write(sock, bert_request)
       lenheader = sock.read(4)
-      raise ProtocolError.new("Unable to read length header from server.") unless lenheader
+      raise ProtocolError.new(ProtocolError::NO_HEADER) unless lenheader
       len = lenheader.unpack('N').first
       bert_response = sock.read(len)
-      raise ProtocolError.new("Unable to read data from server.") unless bert_response
+      raise ProtocolError.new(ProtocolError::NO_DATA) unless bert_response
       sock.close
       bert_response
+    rescue Errno::ECONNREFUSED
+      raise ConnectionError.new("Unable to connect to #{@svc.host}:#{@svc.port}")
     end
   end
 end

data/lib/bertrpc/errors.rb

@@ -1,10 +1,27 @@
 module BERTRPC
   class BERTRPCError < StandardError
+    attr_accessor :code
+    def initialize(msg = nil)
+      case msg
+        when Array
+          self.code = msg[0]
+          super(msg[1])
+        when String
+          self.code = nil
+          super(msg)
+        else
+          super(msg)
+      end
+    end
+  end
+
+  class ConnectionError < BERTRPCError
 
   end
 
   class ProtocolError < BERTRPCError
-
+    NO_HEADER = [0, "Unable to read length header from server."]
+    NO_DATA = [1, "Unable to read data from server."]
   end
 
   class ServerError < BERTRPCError

data/test/action_test.rb

@@ -67,8 +67,11 @@ class ActionTest < Test::Unit::TestCase
         io.expects(:write).with("foo")
         io.expects(:read).with(4).returns(nil)
         TCPSocket.expects(:new).returns(io)
-        assert_raises(BERTRPC::ProtocolError) do
+        begin
           @call.transaction("foo")
+          fail "Should have thrown an error"
+        rescue BERTRPC::ProtocolError => e
+          assert_equal 0, e.code
         end
       end
       
@@ -79,8 +82,11 @@ class ActionTest < Test::Unit::TestCase
         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
+         begin
           @call.transaction("foo")
+          fail "Should have thrown an error"
+        rescue BERTRPC::ProtocolError => e
+          assert_equal 1, e.code
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojombo-bertrpc
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-05 00:00:00 -07:00
+date: 2009-09-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,6 @@ files:
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/mojombo/bertrpc
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -75,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: BERTRPC is a Ruby BERT-RPC client library.