put remote exceptions into original_exception instead of dangerous ba…

…cktrace hacking

lib/bertrpc/errors.rb

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

test/error_test.rb

@@ -2,11 +2,31 @@
 
 class ErrorTest < Test::Unit::TestCase
   context "Errors in general" do
-    should "concatenate remote and local backtraces" 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 ['---REMOTE---', 'foo', 'bar', '---LOCAL---'], e.backtrace[0..3]
+        assert_equal "msg", e.message
+        assert_equal "Error: msg", e.original_exception.message
+        assert_equal ['foo', 'bar'], e.original_exception.backtrace
       end
     end
   end