async_sinatra 0.1.4 → 0.1.5

data/examples/basic.ru

@@ -4,6 +4,8 @@ require 'sinatra/async'
 class AsyncTest < Sinatra::Base
   register Sinatra::Async
 
+  enable :show_exceptions
+
   aget '/' do
     body "hello async"
   end
@@ -12,6 +14,10 @@ class AsyncTest < Sinatra::Base
     EM.add_timer(n.to_i) { body { "delayed for #{n} seconds" } }
   end
 
+  aget '/raise' do
+    raise 'boom'
+  end
+
 end
 
-run AsyncTest.new
+run AsyncTest.new

data/lib/sinatra/async.rb

@@ -57,11 +57,32 @@ module Sinatra #:nodoc:
     def ahead(path, opts={}, &bk); aroute 'HEAD', path, opts, &bk; end
 
     private
-    def aroute(*args, &block) #:nodoc:
-      self.send :route, *args do |*bargs|
+    def aroute(verb, path, opts = {}, &block) #:nodoc:
+      route(verb, path, opts) do |*bargs|
+        method = "A#{verb} #{path}".to_sym
+
         mc = class << self; self; end
-        mc.send :define_method, :__async_callback, &block
-        EM.next_tick { send(:__async_callback, *bargs) }
+        mc.send :define_method, method, &block
+        mc.send :alias_method, :__async_callback, method
+
+        EM.next_tick {
+          begin
+            send(:__async_callback, *bargs)
+          rescue ::Exception => boom
+            if options.show_exceptions?
+              # HACK: handle_exception! re-raises the exception if show_exceptions?,
+              # so we ignore any errors and instead create a ShowExceptions page manually
+              handle_exception!(boom) rescue nil
+              s, h, b = Sinatra::ShowExceptions.new(proc{ raise boom }).call(request.env)
+              response.status = s
+              response.headers.replace(h)
+              body(b)
+            else
+              body(handle_exception!(boom))
+            end
+          end
+        }
+
         throw :async      
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: async_sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - James Tucker
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: libraggi
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Asynchronous response API for Sinatra and Thin