rack-async 0.0.1 → 0.1.0

data/lib/rack/async.rb

@@ -49,33 +49,94 @@ module Rack
       alias wait pop
     end
     
+    module Deferrable
+      def set_deferred_status(status, *args)
+        @deferred_status = status
+        @deferred_args = args
+        iterator = Proc.new {|block| block.call(*@deferred_args)}
+        case status
+        when :succeeded
+          @callbacks.each(&iterator)
+        when :failed
+          @errbacks.each(&iterator)
+        end
+        @callbacks.clear
+        @errbacks.clear
+      end
+      
+      def succeed(*args)
+        set_deferred_status(:succeeded)
+      end
+      alias finish succeed
+      alias set_deferred_success succeed
+      
+      def fail(*args)
+        set_deferred_status(:failed)
+      end
+      alias set_deferred_failure fail
+      
+      def callback(&block)
+        if @deferred_status == :succeeded
+          block.call(*@deferred_args)
+        elsif @deferred_status != :failed
+          @callbacks.unshift(block)
+        end
+      end
+      
+      def errback(&block)
+        if @deferred_status == :failed
+          block.call(*@deferred_args)
+        elsif @deferred_status != :succeeded
+          @errbacks.unshift(block)
+        end
+      end
+    end
+    
     class BlockingBody < Queue
+      include Deferrable
+      
+      def initialize(*args)
+        super
+        @callbacks = []
+        @errbacks = []
+      end
+      
       def each
-        until @finished && empty?
+        until @deferred_status && empty?
           data = pop
           yield data if data
         end
+      rescue
+        fail
+        raise
       end
       
-      def succeed
-        @finished = true
+      def set_deferred_status(*args)
+        super
         self << nil
       end
-      alias finish succeed
-      alias fail succeed
     end
     
     class CallbackBody
+      include Deferrable
+      
       def initialize(*args)
         super
         @buffer = []
         @lock = Mutex.new
+        @callbacks = []
+        @errbacks = []
       end
       
       def <<(data)
         @lock.synchronize do
           if @each_callback
-            @each_callback.call(data)
+            begin
+              @each_callback.call(data)
+            rescue
+              fail
+              raise
+            end
           else
             @buffer << data
           end
@@ -91,37 +152,7 @@ module Rack
         end
       end
       
-      def succeed
-        @callback.call if @callback
-        @finished = true
-      end
-      alias finish succeed
-      
-      def fail
-        @errback.call if @errback
-        @finished = true
-      end
-      
-      def callback(&block)
-        if !@callback && @finished
-          block.call
-        else
-          @callback = block
-        end
-      end
-      
-      def errback(&block)
-        if !@errback && @finished
-          block.call
-        else
-          @errback = block
-        end
-      end
-      
-      def on_eof(&block)
-        callback(&block)
-        errback(&block)
-      end
+      alias on_eof callback # :nodoc: ebb compatibility
     end
     
   end

metadata

@@ -1,71 +1,51 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-async
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Matthew Sadler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-19 00:00:00 +00:00
-default_executable: 
+date: 2011-10-09 00:00:00.000000000Z
 dependencies: []
-
 description: Thin's asynchronous API available to any Rack server.
 email: mat@sourcetagsandcodes.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - lib/rack/async.rb
 - README.rdoc
-has_rdoc: true
 homepage: http://github.com/matsadler/rack-async
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
 - --charset
 - utf-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: An asynchronous Rack API for everyone.
 test_files: []
-