angelo 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 667a3b95c269095d00f41d03cadfe1e3cc40f404
-  data.tar.gz: 9143b9fee78b9b06591516f147a29ce147169447
+  metadata.gz: eb21b9dcec8959a4845e5e6063ae0051b71589c4
+  data.tar.gz: 88e2ca4bd79df106deaa35c7509d22b237e5918a
 SHA512:
-  metadata.gz: 85107d56bb0446a5611a53eec5fd91b737f5e27362345bd9d87370d7183639da3254aa3101709297f9c7fcd90d15563e597de418255fcf14090a5bbb7b91c369
-  data.tar.gz: 8e248165128d31c5f4e891cf74d7508d982fc9798def4fea2fa022e6bf24fbcf77ce87b5d6b12c7e3e1eeef071bf24f123064386433ebbf03d1199b5c285fa3e
+  metadata.gz: a468e2ad3a12a7b3a7fab94816d13141f25675651d456651470c287b1773ef9e766b3a3eba7e45cb6310159caeef32b222026cc2853bded2c7b78ce6d6ccd4ad
+  data.tar.gz: f844a3b8410c35392490058ee699202b7a29f4b9df923635ec8500485789832db69f470db62f39e4001842cde0581b178207ab9d4bd80bff6ca5175bf85c3014

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 changelog
 =========
 
+### 0.1.3 24 mar 2014
+
+* better testing of websockets
+* slightly better handling of socket errors
+* static file content type fix
+
 ### 0.1.2 5 mar 2014 burnout, denial
 
 * basic static file support (i.e. /public files)

data/Gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'reel'
 gem 'tilt'
 gem 'mime-types'
+gem 'websocket-driver'
 
 platform :rbx do
   gem 'rubysl-cgi'

data/lib/angelo/responder/websocket.rb

@@ -25,15 +25,23 @@ module Angelo
         end
       rescue IOError => ioe
         warn "#{ioe.class} - #{ioe.message}"
-        @websocket.close
-        @base.websockets.delete @websocket
+        close_websocket
       rescue => e
         error e.message
         ::STDERR.puts e.backtrace
-        @connection.close
+        begin
+          @connection.close
+        rescue Reel::Connection::StateError => rcse
+          close_websocket
+        end
       end
     end
 
+    def close_websocket
+      @websocket.close
+      @base.websockets.delete @websocket
+    end
+
   end
 
 end

data/lib/angelo/rspec/helpers.rb

@@ -1,3 +1,5 @@
+require 'websocket/driver'
+
 module Angelo
   module RSpec
 
@@ -15,6 +17,7 @@ module Angelo
           app.class_eval { content_type :html } # reset
           app.class_eval &block
           @server = Angelo::Server.new app
+          $reactor = Reactor.new unless $reactor.alive?
         end
 
         after do
@@ -42,31 +45,19 @@ module Angelo
         end
       end
 
-      def socket path, params = {}, &block
-        begin
-          client = TCPSocket.new DEFAULT_ADDR, DEFAULT_PORT
-
-          params = params.keys.reduce([]) {|a,k|
-            a << CGI.escape(k) + '=' + CGI.escape(params[k])
-            a
-          }.join('&')
-
-          url = WS_URL % [DEFAULT_ADDR, DEFAULT_PORT] + path + "?#{params}"
-
-          handshake = WebSocket::ClientHandshake.new :get, url, {
-            "Host"                   => "www.example.com",
-            "Upgrade"                => "websocket",
-            "Connection"             => "Upgrade",
-            "Sec-WebSocket-Key"      => "dGhlIHNhbXBsZSBub25jZQ==",
-            "Origin"                 => "http://example.com",
-            "Sec-WebSocket-Protocol" => "chat, superchat",
-            "Sec-WebSocket-Version"  => "13"
-          }
-
-          client << handshake.to_data
-          yield WebsocketHelper.new client
-        ensure
-          client.close
+      def socket path, params = {}
+        params = params.keys.reduce([]) {|a,k|
+          a << CGI.escape(k) + '=' + CGI.escape(params[k])
+          a
+        }.join('&')
+
+        path += "?#{params}" unless params.empty?
+        wsh = WebsocketHelper.new DEFAULT_ADDR, DEFAULT_PORT, path
+        if block_given?
+          yield wsh
+          wsh.close
+        else
+          return wsh
         end
       end
 
@@ -85,23 +76,55 @@ module Angelo
     end
 
     class WebsocketHelper
+      include Celluloid::Logger
+
+      extend Forwardable
+      def_delegator :@socket, :write
+      def_delegators :@driver, :binary, :close, :text
+
+      attr_reader :driver, :socket
+      attr_writer :addr, :port, :path, :on_close, :on_message, :on_open
+
+      def initialize addr, port, path
+        @addr, @port, @path = addr, port, path
+      end
+
+      def init
+        init_socket
+        init_driver
+      end
 
-      def initialize client
-        @client = client
-        @client.readpartial 4096 # ditch response handshake
+      def init_socket
+        ip = @addr
+        ip = Socket.getaddrinfo(@addr, 'http')[0][3] unless @addr =~ /\d+\.\d+\.\d+\.\d+/
+        @socket = Celluloid::IO::TCPSocket.new ip, @port
       end
 
-      def parser
-        @parser ||= WebSocket::Parser.new
+      def init_driver
+        @driver = WebSocket::Driver.client self
+
+        @driver.on :open do |e|
+          @on_open.call(e) if Proc === @on_open
+        end
+
+        @driver.on :message do |e|
+          @on_message.call(e) if Proc === @on_message
+        end
+
+        @driver.on :close do |e|
+          @on_close.call(e) if Proc === @on_close
+        end
       end
 
-      def send msg
-        @client << WebSocket::Message.new(msg).to_data
+      def url
+        WS_URL % [@addr, @port] + @path
       end
 
-      def recv
-        parser.append @client.readpartial(4096) until msg = parser.next_message
-        msg
+      def go
+        @driver.start
+        while msg = @socket.readpartial(4096)
+          @driver.parse msg
+        end
       end
 
     end

data/lib/angelo/server.rb

@@ -1,4 +1,5 @@
 require 'openssl'
+require 'mime-types'
 
 module Angelo
 

data/lib/angelo/version.rb

@@ -1,3 +1,3 @@
 module Angelo
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/angelo/mustermann_spec.rb

@@ -2,6 +2,7 @@ if RUBY_VERSION =~ /^2\./
 
   require_relative '../spec_helper'
   require 'angelo/mustermann'
+  require 'angelo/tilt/erb'
 
   describe Angelo::Mustermann do
 

data/spec/angelo/static_spec.rb

@@ -54,6 +54,19 @@ describe Angelo::Server do
       expect(last_response.status).to be(304)
     end
 
+    it 'serves proper content-types' do
+      { 'test.js' => 'application/javascript',
+        'test.html' => 'text/html',
+        'test.css' => 'text/css',
+        'what.png' => 'image/png' }.each do |k,v|
+
+        get "/#{k}"
+        expect(last_response.status).to be(200)
+        expect(last_response.headers['Content-Type']).to eq(v)
+
+      end
+    end
+
   end
 
 end

data/spec/angelo/websocket_spec.rb

@@ -1,14 +1,32 @@
 require_relative '../spec_helper'
 
-CK = 'ANGELO_CONCURRENCY' # concurrency key
-DC = 5                    # default concurrency
-
 describe Angelo::WebsocketResponder do
 
-  let(:concurrency){ ENV.key?(CK) ? ENV[CK].to_i : DC }
+  def socket_wait_for path, latch, expectation, key = :swf, &block
+    Reactor.testers[key] = Array.new(CONCURRENCY).map do
+      wsh = socket path
+      wsh.on_message = ->(e) {
+        expectation[e] if Proc === expectation
+        latch.count_down
+      }
+      wsh.init
+      wsh
+    end
+    action = (key.to_s + '_go').to_sym
+    Reactor.define_action action do |n|
+      every(0.01){ terminate if Reactor.stop? }
+      Reactor.testers[key][n].go
+    end
+    Reactor.unstop!
+    CONCURRENCY.times {|n| $reactor.async.__send__(action, n)}
+
+    sleep 0.01 * CONCURRENCY
+    yield
 
-  def socket_wait_for path, &block
-    Array.new(concurrency).map {|n| Thread.new {socket path, &block}}
+    Reactor.testers[key].map &:close
+    Reactor.stop!
+    Reactor.testers.delete key
+    Reactor.remove_action action
   end
 
   describe 'basics' do
@@ -22,25 +40,66 @@ describe Angelo::WebsocketResponder do
     end
 
     it 'responds on websockets properly' do
-      socket '/' do |client|
-        5.times {|n|
-          client.send "hi there #{n}"
-          client.recv.should eq "hi there #{n}"
+      socket '/' do |wsh|
+        latch = CountDownLatch.new 500
+
+        wsh.on_message = ->(e) {
+          expect(e.data).to match(/hi there \d/)
+          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
+
+        500.times {|n| wsh.text "hi there #{n}"}
+        latch.wait
+
+        Reactor.stop!
+        Reactor.testers.delete :tester
+        Reactor.remove_action :go
       end
     end
 
     it 'responds on multiple websockets properly' do
-      5.times do
-        Thread.new do
-          socket '/' do |client|
-            5.times {|n|
-              client.send "hi there #{n}"
-              client.recv.should eq "hi there #{n}"
-            }
-          end
-        end
+      latch = CountDownLatch.new CONCURRENCY * 500
+
+      Reactor.testers[:wshs] = Array.new(CONCURRENCY).map do
+        wsh = socket '/'
+        wsh.on_message = ->(e) {
+          expect(e.data).to match(/hi there \d/)
+          latch.count_down
+        }
+        wsh.init
+        wsh
+      end
+
+      Reactor.define_action :go do |n|
+        every(0.01){ terminate if Reactor.stop? }
+        Reactor.testers[:wshs][n].go
+      end
+      Reactor.unstop!
+      CONCURRENCY.times {|n| $reactor.async.go n}
+
+      sleep 0.01 * CONCURRENCY
+
+      ActorPool.define_action :go do |n|
+        500.times {|x| Reactor.testers[:wshs][n].text "hi there #{x}"}
       end
+      CONCURRENCY.times {|n| $pool.async.go n}
+      latch.wait
+
+      Reactor.testers[:wshs].map &:close
+      Reactor.stop!
+      Reactor.testers.delete :wshs
+      Reactor.remove_action :go
+
+      ActorPool.remove_action :go
     end
 
   end
@@ -67,15 +126,16 @@ describe Angelo::WebsocketResponder do
 
     it 'works with http requests' do
 
-      ts = socket_wait_for '/concur' do |client|
-        Angelo::HTTPABLE.each do |m|
-          client.recv.should eq "from http #{m}"
-        end
-      end
+      latch = CountDownLatch.new CONCURRENCY * Angelo::HTTPABLE.length
+
+      expectation = ->(e){
+        expect(e.data).to match(/from http (#{Angelo::HTTPABLE.map(&:to_s).join('|')})/)
+      }
 
-      sleep 0.1
-      Angelo::HTTPABLE.each {|m| __send__ m, '/concur', foo: 'http'}
-      ts.each &:join
+      socket_wait_for '/concur', latch, expectation do
+        Angelo::HTTPABLE.each {|m| __send__ m, '/concur', foo: 'http'}
+        latch.wait
+      end
 
     end
 
@@ -83,7 +143,7 @@ describe Angelo::WebsocketResponder do
 
   describe 'helper contexts' do
     let(:obj){ {'foo' => 'bar'} }
-    let(:wait_for_block){ ->(client){ JSON.parse(client.recv).should eq obj}}
+    let(:wait_for_block){ ->(e){ expect(JSON.parse(e.data)).to eq(obj) }}
 
     define_app do
 
@@ -126,38 +186,80 @@ describe Angelo::WebsocketResponder do
     end
 
     it 'handles single context' do
-      ts = socket_wait_for '/', &wait_for_block
-      sleep 0.1
-      post '/', obj
-      ts.each &:join
+      latch = CountDownLatch.new CONCURRENCY
+      socket_wait_for '/', latch, wait_for_block do
+        post '/', obj
+        latch.wait
+      end
     end
 
     it 'handles multiple contexts' do
-      ts = socket_wait_for '/', &wait_for_block
-      one_ts = socket_wait_for '/one', &wait_for_block
-      other_ts = socket_wait_for '/other', &wait_for_block
 
-      sleep 0.1
-      post '/one', obj
+      latch = CountDownLatch.new CONCURRENCY
+
+      Reactor.testers[:hmc] = Array.new(CONCURRENCY).map do
+        wsh = socket '/'
+        wsh.on_message = ->(e) {
+          wait_for_block[e]
+          latch.count_down
+        }
+        wsh.init
+        wsh
+      end
 
-      ts.each {|t| t.should be_alive}
-      one_ts.each &:join
-      other_ts.each {|t| t.should be_alive}
+      one_latch = CountDownLatch.new CONCURRENCY
 
-      sleep 0.1
-      post '/other', obj
+      Reactor.testers[:hmc_one] = Array.new(CONCURRENCY).map do
+        wsh = socket '/one'
+        wsh.on_message = ->(e) {
+          wait_for_block[e]
+          one_latch.count_down
+        }
+        wsh.init
+        wsh
+      end
 
-      ts.each {|t| t.should be_alive}
-      one_ts.each {|t| t.should_not be_alive}
-      other_ts.each &:join
+      other_latch = CountDownLatch.new CONCURRENCY
 
-      sleep 0.1
+      Reactor.testers[:hmc_other] = Array.new(CONCURRENCY).map do
+        wsh = socket '/other'
+        wsh.on_message = ->(e) {
+          wait_for_block[e]
+          other_latch.count_down
+        }
+        wsh.init
+        wsh
+      end
+
+      Reactor.define_action :go do |k, n|
+        Reactor.testers[k][n].go
+      end
+      Reactor.unstop!
+      CONCURRENCY.times do |n|
+        [:hmc, :hmc_one, :hmc_other].each do |k|
+          $reactor.async.go k, n
+        end
+      end
+
+      sleep 0.01 * CONCURRENCY
+
+      post '/one', obj
+      one_latch.wait
       post '/', obj
+      latch.wait
+      post '/other', obj
+      other_latch.wait
 
-      ts.each &:join
-      one_ts.each {|t| t.should_not be_alive}
-      other_ts.each {|t| t.should_not be_alive}
+      [:hmc, :hmc_one, :hmc_other].each do |k|
+        Reactor.testers[k].map &:close
+      end
+      Reactor.stop!
+      [:hmc, :hmc_one, :hmc_other].each do |k|
+        Reactor.testers.delete k
+      end
+      Reactor.remove_action :go
     end
 
   end
+
 end

data/spec/spec_helper.rb

@@ -8,3 +8,77 @@ Celluloid.logger.level = ::Logger::ERROR
 include Angelo::RSpec::Helpers
 
 TEST_APP_ROOT = File.expand_path '../test_app_root', __FILE__
+
+CK = 'ANGELO_CONCURRENCY' # concurrency key
+DC = 5                    # default concurrency
+CONCURRENCY = ENV.key?(CK) ? ENV[CK].to_i : DC
+
+# https://gist.github.com/tkareine/739662
+#
+class CountDownLatch
+  attr_reader :count
+
+  def initialize(to)
+    @count = to.to_i
+    raise ArgumentError, "cannot count down from negative integer" unless @count >= 0
+    @lock = Mutex.new
+    @condition = ConditionVariable.new
+  end
+
+  def count_down
+    @lock.synchronize do
+      @count -= 1 if @count > 0
+      @condition.broadcast if @count == 0
+    end
+  end
+
+  def wait
+    @lock.synchronize do
+      @condition.wait(@lock) while @count > 0
+    end
+  end
+
+end
+
+module Cellper
+
+  @@stop = false
+  @@testers = {}
+
+  def define_action sym, &block
+    define_method sym, &block
+  end
+
+  def remove_action sym
+    remove_method sym
+  end
+
+  def unstop!
+    @@stop = false
+  end
+
+  def stop!
+    @@stop = true
+  end
+
+  def stop?
+    @@stop
+  end
+
+  def testers; @@testers; end
+
+end
+
+class Reactor
+  include Celluloid::IO
+  extend Cellper
+end
+
+$reactor = Reactor.new
+
+class ActorPool
+  include Celluloid
+  extend Cellper
+end
+
+$pool = ActorPool.pool size: CONCURRENCY

metadata

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