async-rack 0.4.0.b → 0.4.0.c

data/lib/async_rack/async_callback.rb

@@ -72,7 +72,27 @@ module AsyncRack
       end
     end
 
+    module LateInitializer
+      def included(klass)
+        setup_late_initialize klass if klass.is_a? Class
+        klass.extend LateInitializer
+        super
+      end
+
+      private
+      def setup_late_initialize(klass)
+        class << klass
+          alias create new
+          def new(*args, &block)
+            proc { |env| create(*args, &block).call(env) }
+          end
+        end
+      end
+    end
+
     module Mixin
+      extend LateInitializer
+
       def async_callback(result)
         @async_callback.call result
       end

data/spec/async_rack/async_callback_spec.rb

@@ -25,16 +25,26 @@ describe AsyncRack::AsyncCallback do
   end
 
   describe :SimpleWrapper do
-    it "runs #call again on async callback, replacing app" do
-      klass = Class.new do
+    before do
+      @class = Class.new do
         include AsyncRack::AsyncCallback::SimpleWrapper
         attr_accessor :app, :env
+        class << self
+          attr_accessor :instance
+        end
+        def initialize(app = nil)
+          self.class.instance = self
+          @app = app
+        end
         def call(env)
           setup_async env
           @app.call(env) + 5
         end
       end
-      middleware = klass.new
+    end
+
+    it "runs #call again on async callback, replacing app" do
+      middleware = @class.create
       middleware.app = proc { throw :async }
       catch(:async) do
         middleware.call "async.callback" => proc { |x| x + 10 }
@@ -42,6 +52,26 @@ describe AsyncRack::AsyncCallback do
       end
       middleware.env["async.callback"].call(0).should == 15
     end
+
+    it "plays well with Rack::Builder" do
+      klass = @class
+      app = Rack::Builder.app do
+        use klass
+        run lambda { |env|
+          return 37 if @threw
+          @threw = true
+          throw :async
+        }
+      end
+      catch(:async) do
+        app.call "async.callback" => proc { |x| x + 10 }
+        raise "should not get here"
+      end
+      @class.instance.env["async.callback"].call(0).should == 15
+      @class.instance.env["async.callback"].call(10).should == 25
+      result = app.call "async.callback" => proc { |x| x + 10 }
+      result.should == 42
+    end
   end
 
   describe :Mixin do

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 4
   - 0
-  - b
-  version: 0.4.0.b
+  - c
+  version: 0.4.0.c
 platform: ruby
 authors: 
 - Konstantin Haase
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 +01:00
+date: 2010-03-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency