angelo 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6587b907b0623b8cc15e44cd6b8bcbe13f74457f
-  data.tar.gz: 7a1f799676dd2aaedc0bc5f2752849ca2edb3b91
+  metadata.gz: dd2cb610a7377a13e931101270360afe324e1abd
+  data.tar.gz: 079ed6a36ff484e41ca11fdd7a1791a874923904
 SHA512:
-  metadata.gz: bfaa807fa0ec7facc7475b5d6af7e476138396dccf06607705a27996a19109ebffbdbdc1b308f0f429a2bad7b5bba015301ab9c8c76336a1a944565f9a89c634
-  data.tar.gz: 1913737e3cda415a6741215f6d65a0a54a0247f74bbc7cae1dd55974e95d40983dca9a8d933baa028a8f7f0c44297346104328ad2e790e0915567079afe70d29
+  metadata.gz: c6e24a7a88a9b44361c0efebb43ee3fb58130c19280cf3c73b013748ab87b76d104d85b0bd93416b7577c6504680550cfb5f77c8d2be9a38d3c7865eec9f250d
+  data.tar.gz: 543e9def3af8a7d149a8ce17bd1a15702a88a807949a1584f1e58f34815921fd5c2446c1b0ea536d3743156ea62e3ceb493b2235263438e3b5447fc109f1043e

data/README.md

@@ -538,7 +538,7 @@ class Foo < Angelo::Base
     # this is a call to Base#future, telling the reactor
     # do this thing and we'll want the value eventually
     #
-    f = future :in_sec params[:sec], params[:msg]
+    f = future :in_sec, params[:sec], params[:msg]
     f.value
   end
 

data/lib/angelo/base.rb

@@ -128,15 +128,15 @@ module Angelo
         Angelo::Server.define_task name, &block
       end
 
-      def websockets
+      def websockets reject = true
         @websockets ||= Stash::Websocket.new server
-        @websockets.reject! &:closed?
+        @websockets.reject! &:closed? if reject
         @websockets
       end
 
-      def sses
+      def sses reject = true
         @sses ||= Stash::SSE.new server
-        @sses.reject! &:closed?
+        @sses.reject! &:closed? if reject
         @sses
       end
 
@@ -287,7 +287,7 @@ module Angelo
 
     def eventsource &block
       headers SSE_HEADER
-      async :handle_event_source, EventSource.new(responder.connection.detach.socket), block
+      async :handle_event_source, EventSource.new(responder), block
       halt 200, :sse
     end
 
@@ -313,11 +313,12 @@ module Angelo
     class EventSource
       extend Forwardable
 
-      def_delegators :@socket, :close, :closed?, :<<, :write
-      attr_reader :socket
+      def_delegators :@socket, :close, :closed?, :<<, :write, :peeraddr
+      attr_reader :responder, :socket
 
-      def initialize socket
-        @socket = socket
+      def initialize responder
+        @responder = responder
+        @socket = @responder.connection.detach.socket
       end
 
       def event name, data = nil
@@ -328,6 +329,15 @@ module Angelo
         @socket.write Base.sse_message(data)
       end
 
+      def on_close &block
+        @responder.on_close = block
+      end
+
+      def on_close= block
+        raise ArgumentError.new unless Proc === block
+        @responder.on_close = block
+      end
+
     end
 
     class ChunkedResponse

data/lib/angelo/responder.rb

@@ -30,20 +30,18 @@ module Angelo
 
     end
 
-    attr_accessor :connection
-    attr_reader :request
+    attr_accessor :connection, :request
     attr_writer :base
 
     def initialize &block
       @response_handler = Base.compile! :request_handler, &block
     end
 
-    def request= request
+    def reset!
       @params = nil
       @redirect = nil
       @body = nil
-      @request = request
-      handle_request
+      @request = nil
     end
 
     def handle_request
@@ -199,6 +197,15 @@ module Angelo
       @redirect = url
     end
 
+    def on_close= on_close
+      raise ArgumentError.new unless Proc === on_close
+      @on_close = on_close
+    end
+
+    def on_close
+      @on_close[] if @on_close
+    end
+
   end
 
 end

data/lib/angelo/server.rb

@@ -18,10 +18,15 @@ module Angelo
 
     def on_connection connection
       # RubyProf.resume
+      responders = []
+
       connection.each_request do |request|
         meth = request.websocket? ? :websocket : request.method.downcase.to_sym
-        dispatch! meth, connection, request
+        responder = dispatch! meth, connection, request
+        responders << responder if responder and responder.respond_to? :on_close
       end
+
+      responders.each &:on_close
       # RubyProf.pause
     end
 
@@ -49,9 +54,12 @@ module Angelo
     def route! meth, connection, request
       if @base.routes[meth] and rs = @base.routes[meth][request.path]
         responder = rs.dup
+        responder.reset!
         responder.base = @base.new responder
         responder.connection = connection
         responder.request = request
+        responder.handle_request
+        responder
       else
         Angelo.log connection, request, nil, :not_found
         connection.respond :not_found, DEFAULT_RESPONSE_HEADERS, NOT_FOUND

data/lib/angelo/version.rb

@@ -1,3 +1,3 @@
 module Angelo
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angelo
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel