rack-emstream 0.1.2 → 0.1.4

data/README.md

@@ -18,7 +18,7 @@ class FileStreamer
   end
 end
 
-# then respond with a FileStreamer
+# then respond with a `FileStreamer`
 
 def call(env)
   # ... do stuff ...
@@ -27,16 +27,22 @@ def call(env)
 end
 ```
 
-Nothing to configure, just drop it in to your Rack middleware stack and
-use Thin as your server:
+Only one thing to configure, the error handler if something explodes during the deferred
+callback (since you no longer have your Rack handlers at that point):
 
 ``` ruby
 # for Rails:
 
-config.middleware.insert_before(::Rack::Lock, ::Rack::EMStream)
+config.middleware.insert_before(::Rack::Lock, ::Rack::EMStream) do |exception, environment|
+  # do something when there's a deferred error
+end
 
 # for Rack::Builder and derivatives:
 
-use Rack::EMStream
+use Rack::EMStream do |exception, environment|
+  # do something when there's a deferred error
+end
 ```
 
+I'm still pretty n00b to async stuff, so if you have suggestions, let me know!
+

data/lib/rack-emstream.rb

@@ -4,8 +4,8 @@ module Rack
   class EMStream
     include EventMachine::Deferrable
 
-    def initialize(app)
-      @app = app
+    def initialize(app, &block)
+      @app, @block = app, block
     end
 
     def each(&b)
@@ -21,14 +21,31 @@ module Rack
 
       result[2].close if result[2].respond_to?(:close)
 
-      EM.next_tick {
-        env['async.callback'].call [ result[0], result[1], self ]
-
-        result[2].each { |data| EM.next_tick { @callback.call(data) } }
-        EM.next_tick { succeed }
-      }
-
-      throw :async
+      if env['async.callback']
+        EM.next_tick {
+          env['async.callback'].call [ result[0], result[1], self ]
+
+          begin
+            result[2].each { |data|
+              EM.next_tick {
+                begin
+                  @callback.call(data)
+                rescue => e
+                  @callback.call(@block.call(e, env)) if @block
+                end
+              }
+            }
+          rescue => e
+            @callback.call(@block.call(e, env)) if @block
+          end
+
+          EM.next_tick { succeed }
+        }
+
+        throw :async
+      else
+        result
+      end
     end
   end
 end

data/lib/rack-emstream/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class EMStream
-    VERSION = "0.1.2"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-emstream
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -69,3 +69,4 @@ signing_key:
 specification_version: 3
 summary: Super-simple Rack streaming with Thin
 test_files: []
+has_rdoc: