bossan 0.3.0 → 0.4.0

data/ext/bossan/time_cache.h

@@ -13,6 +13,7 @@ cache_time_init(void);
 void
 cache_time_update(void);
 
+extern volatile uintptr_t current_msec;
 extern volatile char *err_log_time;
 extern volatile char *http_time;
 extern volatile char *http_log_time;

data/lib/bossan/version.rb

@@ -1,3 +1,3 @@
 module Bossan
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/test/test_rack_bad_http_method.rb

@@ -1,60 +1,48 @@
 require_relative '../lib/bossan'
-require 'test/unit'
+require 'minitest/unit'
+require 'test/unit/testcase'
 require 'socket'
 require 'net/http'
 
-class BadHttpMethodTest < Test::Unit::TestCase
 
-  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",
-  }
+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
-      ]
-    end
-  end
+ERR_400 = "HTTP/1.0 400 Bad Request"
 
-  def server_is_wake_up? n=100
-    n.times {
-      begin
-        Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT)
-      rescue
-        next
-      end
-      $stderr.puts "*** running success ***"
-      return true
-    }
-    return false
+class App
+  def call env
+    body = RESPONSE
+    [200,
+     {
+       'Content-type'=> 'text/plain',
+       'Content-length'=> RESPONSE.join.size.to_s
+     },
+     body
+    ]
   end
+end
 
-  private :server_is_wake_up?
+class BadHttpMethodTest < Test::Unit::TestCase
 
   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|
@@ -69,32 +57,56 @@ class BadHttpMethodTest < Test::Unit::TestCase
     end
   end
 
-  def setup
-    $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
-  end
-
   def test_bad_method1
     response = send_data("")
-    assert_equal(response.split("\r\n").first, ERR_400)
+    assert_equal(ERR_400, response.split("\r\n").first)
   end
 
   def test_bad_method2
     response = send_data("GET" * 100)
-    assert_equal(response.split("\r\n").first, ERR_400)
+    assert_equal(ERR_400, response.split("\r\n").first)
+  end
+
+  def test_bad_path
+    response = send_data("..")
+    assert_equal(ERR_400, response.split("\r\n").first)
+  end
+end
+
+
+def server_is_wake_up? n=100
+  n.times {
+    begin
+      Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT)
+    rescue
+      next
+    end
+    $stderr.puts "*** running success ***"
+    return true
+  }
+  return false
+end
+
+
+begin
+  $stderr.puts RUBY_DESCRIPTION
+
+  pid = fork do
+    trap(:INT) { Bossan.stop }
+    Bossan.listen(DEFAULT_HOST, DEFAULT_PORT)
+    Bossan.run(App.new)
   end
 
-  def teardown
-    Process.kill(:INT, @pid)
+  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_chunk_response.rb

@@ -0,0 +1,76 @@
+require_relative '../lib/bossan'
+require 'minitest/unit'
+require 'test/unit/testcase'
+require 'uri'
+require 'net/http'
+
+
+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
+    ]
+  end
+end
+
+class RackChunkResponseTest < Test::Unit::TestCase
+
+  def test_chunk_response
+    response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) {|http|
+      http.get("/")
+    }
+
+    headers = response.header
+    assert_equal("200", response.code)
+    assert_equal(ASSERT_RESPONSE, response.body)
+    assert_equal("chunked", headers["transfer-encoding"])
+    assert_equal("close", headers["connection"])
+  end
+
+end
+
+
+def server_is_wake_up? n=100
+  n.times {
+    begin
+      Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT)
+    rescue
+      next
+    end
+    $stderr.puts "*** running success ***"
+    return true
+  }
+  return false
+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_long_url.rb

@@ -1,56 +1,30 @@
 require_relative '../lib/bossan'
-require 'test/unit'
+require 'minitest/unit'
+require 'test/unit/testcase'
 require 'net/http'
 
-class LongUrlTest < Test::Unit::TestCase
 
-  ASSERT_RESPONSE = "Hello world!"
-  RESPONSE = ["Hello ", "world!"].freeze
-  DEFAULT_HOST = "localhost"
-  DEFAULT_PORT = 8000
-
-  class App
-    def call env
-      body = RESPONSE
-      [200,
-       {
-         'Content-type'=> 'text/plain',
-         'Content-length'=> RESPONSE.join.size.to_s
-       },
-       body
-      ]
-    end
-  end
+ASSERT_RESPONSE = "Hello world!"
+RESPONSE = ["Hello ", "world!"].freeze
+DEFAULT_HOST = "localhost"
+DEFAULT_PORT = 8000
 
-  def server_is_wake_up? n=100
-    n.times {
-      begin
-        Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT)
-      rescue
-        next
-      end
-      $stderr.puts "*** running success ***"
-      return true
-    }
-    return false
-  end
 
-  private :server_is_wake_up?
+class App
+  def call env
+    body = RESPONSE
+    [200,
+     {
+       'Content-type'=> 'text/plain',
+       'Content-length'=> RESPONSE.join.size.to_s
+       },
+     body
+    ]
+  end
+end
 
-  def setup
-    $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
-  end
+class LongUrlTest < Test::Unit::TestCase
 
   def test_long_url1
     response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) {|http|
@@ -69,8 +43,40 @@ class LongUrlTest < Test::Unit::TestCase
 
     assert_equal("400", response.code)
   end
+end
+
+
+def server_is_wake_up? n=100
+  n.times {
+    begin
+      Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT)
+    rescue
+      next
+    end
+    $stderr.puts "*** running success ***"
+    return true
+  }
+  return false
+end
 
-  def teardown
-    Process.kill(:INT, @pid)
+
+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_spec.rb

@@ -1,57 +1,30 @@
 require_relative '../lib/bossan'
-require 'test/unit'
+require 'minitest/unit'
+require 'test/unit/testcase'
 require 'uri'
 require 'net/http'
 
-class RackSpecTest < Test::Unit::TestCase
-
-  ASSERT_RESPONSE = "Hello world!"
-  RESPONSE = ["Hello ", "world!"].freeze
-  DEFAULT_HOST = "localhost"
-  DEFAULT_PORT = 8000
-
-  class App
-    def call env
-      body = RESPONSE
-      [200,
-       {
-         'Content-type'=> 'text/plain',
-         'Content-length'=> RESPONSE.join.size.to_s
-       },
-       body
-      ]
-    end
-  end
-
-  def server_is_wake_up? n=100
-    n.times {
-      begin
-        Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT)
-      rescue
-        next
-      end
-      $stderr.puts "*** running success ***"
-      return true
-    }
-    return false
-  end
 
-  private :server_is_wake_up?
+DEFAULT_HOST = "localhost"
+DEFAULT_PORT = 8000
+ASSERT_RESPONSE = "Hello world!"
+RESPONSE = ["Hello ", "world!"].freeze
 
-  def setup
-    $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
+class App
+  def call 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_simple_get
     response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) {|http|
@@ -69,8 +42,42 @@ class RackSpecTest < Test::Unit::TestCase
     assert_equal("200", response.code)
     assert_equal(ASSERT_RESPONSE, response.body)
   end
+end
+
+
+def server_is_wake_up? n=100
+  n.times {
+    begin
+      Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT)
+    rescue
+      next
+    end
+    $stderr.puts "*** running success ***"
+    return true
+  }
+  return false
+end
+
 
-  def teardown
-    Process.kill(:INT, @pid)
+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