bossan 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e969be8e7c6867dcf66c449d02c4972699230b18
-  data.tar.gz: 2ac87fd5dc7533b0d48ef502223c6bb3f4406033
+  metadata.gz: 1f63887612e549dc1e027b914db6cbc429fa2ff8
+  data.tar.gz: ee4fd5453fc575eb810518206f448f295c46045c
 SHA512:
-  metadata.gz: 09880b9fd1622640b6f1eaada5e2b6d62c1f282fa5f0e0810495bc7a7bd4cfa8362318bc753b9c679c6466f26dea164e0dd3fae5d5d5df1cf1c5c1cea929aed8
-  data.tar.gz: 9c042fb1d4d6593a237883af46d14bbeb72e03a4ef095295420a62ae310a4f77c5a0969f61b38b5b4e9feb5a36b65d322122d0f4f540c167ca6c1e3a43dc7dbf
+  metadata.gz: f8ed1e66372a702c38443a2496f7ae620b915ae98480912dbba4fbaca4cb6c10852b430bd26705783dad1e9b7a0fc333b94c5a02ad3bc356e23730dee29ec6f0
+  data.tar.gz: e7eef7ca48ed92bacc789ccbf6b260b65dad39f381532160c2ffd9bbadf2928001c2a48003ab5c74b01d7e8d8d996aa6e5ab7e60c71dce9e456832a0bd020f50

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+### v0.4.4
+
+(Bug release. release 2013-08-30)
+
+* return BadRequest when invalid encoded url
+
+* fix rack::handler
+
 ### v0.4.3
 
 (Bug release. release 2013-07-27)

data/Rakefile

@@ -5,18 +5,21 @@ require "rbconfig"
 task :default => [:compile, :clean, :test]
 
 task :compile do
+  pwd = Dir.pwd
   Dir.chdir File.expand_path("../ext/bossan", __FILE__)
   sh "ruby extconf.rb"
   sh "make"
   sh "mv bossan_ext.#{RbConfig::CONFIG['DLEXT']} ../../lib/bossan/"
+  Dir.chdir pwd
 end
 
 task :clean do
+  pwd = Dir.pwd
   Dir.chdir File.expand_path("../ext/bossan", __FILE__)
   sh "rm -f *.o Makefile mkmf.log"
+  Dir.chdir pwd
 end
 
 task :test do
-  Dir.chdir File.expand_path("../test", __FILE__)
-  sh "ruby test_rack_spec.rb"
+  sh "ruby test/driver.rb"
 end

data/ext/bossan/bossan_ext.c

@@ -23,7 +23,7 @@
 #define CRLF "\r\n"
 #define DELIM ": "
 
-#define SERVER "bossan/0.4.3"
+#define SERVER "bossan/0.4.4"
 
 #define H_MSG_500 "HTTP/1.0 500 Internal Server Error\r\nContent-Type: text/html\r\nServer:  " SERVER "\r\n\r\n"
 
@@ -133,6 +133,7 @@ static ID i_write;
 static ID i_seek;
 static ID i_toa;
 static ID i_next;
+static ID i_join;
 
 static VALUE default_path_string;
 
@@ -741,50 +742,52 @@ processs_write(client_t *client)
   DEBUG("process_write start");
   iterator = client->response_iter;
 
-  while ( (item = rb_rescue(rb_body_iterator, iterator, ret_qnil, NULL)) != Qnil ) {
+  if (client->response_body_type != T_ARRAY) {
+    while ( (item = rb_rescue(rb_body_iterator, iterator, ret_qnil, NULL)) != Qnil ) {
 
-    buf = StringValuePtr(item);
-    buflen = RSTRING_LEN(item);
+      buf = StringValuePtr(item);
+      buflen = RSTRING_LEN(item);
 
-    //write
-    if(client->chunked_response){
-      bucket = new_write_bucket(client->fd, 4);
-      if(bucket == NULL){
-	return STATUS_ERROR;
-      }
-      char *lendata = NULL;
-      ssize_t len = 0;
+      //write
+      if(client->chunked_response){
+	bucket = new_write_bucket(client->fd, 4);
+	if(bucket == NULL){
+	  return STATUS_ERROR;
+	}
+	char *lendata = NULL;
+	ssize_t len = 0;
 
-      VALUE chunk_data = get_chunk_data(buflen);
-      //TODO CHECK ERROR
-      lendata = StringValuePtr(chunk_data);
-      len = RSTRING_LEN(chunk_data);
+	VALUE chunk_data = get_chunk_data(buflen);
+	//TODO CHECK ERROR
+	lendata = StringValuePtr(chunk_data);
+	len = RSTRING_LEN(chunk_data);
 
-      set_chunked_data(bucket, lendata, len, buf, buflen);
-      bucket->chunk_data = chunk_data;
-    } else {
-      bucket = new_write_bucket(client->fd, 1);
-      if(bucket == NULL){
-	return STATUS_ERROR;
+	set_chunked_data(bucket, lendata, len, buf, buflen);
+	bucket->chunk_data = chunk_data;
+      } else {
+	bucket = new_write_bucket(client->fd, 1);
+	if(bucket == NULL){
+	  return STATUS_ERROR;
+	}
+	set2bucket(bucket, buf, buflen);
       }
-      set2bucket(bucket, buf, buflen);
-    }
-    bucket->temp1 = item;
+      bucket->temp1 = item;
 
-    ret = writev_bucket(bucket);
-    if(ret != STATUS_OK){
-      client->bucket = bucket;
-      return ret;
-    }
+      ret = writev_bucket(bucket);
+      if(ret != STATUS_OK){
+	client->bucket = bucket;
+	return ret;
+      }
 
-    free_write_bucket(bucket);
-    //mark
-    client->write_bytes += buflen;
-    //check write_bytes/content_length
-    if(client->content_length_set){
-      if(client->content_length <= client->write_bytes){
-	// all done
-	break;
+      free_write_bucket(bucket);
+      //mark
+      client->write_bytes += buflen;
+      //check write_bytes/content_length
+      if(client->content_length_set){
+	if(client->content_length <= client->write_bytes){
+	  // all done
+	  break;
+	}
       }
     }
   }
@@ -838,14 +841,20 @@ start_response_write(client_t *client)
   VALUE item;
   char *buf = NULL;
   ssize_t buflen = NULL;
-    
-  item = rb_rescue(rb_body_iterator, client->response_iter, ret_qnil, NULL);
-  DEBUG("client %p :fd %d", client, client->fd);
 
-  if (item != Qnil) {
-    //write string only
+  if (client->response_body_type == T_ARRAY) {
+    item = client->response_iter;
     buf = StringValuePtr(item);
     buflen = RSTRING_LEN(item);
+  } else {
+    item = rb_rescue(rb_body_iterator, client->response_iter, ret_qnil, NULL);
+    DEBUG("client %p :fd %d", client, client->fd);
+
+    if (item != Qnil) {
+      //write string only
+      buf = StringValuePtr(item);
+      buflen = RSTRING_LEN(item);
+    }
   }
 
   /* DEBUG("status_code %d body:%.*s", client->status_code, (int)buflen, buf); */
@@ -980,17 +989,25 @@ hex2int(int i)
 
 
 static int
-urldecode(char *buf, int len)
+urldecode(char *buf)
 {
-  int c, c1;
-  char *s0, *t;
+  int len;
+  char c, c1, *s0, *t;
+
   t = s0 = buf;
-  while(len >0){
+  len = strlen(buf);
+  while(len > 0){
     c = *buf++;
     if(c == '%' && len > 2){
       c = *buf++;
+      if (!isxdigit(c)) {
+	return -1;
+      }
       c1 = c;
       c = *buf++;
+      if (!isxdigit(c)) {
+	return -1;
+      }
       c = hex2int(c1) * 16 + hex2int(c);
       len -= 2;
     }
@@ -1095,7 +1112,9 @@ set_path(VALUE env, char *buf, int len)
     len--;
   }
   slen = t - s0;
-  slen = urldecode(s0, slen);
+  if (urldecode(s0) == -1) {
+    return -1;
+  }
 
   obj = rb_str_new(s0, slen);
 
@@ -1195,6 +1214,7 @@ header_field_cb(http_parser *p, const char *buf, size_t len)
   }
 
   req->field = obj;
+  rb_gc_register_address(&req->field);
   req->last_header_element = FIELD;
   return 0;
 }
@@ -1221,6 +1241,7 @@ header_value_cb(http_parser *p, const char *buf, size_t len)
     return -1;
   }
   req->value = obj;
+  rb_gc_register_address(&req->value);
   req->last_header_element = VAL;
   return 0;
 }
@@ -1335,7 +1356,6 @@ headers_complete_cb(http_parser *p)
   //Last header
   if(likely(req->field && req->value)){
     rb_hash_aset(env, req->field, req->value);
-
     req->field = NULL;
     req->value = NULL;
   }
@@ -1832,7 +1852,14 @@ process_rack_app(client_t *cli)
 
   cli->status_code = NUM2INT(status_code);
   cli->headers = headers;
-  cli->response_iter = rb_funcall(response_body, i_toenum, 0);
+
+  if (TYPE(response_body) == T_ARRAY) {
+    cli->response_body_type = T_ARRAY;
+    cli->response_iter = rb_ary_join(response_body, rb_str_new2(""));
+  } else {
+    cli->response_body_type = 0; // TODO: fix
+    cli->response_iter = rb_funcall(response_body, i_toenum, 0);
+  }
 
   rb_gc_register_address(&cli->headers);
   rb_gc_register_address(&cli->response_iter);
@@ -1849,7 +1876,7 @@ process_rack_app(client_t *cli)
   char* reason_phrase;
   reason_phrase = get_reason_phrase(cli->status_code);
 
-  char buff[256];
+  char buff[64];
   sprintf(buff, "HTTP/1.%d %d %s\r\n", cli->http_parser->http_minor, cli->status_code, reason_phrase);
   cli->http_status = rb_str_new(buff, strlen(buff));
   rb_gc_register_address(&cli->http_status);
@@ -2462,6 +2489,9 @@ bossan_run_loop(VALUE self, VALUE args)
   if(unix_sock_name){
     unlink(unix_sock_name);
   }
+  if(listen_sock){
+    close(listen_sock);
+  }
   printf("Bye.\n");
   return Qnil;
 }
@@ -2621,15 +2651,6 @@ Init_bossan_ext(void)
   empty_string = rb_obj_freeze(rb_str_new2(""));
   rb_gc_register_address(&empty_string);
 
-  rb_gc_register_address(&i_keys);
-  rb_gc_register_address(&i_call);
-  rb_gc_register_address(&i_new);
-  rb_gc_register_address(&i_each);
-  rb_gc_register_address(&i_toenum);
-  rb_gc_register_address(&i_close);
-  rb_gc_register_address(&i_write);
-  rb_gc_register_address(&i_seek);
-
   rb_gc_register_address(&rack_app); //rack app
 
   i_new = rb_intern("new");
@@ -2642,6 +2663,7 @@ Init_bossan_ext(void)
   i_seek = rb_intern("seek");
   i_toa = rb_intern("to_a");
   i_next = rb_intern("next");
+  i_join = rb_intern("join");
 
   server = rb_define_module("Bossan");
   rb_gc_register_address(&server);

data/ext/bossan/client.h

@@ -29,6 +29,8 @@ typedef struct _client {
   uint32_t write_bytes;            // send body length
   void *bucket;               //write_data
   uint8_t response_closed;    //response closed flag
+
+  int response_body_type;  // response body type
 } client_t;
 
 #endif

data/lib/bossan/version.rb

@@ -1,3 +1,3 @@
 module Bossan
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/lib/rack/handler/bossan.rb

@@ -15,7 +15,7 @@ module Rack
         options = DEFAULT_OPTIONS.merge(options)
         puts "* Listening on tcp://#{options[:Host]}:#{options[:Port]}"
 
-        ::Bossan.listen(options[:Host], options[:Port])
+        ::Bossan.listen(options[:Host], options[:Port].to_i)
         ::Bossan.run(app)
       end
 

data/test/bossan_test.rb

@@ -0,0 +1,93 @@
+require_relative '../lib/bossan'
+require 'minitest/unit'
+require 'test/unit/testcase'
+require 'net/http'
+require 'tempfile'
+
+module Bossan::Test
+  class TestCase < Test::Unit::TestCase
+    def setup
+      super
+      check_app
+      start_server
+    end
+
+    def teardown
+      super
+      stop_server
+      check_output_log
+    end
+
+    def host
+      "localhost"
+    end
+
+    def port
+      8000
+    end
+
+    def app
+      raise("app must override")
+    end
+
+    private
+    def check_app
+      app
+    end
+
+    def check_output_log
+      @mocked_stdout.rewind
+      server_stdout_log = @mocked_stdout.read
+      server_stdout_log.sub!("Bye.\n", "")
+      unless server_stdout_log.empty?
+        puts "! Something wrong on server. stdout:"
+        puts server_stdout_log
+      end
+
+      @mocked_stderr.rewind
+      server_stderr_log = @mocked_stderr.read
+      unless server_stderr_log.empty?
+        puts "! Something wrong on server. stderr:"
+        print server_stderr_log
+      end
+    end
+
+    def start_server
+      @mocked_stdout = Tempfile.new("bossan.out")
+      @mocked_stderr = Tempfile.new("bossan.err")
+
+      @pid = fork do
+        STDOUT.reopen(@mocked_stdout)
+        STDERR.reopen(@mocked_stderr)
+        trap(:INT) { Bossan.stop }
+        Bossan.listen(host, port)
+        Bossan.run(app)
+        @mocked_stdout.close
+        @mocked_stderr.close
+      end
+
+      Process.detach @pid
+
+      unless server_is_wake_up?
+        $stderr.puts "bossan won't wake up until you love it ..."
+        exit 1
+      end
+    end
+
+    def stop_server
+      Process.kill(:INT, @pid)
+    end
+
+    def server_is_wake_up? n=100
+      n.times {
+        begin
+          Net::HTTP.start(host, port)
+        rescue
+          next
+        end
+        return true
+      }
+      return false
+    end
+  end
+end

data/test/driver.rb

@@ -0,0 +1,8 @@
+require './test/test_rack_spec'
+require './test/test_rack_err_spec'
+require './test/test_rack_evil'
+require './test/test_rack_chunk_response'
+require './test/test_rack_env_big_message_body'
+require './test/test_rack_env_simple_get'
+require './test/test_rack_env_simple_query'
+require './test/test_rack_each_response'

data/test/test_rack_chunk_response.rb

@@ -1,62 +1,30 @@
-require_relative '../lib/bossan'
-require_relative './util'
-require 'minitest/unit'
-require 'test/unit/testcase'
-require 'uri'
-
-
-DEFAULT_HOST = "localhost"
-DEFAULT_PORT = 8000
-ASSERT_RESPONSE = "Hello world!"
-RESPONSE = ["Hello ", "world!"].freeze
-
-
-class App
-  def call env
-    body = RESPONSE
-    [200,
-     {'Content-type'=> 'text/plain'},
-     body
-    ]
+require_relative './bossan_test'
+require 'minitest/autorun'
+
+class RackChunkResponseTest < Bossan::Test::TestCase
+  class App
+    def call env
+      body = ["Hello ", "World!"]
+      [200,
+       {'Content-type'=> 'text/plain'},
+       body
+      ]
+    end
   end
-end
 
-class RackChunkResponseTest < Test::Unit::TestCase
+  def app
+    App.new
+  end
 
   def test_chunk_response
-    response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) {|http|
+    response = Net::HTTP.start(host(), port()) {|http|
       http.get("/")
     }
 
     headers = response.header
     assert_equal("200", response.code)
-    assert_equal(ASSERT_RESPONSE, response.body)
+    assert_equal("Hello World!", response.body)
     assert_equal("chunked", headers["transfer-encoding"])
     assert_equal("close", headers["connection"])
   end
-
-end
-
-
-begin
-  $stderr.puts RUBY_DESCRIPTION
-
-  pid = fork do
-    trap(:INT) { Bossan.stop }
-    Bossan.listen(DEFAULT_HOST, DEFAULT_PORT)
-    Bossan.run(App.new)
-  end
-
-  Process.detach pid
-
-  unless server_is_wake_up?
-    $stderr.puts "bossan won't wake up until you love it ..."
-    exit 1
-  end
-
-  err = MiniTest::Unit.new.run(ARGV)
-  exit false if err && err != 0
-
-ensure
-  Process.kill(:INT, pid)
 end

data/test/test_rack_each_response.rb

@@ -0,0 +1,38 @@
+require_relative './bossan_test'
+require 'minitest/autorun'
+require 'uri'
+
+class RackEachResponseTest < Bossan::Test::TestCase
+  class EachResponse
+    def each
+      yield "Hello"
+      yield " "
+      yield "World!"
+    end
+  end
+
+  class App
+    def call env
+      body = EachResponse.new
+      [200,
+       {
+         'Content-type'=> 'text/plain',
+         'Content-length'=> "Hello World".size.to_s
+       },
+       body
+      ]
+    end
+  end
+
+  def app
+    App.new
+  end
+
+  def test_each_response
+    response = Net::HTTP.start(host(), port()) {|http|
+      http.get("/")
+    }
+    assert_equal("200", response.code)
+    assert_equal("Hello World", response.body)
+  end
+end

data/test/test_rack_env_big_message_body.rb

@@ -1,45 +1,31 @@
-require 'test/unit'
+require_relative './bossan_test'
 require "uri"
-require 'net/http'
-require_relative '../lib/bossan'
+require 'minitest/autorun'
 
-
-class RackEnvBigMessageBodyTest < Test::Unit::TestCase
-
-  RESPONSE = ["Hello ", "world!"].freeze
-  DEFAULT_HOST = "localhost"
-  DEFAULT_PORT = 8000
+class RackEnvBigMessageBodyTest < Bossan::Test::TestCase
+  def app
+    proc {|env|
+      @env = env.dup
+      body = @env["rack.input"].class.to_s
+      [200,
+       {
+         'Content-type'=> 'text/plain',
+         'Content-length'=> body.size.to_s
+       },
+       [ body ]
+      ]
+    }
+  end
 
   def test_query_app
-    pid = fork do
-      trap(:INT) { Bossan.stop }
-      Bossan.listen(DEFAULT_HOST, DEFAULT_PORT)
-      Bossan.run(proc {|env|
-                   @env = env.dup
-                   assert_equal(IO, @env["rack.input"].class)
-                   body = RESPONSE
-                   [200,
-                    {
-                      'Content-type'=> 'text/plain',
-                      'Content-length'=> RESPONSE.join.size.to_s
-                    },
-                    body
-                   ]
-                 })
-    end
-    Process.detach pid
-    sleep 2
-
-    uri = URI.parse("http://0.0.0.0:8000/")
+    uri = URI.parse("http://#{host()}:#{port()}/")
     Net::HTTP.start(uri.host, uri.port){|http|
       header = {
         "user-agent" => "Ruby/#{RUBY_VERSION} MyHttpClient"
       }
       body = "A" * 1024 * 513 # 513K
       response = http.post(uri.path, body, header)
+      assert_equal("IO", response.body)
     }
-  ensure
-    Process.kill(:INT, pid)
   end
-
 end

data/test/test_rack_env_simple_get.rb

@@ -1,59 +1,40 @@
 # -*- coding: utf-8 -*-
-require 'test/unit'
-require 'pp'
+require_relative './bossan_test'
 require 'net/http'
-require_relative '../lib/bossan'
-
-
-class RackEnvSimpleGetTest < Test::Unit::TestCase
-
-  RESPONSE = ["Hello ", "world!"].freeze
-  DEFAULT_HOST = "localhost"
-  DEFAULT_PORT = 8000
+require 'json'
+require 'minitest/autorun'
+
+class RackEnvSimpleGetTest < Bossan::Test::TestCase
+  def app
+    proc {|env|
+      @env = env.dup
+      # I have no idea how to check this two values..
+      @env.delete "rack.input"
+      @env.delete "rack.errors"
+      body = [JSON.dump(@env)]
+      [200,
+       {
+         'Content-type'=> 'application/json',
+         'Content-length'=> body.join.size.to_s
+       },
+       body
+      ]
+    }
+  end
 
   def test_simple_app
-    r, w = IO.pipe
-    pid = fork do
-      r.close
-      trap(:INT) { Bossan.stop }
-      Bossan.listen(DEFAULT_HOST, DEFAULT_PORT)
-      Bossan.run(proc {|env|
-                   @env = env.dup
-                   # I have no idea how to check this two values..
-                   @env.delete "rack.input"
-                   @env.delete "rack.errors"
-                   w.write Marshal.dump(@env)
-                   w.close
-                   body = RESPONSE
-                   [200,
-                    {
-                      'Content-type'=> 'text/plain',
-                      'Content-length'=> RESPONSE.join.size.to_s
-                    },
-                    body
-                   ]
-                 })
-    end
-    Process.detach pid
-    sleep 2
-
-    Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT){|http|
+    response = Net::HTTP.start(host(), port()){|http|
       http.get("/")
     }
 
-    w.close
-    env = Marshal.load(r.read)
-    r.close
+    env = JSON.parse(response.body)
 
-    assert_equal(env["PATH_INFO"], "/")
-    assert_equal(env["SCRIPT_NAME"], "")
-    assert_equal(env["QUERY_STRING"], "")
-    assert_equal(env["REQUEST_METHOD"], "GET")
-    assert_equal(env["SERVER_NAME"], "localhost")
-    assert_equal(env["SERVER_PORT"], "8000")
-    assert_not_equal(env["HTTP_USER_AGENT"], "")
-  ensure
-    Process.kill(:INT, pid)
+    assert_equal("/", env["PATH_INFO"])
+    assert_equal("", env["SCRIPT_NAME"])
+    assert_equal("", env["QUERY_STRING"])
+    assert_equal("GET", env["REQUEST_METHOD"])
+    assert_equal("localhost", env["SERVER_NAME"])
+    assert_equal("8000", env["SERVER_PORT"])
+    assert_not_equal("", env["HTTP_USER_AGENT"])
   end
-
 end

data/test/test_rack_env_simple_query.rb

@@ -1,54 +1,36 @@
 # -*- coding: utf-8 -*-
-require 'test/unit'
-require 'pp'
+require_relative './bossan_test'
 require 'net/http'
-require_relative '../lib/bossan'
-
-
-class RackEnvSimpleQueryTest < Test::Unit::TestCase
-
-  RESPONSE = ["Hello ", "world!"].freeze
-  DEFAULT_HOST = "localhost"
-  DEFAULT_PORT = 8000
+require 'json'
+require 'minitest/autorun'
+
+class RackEnvSimpleQueryTest < Bossan::Test::TestCase
+  def app
+    proc {|env|
+      @env = env.dup
+      # I have no idea how to check this two values..
+      @env.delete "rack.input"
+      @env.delete "rack.errors"
+
+      body = [JSON.dump(@env)]
+      [200,
+       {
+         'Content-type'=> 'application/json',
+         'Content-length'=> body.join.size.to_s
+       },
+       body
+      ]
+    }
+  end
 
   def test_query_app
-    r, w = IO.pipe
-    pid = fork do
-      r.close
-      trap(:INT) { Bossan.stop }
-      Bossan.listen(DEFAULT_HOST, DEFAULT_PORT)
-      Bossan.run(proc {|env|
-                   @env = env.dup
-                   # I have no idea how to check this two values..
-                   @env.delete "rack.input"
-                   @env.delete "rack.errors"
-                   w.write Marshal.dump(@env)
-                   w.close
-                   body = RESPONSE
-                   [200,
-                    {
-                      'Content-type'=> 'text/plain',
-                      'Content-length'=> RESPONSE.join.size.to_s
-                    },
-                    body
-                   ]
-                 })
-    end
-    Process.detach pid
-    sleep 2
-
-    Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT){|http|
+    response = Net::HTTP.start(host(), port()){|http|
       http.get("/ABC/DEF?a=1234&bbbb=ccc")
     }
 
-    w.close
-    env = Marshal.load(r.read)
-    r.close
+    env = JSON.parse(response.body)
 
-    assert_equal(env["PATH_INFO"], "/ABC/DEF")
-    assert_equal(env["QUERY_STRING"], "a=1234&bbbb=ccc")
-  ensure
-    Process.kill(:INT, pid)
+    assert_equal("/ABC/DEF", env["PATH_INFO"])
+    assert_equal("a=1234&bbbb=ccc", env["QUERY_STRING"])
   end
-
 end

data/test/test_rack_err_spec.rb

@@ -1,57 +1,31 @@
-require_relative '../lib/bossan'
-require_relative './util'
-require 'minitest/unit'
-require 'test/unit/testcase'
+require_relative './bossan_test'
+require 'minitest/autorun'
 
-
-DEFAULT_HOST = "localhost"
-DEFAULT_PORT = 8000
 ASSERT_RESPONSE = "Hello world!"
 RESPONSE = ["Hello ", "world!"].freeze
 
-
-class ErrApp
-  def call env
-    body = RESPONSE
-    [500,
-     {
-       'Content-type'=> 'text/html',
-     },
-     RESPONSE
-    ]
+class RackErrSpecTest < Bossan::Test::TestCase
+  class ErrApp
+    def call env
+      body = RESPONSE
+      [500,
+       {
+         'Content-type'=> 'text/html',
+       },
+       RESPONSE
+      ]
+    end
   end
-end
 
+  def app
+    ErrApp.new
+  end
 
-class RackErrSpecTest < Test::Unit::TestCase
   def test_error
-    response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) {|http|
+    response = Net::HTTP.start(host(), port()) {|http|
       http.get("/")
     }
     assert_equal("500", response.code)
     assert_equal(ASSERT_RESPONSE, response.body)
   end
 end
-
-
-begin
-  $stderr.puts RUBY_DESCRIPTION
-  pid = fork do
-    trap(:INT) { Bossan.stop }
-    Bossan.listen(DEFAULT_HOST, DEFAULT_PORT)
-    Bossan.run(ErrApp.new)
-  end
-
-  Process.detach pid
-
-  unless server_is_wake_up?
-    $stderr.puts "bossan won't wake up until you love it ..."
-    exit 1
-  end
-
-  err = MiniTest::Unit.new.run(ARGV)
-  exit false if err && err != 0
-
-ensure
-  Process.kill(:INT, pid)
-end

data/test/test_rack_evil.rb

@@ -1,81 +1,108 @@
-require_relative '../lib/bossan'
-require_relative './util'
-require 'minitest/unit'
-require 'test/unit/testcase'
+require_relative './bossan_test'
 require 'socket'
-
-
-ASSERT_RESPONSE = "Hello world!"
-RESPONSE = ["Hello ", "world!"].freeze
-DEFAULT_HOST = "localhost"
-DEFAULT_PORT = 8000
-DEFAULT_PATH = "/PATH?ket=value"
-DEFAULT_VERSION = "HTTP/1.0"
-DEFAULT_HEADER = {
-  "User-Agent"=> "Mozilla/5.0 (X11; U; Linux i686; ja; rv:1.9.2.7) Gecko/20100715 Ubuntu/10.04 (lucid) Firefox/3.6.7",
-  "Accept"=> "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
-  "Accept-Language"=> "ja,en-us;q=0.7,en;q=0.3",
-  "Accept-Encoding"=> "gzip,deflate",
-  "Accept-Charset"=> "Shift_JIS,utf-8;q=0.7,*;q=0.7",
-  "Keep-Alive"=> "115",
-  "Connection"=> "keep-alive",
-  "Cache-Control"=> "max-age=0",
-}
-
-ERR_400 = "HTTP/1.0 400 Bad Request"
-
-class App
-  def call env
-    body = RESPONSE
-    [200,
-     {
-       'Content-type'=> 'text/plain',
-       'Content-length'=> RESPONSE.join.size.to_s
-     },
-     body
-    ]
+require 'minitest/autorun'
+
+class BadHttpMethodTest < Bossan::Test::TestCase
+  ASSERT_RESPONSE = "Hello world!"
+  RESPONSE = ["Hello ", "world!"].freeze
+  DEFAULT_PATH = "/PATH?ket=value"
+  DEFAULT_VERSION = "HTTP/1.0"
+  DEFAULT_HEADER = {
+    "User-Agent"=> "Mozilla/5.0 (X11; U; Linux i686; ja; rv:1.9.2.7) Gecko/20100715 Ubuntu/10.04 (lucid) Firefox/3.6.7",
+    "Accept"=> "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+    "Accept-Language"=> "ja,en-us;q=0.7,en;q=0.3",
+    "Accept-Encoding"=> "gzip,deflate",
+    "Accept-Charset"=> "Shift_JIS,utf-8;q=0.7,*;q=0.7",
+    "Keep-Alive"=> "115",
+    "Connection"=> "keep-alive",
+    "Cache-Control"=> "max-age=0",
+  }
+  ERR_400 = "HTTP/1.0 400 Bad Request"
+
+  class App
+    def call env
+      body = RESPONSE
+      [200,
+       {
+         'Content-type'=> 'text/plain',
+         'Content-length'=> RESPONSE.join.size.to_s
+       },
+       body
+      ]
+    end
   end
-end
-
-
-def send_data method
-  begin
-    sock = TCPSocket.new DEFAULT_HOST, DEFAULT_PORT
-    sock.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
-    sock.send("#{method} #{DEFAULT_PATH} #{DEFAULT_VERSION}\r\n", 0)
-    sock.send("Host: #{DEFAULT_HOST}\r\n", 0)
-    DEFAULT_HEADER.each_pair {|k, v|
-      sock.send("#{k}: #{v}\r\n", 0)
-    }
-    sock.send("\r\n", 0)
 
-    data = sock.recv(1024 * 2)
-    return data
-  rescue
-    raise
+  def app
+    App.new
   end
-end
 
-
-class BadHttpMethodTest < Test::Unit::TestCase
+  def send_data method
+    begin
+      sock = TCPSocket.new(host(), port())
+      sock.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
+      sock.send("#{method} #{DEFAULT_PATH} #{DEFAULT_VERSION}\r\n", 0)
+      sock.send("Host: #{host()}\r\n", 0)
+      DEFAULT_HEADER.each_pair {|k, v|
+        sock.send("#{k}: #{v}\r\n", 0)
+      }
+      sock.send("\r\n", 0)
+
+      data = sock.recv(1024 * 2)
+      return data
+    rescue
+      raise
+    end
+  end
 
   def test_bad_method1
-    response = send_data("")
-    assert_equal(ERR_400, response.split("\r\n").first)
+    begin
+      response = send_data("")
+      assert_equal(ERR_400, response.split("\r\n").first)
+    rescue Errno::EPIPE => e
+      assert(true)
+    rescue Errno::ECONNRESET => e
+      assert(true)
+    rescue
+      assert(false)
+    end
   end
 
   def test_bad_method2
-    response = send_data("GET" * 100)
-    assert_equal(ERR_400, response.split("\r\n").first)
+    begin
+      response = send_data("GET" * 100)
+      assert_equal(ERR_400, response.split("\r\n").first)
+    rescue Errno::EPIPE => e
+      assert(true)
+    rescue Errno::ECONNRESET => e
+      assert(true)
+    rescue
+      assert(false)
+    end
   end
 
   def test_bad_path
-    response = send_data("..")
-    assert_equal(ERR_400, response.split("\r\n").first)
+    begin
+      response = send_data("..")
+      assert_equal(ERR_400, response.split("\r\n").first)
+    rescue Errno::EPIPE => e
+      assert(true)
+    rescue Errno::ECONNRESET => e
+      assert(true)
+    rescue
+      assert(false)
+    end
+  end
+
+  def test_invalid_encoded_url
+    response = Net::HTTP.start(host(), port()) {|http|
+      query = "?q=%XY"
+      http.get("/#{query}")
+    }
+    assert_equal("400", response.code)
   end
 
   def test_long_url1
-    response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) {|http|
+    response = Net::HTTP.start(host(), port()) {|http|
       query = "A" * 4095
       http.get("/#{query}")
     }
@@ -83,35 +110,10 @@ class BadHttpMethodTest < Test::Unit::TestCase
   end
 
   def test_long_url2
-    response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) {|http|
+    response = Net::HTTP.start(host(), port()) {|http|
       query = "A" * 4096
       http.get("/#{query}")
     }
     assert_equal("400", response.code)
   end
-
-end
-
-
-begin
-  $stderr.puts RUBY_DESCRIPTION
-
-  pid = fork do
-    trap(:INT) { Bossan.stop }
-    Bossan.listen(DEFAULT_HOST, DEFAULT_PORT)
-    Bossan.run(App.new)
-  end
-
-  Process.detach pid
-
-  unless server_is_wake_up?
-    $stderr.puts "bossan won't wake up until you love it ..."
-    exit 1
-  end
-
-  err = MiniTest::Unit.new.run(ARGV)
-  exit false if err && err != 0
-
-ensure
-  Process.kill(:INT, pid)
 end

data/test/test_rack_handler.rb

@@ -0,0 +1,69 @@
+require_relative '../lib/rack/handler/bossan'
+require_relative './util'
+require 'minitest/unit'
+require 'test/unit/testcase'
+require 'uri'
+
+
+DEFAULT_HOST = "localhost"
+DEFAULT_PORT = "8000"
+ASSERT_RESPONSE = "Hello world!"
+RESPONSE = ["Hello ", "world!"].freeze
+
+
+class App
+  def call env
+    # p env
+    body = RESPONSE
+    [200,
+     {
+       'Content-type'=> 'text/plain',
+       'Content-length'=> RESPONSE.join.size.to_s
+     },
+     body
+    ]
+  end
+end
+
+
+class RackSpecTest < Test::Unit::TestCase
+
+  def test_get
+    response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) {|http|
+      http.get("/")
+    }
+    assert_equal("200", response.code)
+    assert_equal(ASSERT_RESPONSE, response.body)
+  end
+
+  def test_post
+    response = Net::HTTP.post_form(URI.parse("http://#{DEFAULT_HOST}:#{DEFAULT_PORT}/"),
+                                   {'key1'=> 'value1', 'key2'=> 'value2'})
+    assert_equal("200", response.code)
+    assert_equal(ASSERT_RESPONSE, response.body)
+  end
+end
+
+
+begin
+  $stderr.puts RUBY_DESCRIPTION
+  pid = fork do
+    trap(:INT) { Rack::Handler::Bossan.stop }
+    Rack::Handler::Bossan.run(App.new, {
+                                :Host => DEFAULT_HOST, :Port => DEFAULT_PORT
+                              })
+  end
+
+  Process.detach pid
+
+  unless server_is_wake_up?
+    $stderr.puts "bossan won't wake up until you love it ..."
+    exit 1
+  end
+
+  err = MiniTest::Unit.new.run(ARGV)
+  exit false if err && err != 0
+
+ensure
+  Process.kill(:INT, pid)
+end

data/test/test_rack_spec.rb

@@ -1,35 +1,30 @@
-require_relative '../lib/bossan'
-require_relative './util'
-require 'minitest/unit'
-require 'test/unit/testcase'
+require_relative './bossan_test'
+require 'minitest/autorun'
 require 'uri'
 
-
-DEFAULT_HOST = "localhost"
-DEFAULT_PORT = 8000
-ASSERT_RESPONSE = "Hello world!"
-RESPONSE = ["Hello ", "world!"].freeze
-
-
-class App
-  def call env
-    # p env
-    body = RESPONSE
-    [200,
-     {
-       'Content-type'=> 'text/plain',
-       'Content-length'=> RESPONSE.join.size.to_s
-     },
-     body
-    ]
+class RackSpecTest < Bossan::Test::TestCase
+  ASSERT_RESPONSE = "Hello world!"
+  RESPONSE = ["Hello ", "world!"].freeze
+
+  class App
+    def call env
+      body = RESPONSE
+      [200,
+       {
+         'Content-type'=> 'text/plain',
+         'Content-length'=> RESPONSE.join.size.to_s
+       },
+       body
+      ]
+    end
   end
-end
 
-
-class RackSpecTest < Test::Unit::TestCase
+  def app
+    App.new
+  end
 
   def test_get
-    response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) {|http|
+    response = Net::HTTP.start(host(), port()) {|http|
       http.get("/")
     }
     assert_equal("200", response.code)
@@ -37,32 +32,10 @@ class RackSpecTest < Test::Unit::TestCase
   end
 
   def test_post
-    response = Net::HTTP.post_form(URI.parse("http://#{DEFAULT_HOST}:#{DEFAULT_PORT}/"),
+    response = Net::HTTP.post_form(URI.parse("http://#{host()}:#{port()}/"),
                                    {'key1'=> 'value1', 'key2'=> 'value2'})
     assert_equal("200", response.code)
     assert_equal(ASSERT_RESPONSE, response.body)
   end
 end
 
-
-begin
-  $stderr.puts RUBY_DESCRIPTION
-  pid = fork do
-    trap(:INT) { Bossan.stop }
-    Bossan.listen(DEFAULT_HOST, DEFAULT_PORT)
-    Bossan.run(App.new)
-  end
-
-  Process.detach pid
-
-  unless server_is_wake_up?
-    $stderr.puts "bossan won't wake up until you love it ..."
-    exit 1
-  end
-
-  err = MiniTest::Unit.new.run(ARGV)
-  exit false if err && err != 0
-
-ensure
-  Process.kill(:INT, pid)
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bossan
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Hiroki Noda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -49,7 +49,6 @@ files:
 - examples/config.ru
 - examples/fork_sample.rb
 - examples/hello.rb
-- examples/inifinity.rb
 - examples/sinatra_app.rb
 - examples/views/index.haml
 - examples/views_sample.rb
@@ -71,12 +70,16 @@ files:
 - lib/bossan.rb
 - lib/bossan/version.rb
 - lib/rack/handler/bossan.rb
+- test/bossan_test.rb
+- test/driver.rb
 - test/test_rack_chunk_response.rb
+- test/test_rack_each_response.rb
 - test/test_rack_env_big_message_body.rb
 - test/test_rack_env_simple_get.rb
 - test/test_rack_env_simple_query.rb
 - test/test_rack_err_spec.rb
 - test/test_rack_evil.rb
+- test/test_rack_handler.rb
 - test/test_rack_spec.rb
 - test/util.rb
 homepage: https://github.com/kubo39/bossan

data/examples/inifinity.rb

@@ -1,17 +0,0 @@
-require_relative '../lib/bossan'
-
-
-app = lambda do |env|
-  body = (1..Float::INFINITY).lazy.map(&:to_s)
-  [
-   200,          # Status code
-   {             # Response headers
-     'Content-Type' => 'text/html',
-   },
-   body        # Response body
-  ]
-end
-
-Bossan.set_keepalive(10)
-Bossan.listen('127.0.0.1', 8000)
-Bossan.run(app)