bossan 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTI5NjNkNTJkYmMwYmY0NDk5OGFkZDIyYzU1NzQxYWU1NGM3ODcxYw==
+    ZjFiOTYwNTUwMTUwNGFkYmJjOWQwYzdiMjA3NzVlOGI0NDhkNjMxNg==
   data.tar.gz: !binary |-
-    NjBmZmUxYjczNTM0YzllYjRmMmI4MzM3Mzc0MjkyZmQ1MDU2MmI4Ng==
+    ODU1NGExMjUxYzVmOTQ2NDE3Y2U3ZDg1YzMwNzY0OTliYjE4ZjU1OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjJjMzk1YTlhMjM4OTgxYjU4MWUwODY1ZmZhNWQzY2M3YzU4ZjA0N2U0ODIx
-    MzUzODU0MDYxZmM2YTBhMzlkZjVjNGMyOTU0YjY2MGJiYzlmYTI1YWZlZTZh
-    M2ZjNjBiZWMxZmRlZjE0YzNlNjNlNjE2ODhkZjMxMzM4MjE1MGE=
+    OTUxMWUwMGIxYmM0ZWUwODNjYzNlMTVlYjk5MmE2YTJjMmQ0YzMxMmQ1N2Uz
+    NjM5ZjA3MmE4NTAzM2JmNjNmZWQxYjY5MTdiYWMxZjUzYzE5NGNkODRhODlm
+    NzhlZjVkNDAwYjhkMDE2MTRiNzdiMzJmMWRkMGVhMjY1YzMwMDM=
   data.tar.gz: !binary |-
-    NWQ4YTdkNmNjODVkZTgyZGQxNzdhMjk5NjViYzk1ZjliYjQwODY2OGI1MTI0
-    MTgxMjlkNDA2MzRkNzJlNDY4MDNmMTViODJmM2ZmNDY4MTFiNjYyNzIyYzlk
-    MThmNWY4Mjg4NGI5YzgyOWY1OGFhMDlhOGEzYTE2OTRkNzA1ZGE=
+    ZjNhZjE4ZDgxZmNmOWQ5M2UyMWVjOTI3OGZiNWU1ZmUyYzg1ZGMxMzQ4OWRk
+    ODg4OGE1YWQ1YzU0YmE3Y2FhOTkxZWNhY2YxYzcxYTAzYjFiNTA1NTMwNDYw
+    MTU5YTk5MWQ3Y2ZiNzUwOGFlMzRjM2I5NzgyY2FlYjBjMmVmZDg=

data/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ### v0.2.0
 
-(New Feature release. rerelease 2013-05-22)
+(New Feature release. release 2013-05-22)
 
 * support keep-alive (use Bossan.set_keepalive)
 
@@ -10,4 +10,4 @@
 
 * add set_backlog (default:1024)
 
-* add set_picoev_max_fd (default:1024)
+* add set_picoev_max_fd (default:4096)

data/TODO

@@ -1,5 +1,3 @@
-* add picoev_max_fd setter, getter
-
 * set rack.input File-type object, if over 512K
   - avoid too much use memory
 

data/examples/blog/app.rb

@@ -3,6 +3,7 @@ require 'active_record'
 require 'erb'
 
 enable :sessions
+set :views, File.dirname(__FILE__) + '/views'
 
 DATABASE = './db/sinatr.db'
 SECRET_KEY = 'development_key'

data/examples/fork_sample.rb

@@ -0,0 +1,18 @@
+require_relative '../lib/bossan'
+require 'parallel'
+
+app = ->(env){
+ body = ['hello, world!']        # Response body
+ [200,          # Status code
+  {             # Response headers
+    'Content-Type' => 'text/html',
+    'Content-Length' => body.join.size.to_s,
+  },
+  body]
+}
+
+Bossan.set_keepalive(10)
+Bossan.listen('localhost', 8000)
+workers = Parallel.each([0,1,2,3]) {|i|
+  Bossan.run(app)
+}

data/examples/hello.rb

@@ -1,13 +1,14 @@
 require_relative '../lib/bossan'
 
-Bossan.run('127.0.0.1', 8000, proc {|env|
-  body = 'hello, world!'
-  [
-   200,          # Status code
-   {             # Response headers
-     'Content-Type' => 'text/html',
-     'Content-Length' => body.size.to_s,
-   },
-   [body]        # Response body
-  ]
-})
+Bossan.listen('127.0.0.1', 8000)
+Bossn.run(proc {|env|
+            body = 'hello, world!'
+            [
+             200,          # Status code
+             {             # Response headers
+               'Content-Type' => 'text/html',
+               'Content-Length' => body.size.to_s,
+             },
+             [body]        # Response body
+            ]
+          })

data/examples/sinatra_app.rb

@@ -7,5 +7,6 @@ class App < Sinatra::Base
   end
 end
 
-Bossan.run('127.0.0.1', 8000, App)
+Bossan.listen('127.0.0.1', 8000)
+Bossan.run(App)
 

data/examples/uploads.rb

@@ -0,0 +1,59 @@
+require_relative '../lib/bossan'
+require 'rack'
+require 'tempfile'
+
+
+def view_file req
+  # p req
+  # p req.env['rack.input']
+
+  tempfile = Tempfile.new('raw-upload.')
+  req.env['rack.input'].each do |chunk|
+    if chunk.respond_to?(:force_encoding)
+      tempfile << chunk.force_encoding('UTF-8')
+    else
+      tempfile << chunk
+    end
+  end
+
+  req.env['rack.input'].rewind
+
+  tempfile.flush
+  tempfile.rewind
+
+  # return Rack::File.new(tempfile)
+  return Rack::Multipart::UploadedFile.new(tempfile, req.content_type, true)
+  # return Rack::Response.new(req.env["rack.input"],
+  #                           200,
+  #                           {"Content-Type" => req.content_type})
+end
+
+
+def upload_file req
+  return Rack::Response.new([<<-EOF
+<h1>Upload File</h1>
+<form action="" method="post" enctype="multipart/form-data">
+  <input type="file" name="uploaded_file"><input type="submit" value="Upload">
+</form>
+EOF
+                            ],
+                            200,
+                            ).to_a
+end
+
+
+app = ->(env) {
+  req = Rack::Request.new(env)
+  resp = if req.request_method == 'POST'
+           view_file req
+         else
+           upload_file req
+         end
+  # p resp
+  return resp
+}
+
+
+Bossan.set_max_content_length(1024 * 1024 * 1024)
+Bossan.run('localhost', 8000)
+Bossan.listen(app)

data/examples/views_sample.rb

@@ -8,4 +8,5 @@ class App < Sinatra::Base
   end
 end
 
-Bossan.run('127.0.0.1', 8000, App)
+Bossan.listen('127.0.0.1', 8000)
+Bossan.run(App)

data/ext/bossan/bossan_ext.c

@@ -27,7 +27,7 @@
 
 #define MSG_413 ("HTTP/1.0 413 Request Entity Too Large\r\nContent-Type: text/html\r\nServer: " SERVER "\r\n\r\n<html><head><title>Request Entity Too Large</title></head><body><p>Request Entity Too Large.</p></body></html>")
 
-#define SERVER "bossan/0.2.0"
+#define SERVER "bossan/0.3.0"
 
 VALUE server; // Bossan
 
@@ -1800,18 +1800,18 @@ bossan_access_log(VALUE self, VALUE args)
 
 
 static VALUE
-bossan_run_loop(int argc, VALUE *argv, VALUE self)
+bossan_listen(int argc, VALUE *argv, VALUE self)
 {
   int ret;
-  VALUE args1, args2, args3;
+  VALUE args1, args2;
 
-  rb_scan_args(argc, argv, "21", &args1, &args2, &args3);
+  rb_scan_args(argc, argv, "11", &args1, &args2);
 
   if(listen_sock > 0){
     rb_raise(rb_eException, "already set listen socket");
   }
 
-  if (argc == 3){
+  if (argc == 2){
     server_name = StringValuePtr(args1);
     server_port = NUM2INT(args2);
 
@@ -1825,11 +1825,9 @@ bossan_run_loop(int argc, VALUE *argv, VALUE self)
     server_port = (short)_port;
 
     ret = inet_listen();
-    rack_app = args3;
   } else {
     Check_Type(args1, T_STRING);
     ret = unix_listen(StringValuePtr(args1));
-    rack_app = args2;
   }
 
   if(ret < 0){
@@ -1840,6 +1838,14 @@ bossan_run_loop(int argc, VALUE *argv, VALUE self)
   if(listen_sock <= 0){
     rb_raise(rb_eTypeError, "not found listen socket");
   }
+
+  return Qnil;
+}
+
+static VALUE
+bossan_run_loop(VALUE self, VALUE args)
+{
+  rack_app = args;
     
   /* init picoev */
   picoev_init(max_fd);
@@ -2015,7 +2021,8 @@ Init_bossan_ext(void)
   server = rb_define_module("Bossan");
   rb_gc_register_address(&server);
 
-  rb_define_module_function(server, "run", bossan_run_loop, -1);
+  rb_define_module_function(server, "listen", bossan_listen, -1);
+  rb_define_module_function(server, "run", bossan_run_loop, 1);
   rb_define_module_function(server, "stop", bossan_stop, 0);
   rb_define_module_function(server, "shutdown", bossan_stop, 0);
 

data/lib/bossan.rb

@@ -1,7 +1,3 @@
 require_relative "bossan/version"
 require_relative "bossan/bossan_ext"
 require_relative "rack/handler/bossan"
-
-def run *args
-  Bossan.run *args
-end

data/lib/bossan/version.rb

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

data/lib/rack/handler/bossan.rb

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

data/test/test_rack_bad_http_method.rb

@@ -0,0 +1,100 @@
+require_relative '../lib/bossan'
+require 'test/unit'
+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",
+  }
+
+  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
+
+  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?
+
+  def send_data method
+    begin
+      sock = TCPSocket.new DEFAULT_HOST, DEFAULT_PORT
+      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
+    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)
+  end
+
+  def test_bad_method2
+    response = send_data("GET" * 100)
+    assert_equal(response.split("\r\n").first, ERR_400)
+  end
+
+  def teardown
+    Process.kill(:INT, @pid)
+  end
+end

data/test/{test_rack_env_simple.rb → test_rack_env_simple_get.rb}

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
-require 'bossan'
 require 'test/unit'
 require 'pp'
 require 'net/http'
+require_relative '../lib/bossan'
 
 
-class RackEnvSimpleTest < Test::Unit::TestCase
+class RackEnvSimpleGetTest < Test::Unit::TestCase
 
   RESPONSE = ["Hello ", "world!"].freeze
   DEFAULT_HOST = "localhost"
@@ -16,8 +16,8 @@ class RackEnvSimpleTest < Test::Unit::TestCase
     pid = fork do
       r.close
       trap(:INT) { Bossan.stop }
-      Bossan.run(DEFAULT_HOST, DEFAULT_PORT,
-                 proc {|env|
+      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"
@@ -53,6 +53,9 @@ class RackEnvSimpleTest < Test::Unit::TestCase
     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)
   end

data/test/{test_rack_env_query.rb → test_rack_env_simple_query.rb}

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 require 'test/unit'
 require 'pp'
-require 'bossan'
 require 'net/http'
+require_relative '../lib/bossan'
 
 
-class RackEnvQueryTest < Test::Unit::TestCase
+class RackEnvSimpleQueryTest < Test::Unit::TestCase
 
   RESPONSE = ["Hello ", "world!"].freeze
   DEFAULT_HOST = "localhost"
@@ -16,8 +16,8 @@ class RackEnvQueryTest < Test::Unit::TestCase
     pid = fork do
       r.close
       trap(:INT) { Bossan.stop }
-      Bossan.run(DEFAULT_HOST, DEFAULT_PORT,
-                 proc {|env|
+      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"

data/test/test_rack_long_url.rb

@@ -0,0 +1,76 @@
+require_relative '../lib/bossan'
+require 'test/unit'
+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
+
+  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?
+
+  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_long_url1
+    response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) {|http|
+      query = "A" * 4095
+      http.get("/#{query}")
+    }
+
+    assert_equal("200", response.code)
+  end
+
+  def test_long_url2
+    response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) {|http|
+      query = "A" * 4096
+      http.get("/#{query}")
+    }
+
+    assert_equal("400", response.code)
+  end
+
+  def teardown
+    Process.kill(:INT, @pid)
+  end
+end

data/test/test_rack_spec.rb

@@ -1,5 +1,6 @@
 require_relative '../lib/bossan'
 require 'test/unit'
+require 'uri'
 require 'net/http'
 
 class RackSpecTest < Test::Unit::TestCase
@@ -42,7 +43,8 @@ class RackSpecTest < Test::Unit::TestCase
 
     @pid = fork do
       trap(:INT) { Bossan.stop }
-      Bossan.run(DEFAULT_HOST, DEFAULT_PORT, App.new)
+      Bossan.listen(DEFAULT_HOST, DEFAULT_PORT)
+      Bossan.run(App.new)
     end
     Process.detach @pid
     unless server_is_wake_up?
@@ -51,11 +53,19 @@ class RackSpecTest < Test::Unit::TestCase
     end
   end
 
-  def test_simple
-    response = nil
-    Net::HTTP.start("localhost", 8000){|http|
-      response = http.get("/")
+  def test_simple_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_simple_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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bossan
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Hiroki Noda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -48,8 +48,10 @@ files:
 - examples/blog/views/login.erb
 - examples/blog/views/show_entries.erb
 - examples/config.ru
+- examples/fork_sample.rb
 - examples/hello.rb
 - examples/sinatra_app.rb
+- examples/uploads.rb
 - examples/views/index.haml
 - examples/views_sample.rb
 - ext/bossan/bossan.h
@@ -70,8 +72,10 @@ files:
 - lib/bossan.rb
 - lib/bossan/version.rb
 - lib/rack/handler/bossan.rb
-- test/test_rack_env_query.rb
-- test/test_rack_env_simple.rb
+- test/test_rack_bad_http_method.rb
+- test/test_rack_env_simple_get.rb
+- test/test_rack_env_simple_query.rb
+- test/test_rack_long_url.rb
 - test/test_rack_spec.rb
 homepage: https://github.com/kubo39/bossan
 licenses: []