async_sinatra 0.2.3 → 0.3.0

data/Rakefile

@@ -93,4 +93,5 @@ desc "Release #{gem_task.gem_spec.file_name}"
 task :release => [:tag, :gem, :publish] do |t|
   sh "rubyforge add_release #{spec.rubyforge_project} #{spec.name} #{spec.version} #{gem_task.package_dir}/#{gem_task.gem_spec.file_name}"
   sh "gem push #{gem_task.package_dir}/#{gem_task.gem_spec.file_name}"
+  sh "git push --all --tags"
 end

data/lib/sinatra/async.rb

@@ -85,32 +85,41 @@ module Sinatra #:nodoc:
         end
       end
 
-      # By default async_schedule calls EventMachine#next_tick, if you're using
-      # threads or some other scheduling mechanism, it must take the block
-      # passed here.
+      # async_schedule is used to schedule work in a future context, the block
+      # is wrapped up so that exceptions and halts (redirect, etc) are handled
+      # correctly.
       def async_schedule(&b)
         if options.environment == :test
           options.set :async_schedules, [] unless options.respond_to? :async_schedules
-          options.async_schedules << b
+          options.async_schedules << lambda { async_catch_execute(&b) }
         else
-          EM.next_tick(&b)
+          native_async_schedule { async_catch_execute(&b) }
         end
       end
 
+      # By default native_async_schedule calls EventMachine#next_tick, if
+      # you're using threads or some other scheduling mechanism, it must take
+      # the block passed here and schedule it for running in the future.
+      def native_async_schedule(&b)
+        EM.next_tick(&b)
+      end
+
       # Defaults to throw async as that is most commonly used by servers.
       def async_response
         throw :async
       end
 
       def async_runner(method, *bargs)
-        async_schedule do
-          @async_running = true
-          async_handle_exception do
-            if h = catch(:halt) { __send__(method, *bargs); nil }
-              invoke { halt h }
-              invoke { error_block! response.status }
-              body(response.body)
-            end
+        async_schedule { __send__(method, *bargs); nil }
+      end
+
+      def async_catch_execute(&b)
+        @async_running = true
+        async_handle_exception do
+          if h = catch(:halt, &b)
+            invoke { halt h }
+            invoke { error_block! response.status }
+            body(response.body)
           end
         end
       end

data/test/test_async.rb

@@ -43,7 +43,7 @@ class TestSinatraAsync < Test::Unit::TestCase
     end
 
     aget '/em_halt' do
-      EM.next_tick { ahalt 404 }
+      em_async_schedule { ahalt 404 }
     end
 
     aget '/s401' do
@@ -69,6 +69,25 @@ class TestSinatraAsync < Test::Unit::TestCase
     aget '/redirect' do
       redirect '/'
     end
+
+    aget '/aredirect' do
+      async_schedule { redirect '/' }
+    end
+
+    aget '/emredirect' do
+      em_async_schedule { redirect '/' }
+    end
+
+    # Defeat the test environment semantics, ensuring we actually follow the
+    # non-test branch of async_schedule. You would normally just call
+    # async_schedule in user apps, and use test helpers appropriately.
+    def em_async_schedule
+      o = self.class.environment
+      self.class.set :environment, :normal
+      async_schedule { yield }
+    ensure
+      self.class.set :environment, o
+    end
   end
 
   def app
@@ -154,4 +173,19 @@ class TestSinatraAsync < Test::Unit::TestCase
     assert_equal 302, last_response.status
     assert_equal '/', last_response.location
   end
+
+  def test_aredirect
+    aget '/aredirect'
+    assert last_response.redirect?
+    assert_equal 302, last_response.status
+    assert_equal '/', last_response.location
+  end
+
+  def test_emredirect
+    aget '/emredirect'
+    em_async_continue
+    assert last_response.redirect?
+    assert_equal 302, last_response.status
+    assert_equal '/', last_response.location
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: async_sinatra
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - James Tucker