RubyGems - bossan - Versions diffs - 0.1.0 → 0.1.1 - Mend

bossan 0.1.0 → 0.1.1

Files changed (14) hide show

data/.gitignore ADDED

@@ -0,0 +1,19 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.o
+Makefile

data/Gemfile ADDED

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+# Specify your gem's dependencies in bossan.gemspec
+gemspec

data/README.md ADDED

@@ -0,0 +1,50 @@
+# Bossan
+Bossan is a high performance asynchronous rack web server.
+## Requirements
+Bossan requires Ruby 1.9.x.
+Bossan supports Linux only.
+## Installation
+Add this line to your application's Gemfile:
+    gem 'bossan'
+And then execute:
+    $ bundle
+Or install it yourself as:
+    $ gem install bossan
+## Usage
+simple rack app:
+``` ruby
+require 'bossan'
+Bossan.run('127.0.0.1', 8000, proc {|env|
+  [
+   200,          # Status code
+   {             # Response headers
+     'Content-Type' => 'text/html',
+     'Content-Length' => '13',
+   },
+   ['hello, world!']        # Response body
+  ]
+})
+```
+## Contributing
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile ADDED

@@ -0,0 +1,15 @@
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+task :default => [:compile, :clean]
+task :compile do
+  Dir.chdir File.expand_path("../ext/bossan", __FILE__)
+  system "ruby extconf.rb"
+  system "make"
+end
+task :clean do
+  Dir.chdir File.expand_path("../ext/bossan", __FILE__)
+  system "rm -f *.o Makefile"
+end

data/bossan.gemspec ADDED

@@ -0,0 +1,16 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/bossan/version', __FILE__)
+Gem::Specification.new do |gem|
+  gem.name          = "bossan"
+  gem.version       = Bossan::VERSION
+  gem.authors       = ["Hiroki Noda"]
+  gem.email         = ["kubo39@gmail.com"]
+  gem.description   = %q{high performance asynchronous rack web server}
+  gem.summary       = gem.description
+  gem.homepage      = "https://github.com/kubo39/bossan"
+  gem.files         = `git ls-files`.split($/)
+  gem.extensions    = ["ext/bossan/extconf.rb"]
+  gem.require_paths = ["lib", "ext"]
+end

data/examples/hello.rb ADDED

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

data/examples/sinatra_app.rb ADDED

@@ -0,0 +1,11 @@
+require 'bossan'
+require 'sinatra/base'
+class App < Sinatra::Base
+  get '/' do
+    'Hello world!'
+  end
+end
+Bossan.run('127.0.0.1', 8000, App)

data/examples/views/index.haml ADDED

@@ -0,0 +1,10 @@
+!!!
+%html
+  %head
+    %title Hello, Bossan!
+  %body
+    #header
+      %h1 Hello, Bossan!
+    #content
+      %p
+        Hello, World!

data/examples/views_sample.rb ADDED

@@ -0,0 +1,11 @@
+require 'bossan'
+require 'sinatra/base'
+require 'haml'
+class App < Sinatra::Base
+  get '/' do
+    haml :index
+  end
+end
+Bossan.run('127.0.0.1', 8000, App)

data/ext/bossan/bossan_ext.c CHANGED

@@ -51,13 +51,13 @@
 #define CRLF "\r\n"
 #define DELIM ": "
-#define MSG_500 ("HTTP/1.0 500 Internal Server Error\r\nContent-Type: text/html\r\nServer:  " SERVER "\r\n\r\n<html><head><title>500 Internal Server Error</head><h1>Internal Server Error</h1><p>The server encountered an internal error and was unable to complete your request.  Either the server is overloaded or there is an error in the application.</p></html>\n")
+#define MSG_500 ("HTTP/1.0 500 Internal Server Error\r\nContent-Type: text/html\r\nServer:  " SERVER "\r\n\r\n<html><head><title>500 Internal Server Error</title></head><h1>Internal Server Error</h1><p>The server encountered an internal error and was unable to complete your request.  Either the server is overloaded or there is an error in the application.</p></html>\n")
-#define MSG_400 ("HTTP/1.0 400 Bad Request\r\nContent-Type: text/html\r\nServer: " SERVER "\r\n\r\n<html><head><title>Bad Request</head><body><p>Bad Request.</p></body></html>")
+#define MSG_400 ("HTTP/1.0 400 Bad Request\r\nContent-Type: text/html\r\nServer: " SERVER "\r\n\r\n<html><head><title>Bad Request</title></head><body><p>Bad Request.</p></body></html>")
-#define MSG_411 ("HTTP/1.0 411 Length Required\r\nContent-Type: text/html\r\nServer: " SERVER "\r\n\r\n<html><head><title>Length Required</head><body><p>Length Required.</p></body></html>")
+#define MSG_411 ("HTTP/1.0 411 Length Required\r\nContent-Type: text/html\r\nServer: " SERVER "\r\n\r\n<html><head><title>Length Required</title></head><body><p>Length Required.</p></body></html>")
-#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</head><body><p>Request Entity Too Large.</p></body></html>")
+#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.1"
@@ -94,11 +94,14 @@ static VALUE rb_remote_port;
 static VALUE rack_input;
 static VALUE http_connection;
+static VALUE empty_string;
 static VALUE http_user_agent;
 static VALUE i_keys;
 static VALUE i_call;
 static VALUE i_new;
+static VALUE i_key;
 static char *server_name = "127.0.0.1";
 static short server_port = 8000;
@@ -132,10 +135,6 @@ typedef struct {
   size_t limit;
 } buffer;
-typedef struct {
-  VALUE filelike;
-} FileWrapperObject;
 typedef enum {
   FIELD,
   VAL,
@@ -526,7 +525,7 @@ writev_bucket(write_bucket *data)
 }
 static inline int
-write_headers(client_t *client, char *data, size_t datalen)
+write_headers(client_t *client)
 {
   if(client->header_done){
     return 1;
@@ -566,7 +565,10 @@ write_headers(client_t *client, char *data, size_t datalen)
     cache_time_update();
     add_header(bucket, "Date", 4, (char *)http_time, 29);
     if(client->keep_alive == 1){
-      add_header(bucket, "Connection", 10, "keep-alive", 10);
+      // Keep-Alive
+      add_header(bucket, "Connection", 10, "Keep-Alive", 10);
+    } else {
+      add_header(bucket, "Connection", 10, "close", 5);
     }
   }
@@ -581,7 +583,7 @@ write_headers(client_t *client, char *data, size_t datalen)
       if (TYPE(client->headers)!=T_HASH){
 	goto error;
       }
-      VALUE tmp = rb_funcall(client->headers, rb_intern("key?"), 1, object1);
+      VALUE tmp = rb_funcall(client->headers, i_key, 1, object1);
       if (tmp == Qfalse){
 	goto error;
       }
@@ -621,16 +623,10 @@ write_headers(client_t *client, char *data, size_t datalen)
   }
   set2bucket(bucket, CRLF, 2);
-  if(data){
-    set2bucket(bucket, data, datalen);
-  }
   client->bucket = bucket;
   int ret = writev_bucket(bucket);
   if(ret != 0){
     client->header_done = 1;
-    if(ret > 0 && data){
-      client->write_bytes += datalen;
-    }
     // clear
     free_write_bucket(bucket);
     client->bucket = NULL;
@@ -687,8 +683,6 @@ processs_write(client_t *client)
   iterator = client->response_iter;
   if(iterator != NULL){
-    /* Check_Type(iterator, T_ARRAY); */
-    /* assert(3 == RARRAY_LEN(iterator)); */
     if (TYPE(iterator) != T_ARRAY || RARRAY_LEN(iterator) != 3){
       return -1;
     }
@@ -698,29 +692,32 @@ processs_write(client_t *client)
     if (TYPE(arr) != T_ARRAY){
       return -1;
     }
-    item = rb_ary_entry(arr, 0);
-    if(TYPE(item) != T_STRING) {
-      return -1;
-    }
+    int hlen = RARRAY_LEN(arr);
-    buf = StringValuePtr(item);
-    buflen = RSTRING_LEN(item);
-    //write
-    bucket = new_write_bucket(client->fd, 1);
-    set2bucket(bucket, buf, buflen);
-    ret = writev_bucket(bucket);
-    if(ret <= 0){
-      return ret;
-    }
-    //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;
+    for(int i=0; i<hlen;i++){
+      item = rb_ary_entry(arr, i);
+      if(TYPE(item) != T_STRING) {
+	return -1;
+      }
+      buf = StringValuePtr(item);
+      buflen = RSTRING_LEN(item);
+      //write
+      bucket = new_write_bucket(client->fd, 1);
+      set2bucket(bucket, buf, buflen);
+      ret = writev_bucket(bucket);
+      if(ret <= 0){
+	return ret;
+      }
+      //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;
+	}
       }
     }
     close_response(client);
@@ -755,7 +752,7 @@ static inline int
 start_response_write(client_t *client)
 {
   VALUE iterator;
-  VALUE arr;
+  VALUE dict;
   VALUE item;
   char *buf;
   ssize_t buflen;
@@ -768,24 +765,16 @@ start_response_write(client_t *client)
   }
   assert(3 == RARRAY_LEN(iterator));
-  arr = rb_ary_entry(iterator, 2);
+  dict = rb_ary_entry(iterator, 1);
-  if (TYPE(arr) != T_ARRAY){
+  if (TYPE(dict) != T_HASH){
     return -1;
   }
-  VALUE v_body = rb_ary_entry(arr, 0);
-  Check_Type(v_body, T_STRING);
-  if (v_body) {
-    buf = StringValuePtr(v_body);
-    buflen = RSTRING_LEN(v_body);
 #ifdef DEBUG
-    printf("start_response_write buflen %d \n", buflen);
+  printf("start_response_write buflen %d \n", buflen);
 #endif
-    return write_headers(client, buf, buflen);
-  }
-  return -1;
+  return write_headers(client);
 }
 inline int
@@ -794,7 +783,7 @@ response_start(client_t *client)
   int ret;
   enable_cork(client);
   if(client->status_code == 304){
-    return write_headers(client, NULL, 0);
+    return write_headers(client);
   }
   ret = start_response_write(client);
 #ifdef DEBUG
@@ -1343,10 +1332,15 @@ init_parser(client_t *cli, const char *name, const short port)
   rb_hash_aset(cli->environ, server_name_key, server_name_val);
   rb_hash_aset(cli->environ, server_port_key, server_port_val);
+  // query_string
+  rb_hash_aset(cli->environ, query_string, empty_string);
   object = rb_str_new2(cli->remote_addr);
   rb_hash_aset(cli->environ, rb_remote_addr, object);
-  object = INT2NUM(cli->remote_port);
+  char r_port[6];
+  sprintf(r_port, "%d", cli->remote_port);
+  object = rb_str_new2(r_port);
   rb_hash_aset(cli->environ, rb_remote_port, object);
   http_parser_init(cli->http, HTTP_REQUEST);
@@ -1371,44 +1365,46 @@ inline void
 setup_static_env(char *name, int port)
 {
   version_val = rb_obj_freeze(rb_ary_new3(2, INT2FIX(1), INT2FIX(1)));
-  version_key = rb_str_new2("rack.version");
+  version_key = rb_obj_freeze(rb_str_new2("rack.version"));
-  scheme_val = rb_str_new2("http");
-  scheme_key = rb_str_new2("rack.url_scheme");
+  scheme_val = rb_obj_freeze(rb_str_new2("http"));
+  scheme_key = rb_obj_freeze(rb_str_new2("rack.url_scheme"));
   errors_val = rb_stderr;
-  errors_key = rb_str_new2("rack.errors");
+  errors_key = rb_obj_freeze(rb_str_new2("rack.errors"));
   multithread_val = Qfalse;
-  multithread_key = rb_str_new2("rack.multithread");
+  multithread_key = rb_obj_freeze(rb_str_new2("rack.multithread"));
   multiprocess_val = Qfalse; /* or Qtrue? I have no clue.. */
-  multiprocess_key = rb_str_new2("rack.multiprocess");
+  multiprocess_key = rb_obj_freeze(rb_str_new2("rack.multiprocess"));
   run_once_val = Qfalse;
-  run_once_key = rb_str_new2("rack.run_once");
+  run_once_key = rb_obj_freeze(rb_str_new2("rack.run_once"));
-  script_val = rb_str_new2("");
-  script_key = rb_str_new2("SCRIPT_NAME");
+  script_val = empty_string;
+  script_key = rb_obj_freeze(rb_str_new2("SCRIPT_NAME"));
-  server_name_val = rb_str_new2(name);
-  server_name_key = rb_str_new2("SERVER_NAME");
+  server_name_val = rb_obj_freeze(rb_str_new2(name));
+  server_name_key = rb_obj_freeze(rb_str_new2("SERVER_NAME"));
-  server_port_val = INT2NUM(port);
-  server_port_key = rb_str_new2("SERVER_PORT");
+  char vport[6];
+  sprintf(vport, "%d", port);
+  server_port_val = rb_obj_freeze(rb_str_new2(vport));
+  server_port_key = rb_obj_freeze(rb_str_new2("SERVER_PORT"));
-  server_protocol = rb_str_new2("SERVER_PROTOCOL");
-  path_info = rb_str_new2("PATH_INFO");
-  request_uri = rb_str_new2("REQUEST_URI");
-  query_string = rb_str_new2("QUERY_STRING");
-  http_fragment = rb_str_new2("HTTP_FRAGMENT");
-  request_method = rb_str_new2("REQUEST_METHOD");
-  rb_remote_addr = rb_str_new2("REMOTE_ADDR");
-  rb_remote_port = rb_str_new2("REMOTE_PORT");
-  rack_input = rb_str_new2("rack.input");
-  http_connection = rb_str_new2("HTTP_CONNECTION");
+  server_protocol = rb_obj_freeze(rb_str_new2("SERVER_PROTOCOL"));
+  path_info = rb_obj_freeze(rb_str_new2("PATH_INFO"));
+  request_uri = rb_obj_freeze(rb_str_new2("REQUEST_URI"));
+  query_string = rb_obj_freeze(rb_str_new2("QUERY_STRING"));
+  http_fragment = rb_obj_freeze(rb_str_new2("HTTP_FRAGMENT"));
+  request_method = rb_obj_freeze(rb_str_new2("REQUEST_METHOD"));
+  rb_remote_addr = rb_obj_freeze(rb_str_new2("REMOTE_ADDR"));
+  rb_remote_port = rb_obj_freeze(rb_str_new2("REMOTE_PORT"));
+  rack_input = rb_obj_freeze(rb_str_new2("rack.input"));
+  http_connection = rb_obj_freeze(rb_str_new2("HTTP_CONNECTION"));
-  http_user_agent = rb_str_new2("HTTP_USER_AGENT");
+  http_user_agent = rb_obj_freeze(rb_str_new2("HTTP_USER_AGENT"));
 }
 static inline int
@@ -1724,7 +1720,6 @@ r_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
   }
 }
-// TODO: use accept4 in linux
 static void
 accept_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
 {
@@ -1737,8 +1732,7 @@ accept_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
     return;
   }else if ((events & PICOEV_READ) != 0) {
     socklen_t client_len = sizeof(client_addr);
-    client_fd = accept(fd, (struct sockaddr *)&client_addr, &client_len);
+    client_fd = accept4(fd, (struct sockaddr *)&client_addr, &client_len, SOCK_NONBLOCK | SOCK_CLOEXEC);
     if (client_fd != -1) {
 #ifdef DEBUG
       printf("accept fd %d \n", client_fd);
@@ -1878,7 +1872,7 @@ bossan_access_log(VALUE self, VALUE args)
   return Qnil;
 }
-// Bossan.run('127.0.0.1', 8000) do |env|
+// Bossan.run('127.0.0.1', 8000, proc do |env|
 //   ...
 // end
 static VALUE
@@ -1987,15 +1981,20 @@ Init_bossan_ext(void)
   rb_gc_register_address(&http_user_agent);
+  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_key);
   rb_gc_register_address(&rack_app); //rack app
   i_new = rb_intern("new");
   i_call = rb_intern("call");
   i_keys = rb_intern("keys");
+  i_key = rb_intern("key?");
   server = rb_define_module("Bossan");
   rb_gc_register_address(&server);

data/lib/bossan.rb CHANGED

@@ -1,5 +1,7 @@
 require_relative "bossan/version"
 require_relative "bossan/bossan_ext"
+require_relative "rack/handler/bossan"
-module Bossan
+def run(host='127.0.0.1', port=8000, app)
+  Bossan.run(host, port, app)
 end

data/lib/bossan/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Bossan
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/rack/handler/bossan.rb ADDED

@@ -0,0 +1,20 @@
+require 'rack/handler'
+require 'bossan'
+module Rack
+  module Handler
+    module Bossan
+      DEFAULT_OPTIONS = {
+        "Host" => '0.0.0.0',
+        "Port" => 8080,
+        # :Verbose => false
+      }
+      def self.run(app, options = {})
+        options = DEFAULT_OPTIONS.merge(options)
+        ::Bossan.run(options["Host"], options["Port"], app)
+      end
+    end
+    register :bossan, Bossan
+  end
+end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bossan
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies: []
 description: high performance asynchronous rack web server
 email:
@@ -19,17 +19,27 @@ extensions:
 - ext/bossan/extconf.rb
 extra_rdoc_files: []
 files:
+- .gitignore
+- Gemfile
 - LICENSE.txt
-- lib/bossan/version.rb
-- lib/bossan.rb
+- README.md
+- Rakefile
+- bossan.gemspec
+- examples/hello.rb
+- examples/sinatra_app.rb
+- examples/views/index.haml
+- examples/views_sample.rb
+- ext/bossan/bossan_ext.c
+- ext/bossan/extconf.rb
+- ext/bossan/http_parser.c
 - ext/bossan/http_parser.h
+- ext/bossan/picoev.h
 - ext/bossan/picoev_epoll.c
 - ext/bossan/time_cache.c
-- ext/bossan/picoev.h
 - ext/bossan/time_cache.h
-- ext/bossan/bossan_ext.c
-- ext/bossan/extconf.rb
-- ext/bossan/http_parser.c
+- lib/bossan.rb
+- lib/bossan/version.rb
+- lib/rack/handler/bossan.rb
 homepage: https://github.com/kubo39/bossan
 licenses: []
 post_install_message: