emdrb 0.4.1 → 0.4.2

data/History.txt

@@ -1,3 +1,6 @@
+== 0.4.2 / 2009-04-22
+* Fix exception propagation for local deferrable methods
+
 == 0.4.1 / 2009-04-21
 * Bug in calling deferrable methods from a local object now fixed
 

data/lib/emdrb/emdrb.rb

@@ -5,7 +5,7 @@
 # Homepage:: http://emdrb.rubyforge.org/
 # License:: GNU General Public License / Ruby License
 #
-# $Id: emdrb.rb 129 2009-04-21 03:21:07Z dido $
+# $Id: emdrb.rb 135 2009-04-22 03:51:32Z dido $
 #
 #----------------------------------------------------------------------------
 #
@@ -843,19 +843,19 @@ module DRb
     def send_async(msg_id, *a, &b)
       df = EventMachine::DefaultDeferrable.new
       if DRb.here?(@uri)
-	obj = DRb.to_obj(@ref)
-	DRb.current_server.check_insecure_method(obj, msg_id)
-        if obj.kind_of?(DRbEMSafe) && obj.class.deferrable_method?(msg_id)
-          # If the method is a deferrable, calling the method will itself
-          # return a deferrable by definition, and we should be using this
-          # deferrable to determine whether the call succeeded or failed.
-          df = obj.__send__(msg_id, *a, &b)
-        else
-          begin
+        obj = DRb.to_obj(@ref)
+        DRb.current_server.check_insecure_method(obj, msg_id)
+        begin
+          if obj.kind_of?(DRbEMSafe) && obj.class.deferrable_method?(msg_id)
+            # If the method is a deferrable, calling the method will itself
+            # return a deferrable by definition, and we should be using this
+            # deferrable to determine whether the call succeeded or failed.
+            df = obj.__send__(msg_id, *a, &b)
+          else
             df.succeed(obj.__send__(msg_id, *a, &b))
-          rescue
-            df.fail($!)
           end
+        rescue
+          df.fail($!)
         end
         return(df)
       end

data/lib/emdrb/version.rb

@@ -4,7 +4,7 @@
 # Homepage:: http://emdrb.rubyforge.org/
 # License:: GNU Lesser General Public License / Ruby License
 #
-# $Id: version.rb 130 2009-04-21 03:21:53Z dido $
+# $Id: version.rb 137 2009-04-22 03:53:11Z dido $
 #
 #----------------------------------------------------------------------------
 #
@@ -22,5 +22,5 @@
 # EMDRb version code
 #
 module EMDRb
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/emdrb_spec.rb

@@ -5,7 +5,7 @@
 # Homepage:: http://emdrb.rubyforge.org/
 # License:: GNU General Public License / Ruby License
 #
-# $Id: emdrb_spec.rb 128 2009-04-21 03:15:04Z dido $
+# $Id: emdrb_spec.rb 136 2009-04-22 03:52:14Z dido $
 #
 #----------------------------------------------------------------------------
 #
@@ -33,6 +33,10 @@ class LocalDeferrable
     return(df)
   end
 
+  def df_tester_exception
+    raise "test exception"
+  end
+
   deferrable_method :df_tester
 end
 
@@ -110,6 +114,8 @@ describe EMDRb do
 
   it "should call local deferrables correctly" do
     @obj2.df_tester(1).should == 2
+    lambda { @obj2.df_tester_exception }.should raise_error(RuntimeError,
+                                                            "test exception")
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: emdrb
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - dido@imperium.ph
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-21 00:00:00 +08:00
+date: 2009-04-22 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency