mailbox 0.1.6 → 0.1.7

data/.gitignore

@@ -3,3 +3,5 @@ rdoc/*
 **/*.swp
 mailbox.iws
 .rakeTasks
+TAGS
+run_tags.rb

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:minor: 1
 :major: 0
-:patch: 6
+:minor: 1
+:patch: 7
+:build: 

data/lib/mailbox.rb

@@ -75,10 +75,14 @@ module Mailbox
     # will be a +mailslot+. If <tt>:channel</tt> is provided
     # the next method will become a subscriber on the channel.
     # Channel based +mailslot+ methods are also made private
-    # to discourage direct invocation
+    # to discourage direct invocation. <tt>:exception</tt>
+    # can be provided as the symbol for a method to handle
+    # any exceptions that occur in your +mailslot+. This
+    # method will be passed the exception that was raised
     def mailslot(params={})
       @next_channel_name = params[:channel]
       @replyable = params[:replyable]
+      @exception = params[:exception]
       @mailslot = true
     end
     
@@ -104,8 +108,16 @@ module Mailbox
       alias_method :"__#{method_name}__", method_name
       @is_adding_mailbox_to_method = true
 
+      exception_method, @exception = @exception, nil
       define_method( method_name, lambda do |*args|
-        __fiber__.execute { self.send(:"__#{method_name}__", *args ) }
+        __fiber__.execute do 
+          begin
+            self.send(:"__#{method_name}__", *args ) 
+          rescue Exception => ex
+            raise if exception_method.nil?
+            self.send(:"#{exception_method}", ex)
+          end
+        end
       end )
 
       @is_adding_mailbox_to_method = false

data/mailbox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mailbox}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Friedman", "Patrick Farley"]
-  s.date = %q{2010-01-05}
+  s.date = %q{2010-02-26}
   s.description = %q{Mailbox is a JRuby module that simplifies concurrency and is backed by JVM threads.}
   s.email = %q{asher.friedman@gmail.com}
   s.extra_rdoc_files = [

data/test/mailbox_test.rb

@@ -20,7 +20,34 @@ class MailboxTest < Test::Unit::TestCase
 
     assert( latch.await( 1, Latches::TimeUnit::SECONDS ), "Timed out" )
     assert_not_equal JThread.current_thread.name, thread_info[:name]
+  end
+
+  def test_can_set_mailslot_to_callback_on_exception
+    klass = Class.new do
+      include Mailbox
+
+      attr_accessor :ex
+
+      def initialize(latch)
+        @latch = latch
+      end
+
+      mailslot :exception => :handle_exception
+      def test_method
+        raise "test exception"
+      end
+
+      def handle_exception(ex)
+        @ex = ex
+        @latch.count_down
+      end
+    end
 
+    latch = Latches::CountDownLatch.new( 1 )
+    clazz = klass.new(latch)
+    clazz.test_method
+    assert( latch.await( 1, Latches::TimeUnit::SECONDS ), "Timed out" )
+    assert_equal "test exception", clazz.ex.message
   end
 
   def test_default_is_run_asynchronously
@@ -46,7 +73,6 @@ class MailboxTest < Test::Unit::TestCase
     ensure
       Mailbox.synchronous = false;
     end
-
   end
 
   def test_should_support_channels

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mailbox
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
   - Joel Friedman
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 -06:00
+date: 2010-02-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency