Merge 8fdcc17 into 05a0fca

CHANGES.md

@@ -1,3 +1,7 @@
+HEAD
+----
+* Remove on_error callback system
+
 0.3.0
 -----
 * Reel::App: Sinatra-like DSL for defining Reel apps using Octarine

lib/reel/stream.rb

@@ -10,8 +10,10 @@ def call(socket)
     end
 
     def write(data)
-      write!  data
-      self
+      @socket << data
+      data
+    rescue Errno::EPIPE
+      raise SocketError, "error writing to socket"
     end
     alias :<< :write
 
@@ -20,11 +22,6 @@ def each(*)
       yield self
     end
 
-    def on_error(&proc)
-      @on_error = proc
-      self
-    end
-
     def close
       @socket.close unless closed?
     end
@@ -33,14 +30,6 @@ def close
     def closed?
       @socket.closed?
     end
-
-    private
-    def write!(string)
-      @socket << string
-    rescue => e
-      @on_error ? @on_error.call(e) : raise(e)
-    end
-
   end
 
   class EventStream < Stream

lib/reel/websocket.rb

@@ -65,9 +65,8 @@ def read_every(n, unit = :s)
     def read
       @parser.append @socket.readpartial(Connection::BUFFER_SIZE) until msg = @parser.next_message
       msg
-    rescue => e
+    ensure
       cancel_timer!
-      @on_error ? @on_error.call(e) : raise(e)
     end
 
     def body
@@ -77,9 +76,10 @@ def body
     def write(msg)
       @socket << ::WebSocket::Message.new(msg).to_data
       msg
-    rescue => e
+    rescue Errno::EPIPE
+      raise SocketError, "error writing to socket"
+    ensure
       cancel_timer!
-      @on_error ? @on_error.call(e) : raise(e)
     end
     alias_method :<<, :write