pigeon 0.4.10 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.10
+0.5.0

data/lib/pigeon/engine.rb

@@ -311,12 +311,18 @@ class Pigeon::Engine
   end
   
   # Used to defer a block of work for near-immediate execution. Is a 
-  # wrapper around EventMachine#defer and does not perform as well as using
+  # wrapper around EventMachine.defer and does not perform as well as using
   # the alternate dispatch method.
   def defer(&block)
     EventMachine.defer(&block)
   end
   
+  # Schedules a block for execution on the main EventMachine thread. This is
+  # a wrapper around the EventMachine.schedule method.
+  def schedule(&block)
+    EventMachine.schedule(&block)
+  end
+  
   # Shuts down the engine. Will also trigger the before_stop and after_stop
   # events.
   def terminate

data/lib/pigeon/task.rb

@@ -113,14 +113,7 @@ protected
     end
     
   rescue Object => e
-    @exception = e
-
-    handle_exception(e) rescue nil
-    
-    transition_to_state(:failed) unless (self.failed?)
-    
-    self.after_failed
-    self.after_terminated
+    exeption_received(e)
   ensure
     after_state(state)
 
@@ -158,6 +151,19 @@ protected
     end
   end
   
+  # This allows a block to be executed in the main event thread where it is
+  # strictly required. Any exceptions generated by the block will be captured
+  # and will cause the task to transition to the failed state.
+  def execute_in_main_thread
+    @engine.schedule do
+      begin
+        yield
+      rescue Object => e
+        exeption_received(e)
+      end
+    end
+  end
+  
   # Called just after the task is initialized.
   def after_initialized
   end
@@ -194,4 +200,18 @@ protected
   def state_initialized!
     transition_to_state(:finished)
   end
+  
+  # This method is used to handle an exception and run through the proper
+  # failure handling mechanism. The handle_exception method is provided for
+  # subclasses to customize.
+  def exception_received(e)
+    @exception = e
+
+    handle_exception(e) rescue nil
+  
+    transition_to_state(:failed) unless (self.failed?)
+  
+    self.after_failed
+    self.after_terminated
+  end
 end

data/pigeon.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pigeon}
-  s.version = "0.4.10"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["tadman"]

metadata

@@ -2,7 +2,7 @@
 name: pigeon
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.10
+  version: 0.5.0
 platform: ruby
 authors: 
 - tadman