angelo 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dd4947d9238c95169d7a38db1ff5964db35efad
-  data.tar.gz: 65d2a79bfca8c5879721516d31029fd756ebc1c5
+  metadata.gz: d8b3d7e04d65efc3b63b8e866b1831fe772457c3
+  data.tar.gz: e71d70c1f4685ed93631661d4b19600612c563dd
 SHA512:
-  metadata.gz: 1da99edfa1e946edd6f62764a95ab09e999cc6eccef9d915d0741e6ed8912ed8629d28b58605c7960972c0795c5ab912b2824bb018322c82bd90b1c7fee08be9
-  data.tar.gz: 194fda3f3e9bf9f7a7b0ce2156bf8e34d2134ba7013e1366a7a8363e1cbba72c826daed7b8f1c934894e9431c8bcc87ab1d9c2b905a0741151d212d9a6c238b2
+  metadata.gz: 89d7d40daa608b501aa3f4a24faa967b62bf6a346adf495c3838e0ed42e1cbaca2e10e50c9ae801d48113001afc69d67d9ee67f8b4b167a0b8363fcf0bb16d84
+  data.tar.gz: 4ab1b3d6e547d703733517f7b17e1d5aa56a3c544b6d28dc0a4619deab9c87468b7413f19bcf1e0150a1094c9e9878519177c5b6cb99801d53837c95420c89cb

data/lib/angelo/responder/websocket.rb

@@ -30,7 +30,9 @@ module Angelo
           Angelo.log @connection, @request, @websocket, :switching_protocols
           @bound_response_handler ||= @response_handler.bind @base
           @websocket.on_pong &WebsocketResponder.on_pong
+          @base.before if @base.respond_to? :before
           @bound_response_handler[@websocket]
+          @base.after if @base.respond_to? :after
         else
           raise NotImplementedError
         end

data/lib/angelo/responder.rb

@@ -55,7 +55,7 @@ module Angelo
     def handle_request
       if @response_handler
         @base.before if @base.respond_to? :before
-        @body = catch(:halt) { @response_handler.bind(@base).call || '' }
+        @body = catch(:halt) { @response_handler.bind(@base).call || EMPTY_STRING }
         @base.after if @base.respond_to? :after
         respond
       else
@@ -108,6 +108,8 @@ module Angelo
         headers CONTENT_TYPE_HEADER_KEY => JSON_TYPE
       when :html
         headers CONTENT_TYPE_HEADER_KEY => HTML_TYPE
+      when :js
+        headers CONTENT_TYPE_HEADER_KEY => JS_TYPE
       else
         raise ArgumentError.new "invalid content_type: #{type}"
       end

data/lib/angelo/version.rb

@@ -1,3 +1,3 @@
 module Angelo
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end

data/lib/angelo.rb

@@ -30,6 +30,7 @@ module Angelo
   JSON_TYPE = 'application/json'
   FORM_TYPE = 'application/x-www-form-urlencoded'
   FILE_TYPE = 'application/octet-stream'
+  JS_TYPE =   'text/javascript'
 
   DEFAULT_ADDR = '127.0.0.1'
   DEFAULT_PORT = 4567

data/test/angelo/websocket_spec.rb

@@ -104,6 +104,88 @@ describe Angelo::WebsocketResponder do
 
   end
 
+  describe 'before blocks' do
+
+    define_app do
+      before do
+        @set_by_before = params
+      end
+
+      websocket '/before' do |ws|
+        ws.write @set_by_before[:before]
+        ws.close
+      end
+    end
+
+    it 'runs before blocks before websocket handlers' do
+      websocket_helper '/before?before=hi%20there' do |wsh|
+        latch = CountDownLatch.new 1
+        wsh.on_message = ->(e) {
+          assert_match /hi there/, e.data
+          latch.count_down
+        }
+        wsh.init
+        Reactor.testers[:tester] = wsh
+        Reactor.define_action :go do
+          every(0.01){ terminate if Reactor.stop? }
+          Reactor.testers[:tester].go
+        end
+        Reactor.unstop!
+        $reactor.async.go
+
+        latch.wait
+
+        Reactor.stop!
+        Reactor.testers.delete :tester
+        Reactor.remove_action :go
+      end
+    end
+
+  end
+
+  describe 'after blocks' do
+
+    invoked = 4
+
+    define_app do
+      websocket '/after' do |ws|
+        ws.write 'after'
+        ws.close
+      end
+
+      after do
+        invoked *= 2
+      end
+    end
+
+    it 'runs after filters after routes' do
+      websocket_helper '/after' do |wsh|
+        latch = CountDownLatch.new 1
+        wsh.on_message = ->(e) {
+          assert_match /after/, e.data
+          latch.count_down
+        }
+        wsh.init
+        Reactor.testers[:tester] = wsh
+        Reactor.define_action :go do
+          every(0.01){ terminate if Reactor.stop? }
+          Reactor.testers[:tester].go
+        end
+        Reactor.unstop!
+        $reactor.async.go
+
+        latch.wait
+
+        Reactor.stop!
+        Reactor.testers.delete :tester
+        Reactor.remove_action :go
+      end
+
+      invoked.must_equal 8
+    end
+
+  end
+
   describe 'concurrency' do
 
     define_app do

data/test/angelo_spec.rb

@@ -186,6 +186,11 @@ describe Angelo::Base do
             {hi: 'there'}.to_json.gsub /{/, 'so doge'
           end
 
+          __send__ m, '/javascript' do
+            content_type :js
+            'var foo = "bar";'
+          end
+
         end
       end
 
@@ -224,6 +229,15 @@ describe Angelo::Base do
         end
       end
 
+      it 'sets javascript content type for current route' do
+        Angelo::HTTPABLE.each do |m|
+          __send__ m, '/javascript'
+          last_response.status.must_equal 200
+          last_response.body.to_s.must_equal 'var foo = "bar";'
+          last_response.headers['Content-Type'].split(';').must_include Angelo::JS_TYPE
+        end
+      end
+
     end
 
     describe 'when in class def' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angelo
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel