bertrpc 0.3.2 → 0.3.4

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.4

data/bertrpc.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bertrpc}
-  s.version = "0.3.2"
+  s.version = "0.3.4"
 
   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-07}
+  s.date = %q{2009-09-25}
   s.email = %q{tom@mojombo.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/bertrpc/service.rb",
      "test/action_test.rb",
      "test/encodes_test.rb",
+     "test/error_test.rb",
      "test/mod_test.rb",
      "test/request_test.rb",
      "test/service_test.rb",
@@ -42,6 +43,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/action_test.rb",
      "test/encodes_test.rb",
+     "test/error_test.rb",
      "test/mod_test.rb",
      "test/request_test.rb",
      "test/service_test.rb",

data/lib/bertrpc/encodes.rb

@@ -20,15 +20,17 @@ module BERTRPC
     end
 
     def error(err)
-      case err[0]
+      level, code, klass, message, backtrace = err
+
+      case level
         when :protocol
-          raise ProtocolError.new(err[2])
+          raise ProtocolError.new([code, message], klass, backtrace)
         when :server
-          raise ServerError.new(err[2])
+          raise ServerError.new([code, message], klass, backtrace)
         when :user
-          raise UserError.new(err[2])
+          raise UserError.new([code, message], klass, backtrace)
         when :proxy
-          raise ProxyError.new(err[2])
+          raise ProxyError.new([code, message], klass, backtrace)
         else
           raise
       end

data/lib/bertrpc/errors.rb

@@ -1,20 +1,29 @@
 module BERTRPC
   class BERTRPCError < StandardError
-    attr_accessor :code
-    def initialize(msg = nil)
+    attr_accessor :code, :original_exception
+
+    def initialize(msg = nil, klass = nil, bt = [])
       case msg
         when Array
-          self.code = msg[0]
-          super(msg[1])
-        when String
-          self.code = nil
-          super(msg)
+          code, message = msg
         else
-          super(msg)
+          code, message = [0, msg]
+      end
+
+      if klass
+        self.original_exception = RemoteError.new("#{klass}: #{message}")
+        self.original_exception.set_backtrace(bt)
       end
+
+      self.code = code
+      super(message)
     end
   end
 
+  class RemoteError < StandardError
+
+  end
+
   class ConnectionError < BERTRPCError
 
   end

data/test/encodes_test.rb

@@ -58,28 +58,28 @@ class EncodesTest < Test::Unit::TestCase
       end
 
       should "raise a ProtocolError error when protocol level error is returned" do
-        req = @enc.encode_ruby_request([:error, [:protocol, 1, "invalid"]])
+        req = @enc.encode_ruby_request([:error, [:protocol, 1, "class", "invalid", []]])
         assert_raises(BERTRPC::ProtocolError) do
           @enc.decode_bert_response(req)
         end
       end
 
       should "raise a ServerError error when server level error is returned" do
-        req = @enc.encode_ruby_request([:error, [:server, 1, "invalid"]])
+        req = @enc.encode_ruby_request([:error, [:server, 1, "class", "invalid", []]])
         assert_raises(BERTRPC::ServerError) do
           @enc.decode_bert_response(req)
         end
       end
 
       should "raise a UserError error when user level error is returned" do
-        req = @enc.encode_ruby_request([:error, [:user, 1, "invalid"]])
+        req = @enc.encode_ruby_request([:error, [:user, 1, "class", "invalid", []]])
         assert_raises(BERTRPC::UserError) do
           @enc.decode_bert_response(req)
         end
       end
 
       should "raise a ProxyError error when proxy level error is returned" do
-        req = @enc.encode_ruby_request([:error, [:proxy, 1, "invalid"]])
+        req = @enc.encode_ruby_request([:error, [:proxy, 1, "class", "invalid", []]])
         assert_raises(BERTRPC::ProxyError) do
           @enc.decode_bert_response(req)
         end

data/test/error_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class ErrorTest < Test::Unit::TestCase
+  context "Errors in general" do
+    should "be creatable with just a message string" do
+      begin
+        raise BERTRPC::BERTRPCError.new('msg')
+      rescue Object => e
+        assert_equal "msg", e.message
+        assert_equal 0, e.code
+      end
+    end
+
+    should "be creatable with a [code, message] array" do
+      begin
+        raise BERTRPC::BERTRPCError.new([7, 'msg'])
+      rescue Object => e
+        assert_equal "msg", e.message
+        assert_equal 7, e.code
+      end
+    end
+
+    should "record the original exception" do
+      begin
+        raise BERTRPC::BERTRPCError.new('msg', 'Error', ['foo', 'bar'])
+      rescue Object => e
+        assert_equal "msg", e.message
+        assert_equal "Error: msg", e.original_exception.message
+        assert_equal ['foo', 'bar'], e.original_exception.backtrace
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bertrpc
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-07 00:00:00 -07:00
+date: 2009-09-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,7 @@ files:
 - lib/bertrpc/service.rb
 - test/action_test.rb
 - test/encodes_test.rb
+- test/error_test.rb
 - test/mod_test.rb
 - test/request_test.rb
 - test/service_test.rb
@@ -83,6 +84,7 @@ summary: BERTRPC is a Ruby BERT-RPC client library.
 test_files: 
 - test/action_test.rb
 - test/encodes_test.rb
+- test/error_test.rb
 - test/mod_test.rb
 - test/request_test.rb
 - test/service_test.rb