nyara 0.0.1.pre.6 → 0.0.1.pre.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4923242f45af2bfc9d06879f83c200d10379f89b
-  data.tar.gz: 7a03f851beecfb9e5846bd17adf3b15efe91968b
+  metadata.gz: 1464261ce5d4ec90868a68278e81de0124568897
+  data.tar.gz: 566342b6927ac0fc3f5607580a0863d18b9be432
 SHA512:
-  metadata.gz: 3ffe022bf0b05d95238fddcf4bf2fdb998c23e8490d31eec5154bd011034eb058fb2fd6ca99dcc37aeee1282102f6cb924e61fe20eeecc81f0ed50d903762186
-  data.tar.gz: cf2fe6b094478f9ed04c96e940e2075a019908abafb7fbf5eb255e66c91afa80dd5efea3b4c9d943f6d27a6a18f966b17b116e1664552c658264c7abda26fe69
+  metadata.gz: c322de1bd85993df20041bd8535800751abdf4b4c8152b7ed4899a0430aed90d4552a97f21839267376f78bac18cc254fd395e9124cc071db8e4b3575ba6537c
+  data.tar.gz: e7c16bb717db1c131069d361087a8d97e96b1282d93d002582aa10cd0bcff01741eedefa0d43ab65c18c9ec480e1c214d3f03218c4569a1bb3786194c43c46e8

data/example/project.rb

@@ -0,0 +1,11 @@
+require_relative "../lib/nyara"
+
+configure do
+  set :root, __dir__
+  set :public, 'public'
+  set :views, 'views'
+end
+
+get '/' do
+  send_string 'hello'
+end

data/example/stream.rb

@@ -1,5 +1,9 @@
-require "nyara"
-require "slim"
+require_relative "../lib/nyara"
+require "pry"
+
+configure do
+  set :root, __dir__
+end
 
 get '/' do
   view = stream 'index'

data/ext/event.c

@@ -18,6 +18,7 @@ extern VALUE rb_obj_reveal(VALUE obj, VALUE klass);
 #define ETYPE_CONNECT 2
 #define MAX_E 1024
 static void loop_body(int fd, int etype);
+static void loop_check();
 static int qfd = 0;
 
 #define MAX_RECEIVE_DATA 65536 * 2
@@ -38,6 +39,8 @@ static VALUE sym_writing;
 static VALUE sym_reading;
 static VALUE sym_sleep;
 static Request* curr_request;
+static VALUE to_resume_actions;
+static bool graceful_quit = false;
 
 static VALUE _fiber_func(VALUE _, VALUE args) {
   VALUE instance = rb_ary_pop(args);
@@ -46,6 +49,22 @@ static VALUE _fiber_func(VALUE _, VALUE args) {
   return Qnil;
 }
 
+static void _resume_action(Request* p) {
+  VALUE state = rb_fiber_resume(p->fiber, 0, NULL);
+  if (state == Qnil) { // _fiber_func always returns Qnil
+    // terminated (todo log raised error ?)
+    nyara_request_term_close(p->self);
+  } else if (state == sym_term_close) {
+    nyara_request_term_close(p->self);
+  } else if (state == sym_writing) {
+    // do nothing
+  } else if (state == sym_reading) {
+    // do nothing
+  } else if (state == sym_sleep) {
+    // do nothing
+  }
+}
+
 static void _handle_request(VALUE request) {
   Request* p;
   Data_Get_Struct(request, Request, p);
@@ -92,27 +111,19 @@ static void _handle_request(VALUE request) {
       p->response_header_extra_lines = rb_ary_new();
       nyara_request_init_env(request);
     } else {
-      rb_funcall(p->self, id_not_found, 0);
+      static const char* not_found = "HTTP/1.1 404 Not Found\r\nConnection: close\r\nContent-Length: 0\r\n\r\n";
+      static long not_found_len = 0;
+      if (!not_found_len) {
+        not_found_len = strlen(not_found);
+      }
+      nyara_send_data(p->fd, not_found, not_found_len);
       nyara_detach_fd(p->fd);
       p->fd = 0;
       return;
     }
   }
 
-  // resume action
-  VALUE state = rb_fiber_resume(p->fiber, 0, NULL);
-  if (state == Qnil) { // _fiber_func always returns Qnil
-    // terminated (todo log raised error ?)
-    nyara_request_term_close(request);
-  } else if (state == sym_term_close) {
-    nyara_request_term_close(request);
-  } else if (state == sym_writing) {
-    // do nothing
-  } else if (state == sym_reading) {
-    // do nothing
-  } else if (state == sym_sleep) {
-    // do nothing
-  }
+  _resume_action(p);
 }
 
 // platform independent, invoked by LOOP_E()
@@ -145,6 +156,45 @@ static void loop_body(int fd, int etype) {
   }
 }
 
+static void loop_check() {
+  // execute other thread / interrupts
+  rb_thread_schedule();
+
+  // wakeup actions which finished sleeping
+  long len = RARRAY_LEN(to_resume_actions);
+  if (len) {
+    VALUE* ptr = RARRAY_PTR(to_resume_actions);
+    for (long i = 0; i < len; i++) {
+      VALUE request = ptr[i];
+      Request* p;
+      Data_Get_Struct(request, Request, p);
+
+      p->sleeping = false;
+      if (!rb_fiber_alive_p(p->fiber)) {
+        continue;
+      }
+
+      _resume_action(p);
+      if (qfd) {
+        VALUE* v_fds = RARRAY_PTR(p->watched_fds);
+        long v_fds_len = RARRAY_LEN(p->watched_fds);
+        for (long i = 0; i < v_fds_len; i++) {
+          ADD_E(FIX2INT(v_fds[i]), ETYPE_CONNECT);
+        }
+        ADD_E(p->fd, ETYPE_HANDLE_REQUEST);
+      } else {
+        // we are in a test, no queue
+      }
+    }
+  }
+
+  if (graceful_quit) {
+    if (RTEST(rb_funcall(fd_request_map, rb_intern("empty?"), 0))) {
+      _Exit(0);
+    }
+  }
+}
+
 void nyara_detach_fd(int fd) {
   VALUE request = rb_hash_delete(fd_request_map, INT2FIX(fd));
   if (request != Qnil) {
@@ -164,8 +214,9 @@ static VALUE ext_init_queue(VALUE _) {
   return Qnil;
 }
 
-static VALUE ext_run_queue(VALUE _, VALUE v_fd) {
-  int fd = FIX2INT(v_fd);
+// run queue loop with server_fd
+static VALUE ext_run_queue(VALUE _, VALUE v_server_fd) {
+  int fd = FIX2INT(v_server_fd);
   nyara_set_nonblock(fd);
   ADD_E(fd, ETYPE_CAN_ACCEPT);
 
@@ -173,6 +224,15 @@ static VALUE ext_run_queue(VALUE _, VALUE v_fd) {
   return Qnil;
 }
 
+// set graceful quit flag and do not accept server_fd anymore
+static VALUE ext_graceful_quit(VALUE _, VALUE v_server_fd) {
+  graceful_quit = true;
+  int fd = FIX2INT(v_server_fd);
+  DEL_E(fd);
+  return Qnil;
+}
+
+// put request into sleep
 static VALUE ext_request_sleep(VALUE _, VALUE request) {
   Request* p;
   Data_Get_Struct(request, Request, p);
@@ -192,23 +252,10 @@ static VALUE ext_request_sleep(VALUE _, VALUE request) {
   return Qnil;
 }
 
+// NOTE this will be executed in another thread, resuming fiber in a non-main thread will stuck
 static VALUE ext_request_wakeup(VALUE _, VALUE request) {
   // NOTE should not use curr_request
-  Request* p;
-  Data_Get_Struct(request, Request, p);
-
-  p->sleeping = false;
-  if (!qfd) {
-    // we are in a test
-    return Qnil;
-  }
-
-  VALUE* v_fds = RARRAY_PTR(p->watched_fds);
-  long v_fds_len = RARRAY_LEN(p->watched_fds);
-  for (long i = 0; i < v_fds_len; i++) {
-    ADD_E(FIX2INT(v_fds[i]), ETYPE_CONNECT);
-  }
-  ADD_E(p->fd, ETYPE_HANDLE_REQUEST);
+  rb_ary_push(to_resume_actions, request);
   return Qnil;
 }
 
@@ -330,8 +377,12 @@ void Init_event(VALUE ext) {
   sym_reading = ID2SYM(rb_intern("reading"));
   sym_sleep = ID2SYM(rb_intern("sleep"));
 
+  to_resume_actions = rb_ary_new();
+  rb_gc_register_mark_object(to_resume_actions);
+
   rb_define_singleton_method(ext, "init_queue", ext_init_queue, 0);
   rb_define_singleton_method(ext, "run_queue", ext_run_queue, 1);
+  rb_define_singleton_method(ext, "graceful_quit", ext_graceful_quit, 1);
 
   rb_define_singleton_method(ext, "request_sleep", ext_request_sleep, 1);
   rb_define_singleton_method(ext, "request_wakeup", ext_request_wakeup, 1);

data/ext/hashes.c

@@ -112,8 +112,13 @@ static VALUE header_hash_reverse_merge_bang(VALUE self, VALUE other) {
 }
 
 static int header_hash_serialize_func(VALUE k, VALUE v, VALUE arr) {
-  long klen = RSTRING_LEN(k);
   long vlen = RSTRING_LEN(v);
+  // deleted field
+  if (vlen == 0) {
+    return ST_CONTINUE;
+  }
+
+  long klen = RSTRING_LEN(k);
   long capa = klen + vlen + 4;
   volatile VALUE s = rb_str_buf_new(capa);
   sprintf(RSTRING_PTR(s), "%.*s: %.*s\r\n", (int)klen, RSTRING_PTR(k), (int)vlen, RSTRING_PTR(v));

data/ext/inc/epoll.h

@@ -57,7 +57,6 @@ static void LOOP_E() {
         break;
       }
     }
-    // execute other thread / interrupts
-    rb_thread_schedule();
+    loop_check();
   }
 }

data/ext/inc/kqueue.h

@@ -72,7 +72,6 @@ static void LOOP_E() {
         break;
       }
     }
-    // execute other thread / interrupts
-    rb_thread_schedule();
+    loop_check();
   }
 }

data/ext/nyara.h

@@ -24,6 +24,7 @@ void Init_request(VALUE nyara, VALUE ext);
 VALUE nyara_request_new(int fd);
 void nyara_request_init_env(VALUE request);
 void nyara_request_term_close(VALUE request);
+bool nyara_send_data(int fd, const char* s, long len);
 
 
 /* test_response.c */
@@ -34,6 +35,7 @@ void Init_test_response(VALUE nyara);
 void Init_url_encoded(VALUE ext);
 long nyara_parse_path(VALUE path, const char*s, long len);
 void nyara_parse_param(VALUE output, const char* s, long len);
+VALUE ext_parse_cookie(VALUE self, VALUE output, VALUE str);
 
 
 /* accept.c */

data/ext/request.c

@@ -106,20 +106,25 @@ VALUE nyara_request_new(int fd) {
 }
 
 void nyara_request_init_env(VALUE self) {
-  static VALUE cookie_mod = Qnil;
   static VALUE session_mod = Qnil;
   static VALUE flash_class = Qnil;
+  static VALUE str_cookie = Qnil;
   static ID id_decode = 0;
-  if (cookie_mod == Qnil) {
+  if (session_mod == Qnil) {
     VALUE nyara = rb_const_get(rb_cModule, rb_intern("Nyara"));
-    cookie_mod = rb_const_get(nyara, rb_intern("Cookie"));
     session_mod = rb_const_get(nyara, rb_intern("Session"));
     flash_class = rb_const_get(nyara, rb_intern("Flash"));
+    str_cookie = rb_enc_str_new("Cookie", strlen("Cookie"), u8_encoding);
+    rb_gc_register_mark_object(str_cookie);
     id_decode = rb_intern("decode");
   }
 
   P;
-  p->cookie = rb_funcall(cookie_mod, id_decode, 1, p->header);
+  p->cookie = rb_class_new_instance(0, NULL, nyara_param_hash_class);
+  VALUE cookie = rb_hash_aref(p->header, str_cookie);
+  if (cookie != Qnil) {
+    ext_parse_cookie(Qnil, p->cookie, cookie);
+  }
   p->session = rb_funcall(session_mod, id_decode, 1, p->cookie);
   p->flash = rb_class_new_instance(1, &p->session, flash_class);
 }
@@ -232,7 +237,7 @@ static VALUE ext_request_set_status(VALUE _, VALUE self, VALUE n) {
 }
 
 // return true if success
-static bool _send_data(int fd, const char* buf, long len) {
+bool nyara_send_data(int fd, const char* buf, long len) {
   while(len) {
     long written = write(fd, buf, len);
     if (written <= 0) {
@@ -256,7 +261,7 @@ static VALUE ext_request_send_data(VALUE _, VALUE self, VALUE data) {
   P;
   char* buf = RSTRING_PTR(data);
   long len = RSTRING_LEN(data);
-  _send_data(p->fd, buf, len);
+  nyara_send_data(p->fd, buf, len);
   return Qnil;
 }
 
@@ -273,9 +278,9 @@ static VALUE ext_request_send_chunk(VALUE _, VALUE self, VALUE str) {
     rb_raise(rb_eRuntimeError, "fail to format chunk length for len: %ld", len);
   }
   bool success = \
-    _send_data(p->fd, pre_buf, pre_len) &&
-    _send_data(p->fd, RSTRING_PTR(str), len) &&
-    _send_data(p->fd, "\r\n", 2);
+    nyara_send_data(p->fd, pre_buf, pre_len) &&
+    nyara_send_data(p->fd, RSTRING_PTR(str), len) &&
+    nyara_send_data(p->fd, "\r\n", 2);
 
   if (!success) {
     rb_sys_fail("write(2)");

data/ext/test_response.c

@@ -56,11 +56,7 @@ static int on_headers_complete(http_parser* parser) {
 
 static int on_body(http_parser* parser, const char* s, size_t len) {
   Response* p = (Response*)parser;
-  if (p->body == Qnil) {
-    p->body = rb_enc_str_new(s, len, u8_encoding);
-  } else {
-    rb_str_cat(p->body, s, len);
-  }
+  rb_str_cat(p->body, s, len);
   return 0;
 }
 
@@ -111,6 +107,7 @@ static VALUE response_initialize(VALUE self, VALUE data) {
   Data_Get_Struct(self, Response, p);
   p->header = rb_class_new_instance(0, NULL, nyara_header_hash_class);
   p->set_cookies = rb_ary_new();
+  p->body = rb_enc_str_new("", 0, u8_encoding);
   http_parser_execute(&(p->hparser), &response_parse_settings, RSTRING_PTR(data), RSTRING_LEN(data));
   return self;
 }

data/ext/url_encoded.c

@@ -1,6 +1,7 @@
 /* url-encoded parsing */
 
 #include "nyara.h"
+#include <ctype.h>
 
 static char _half_octet(char c) {
   // there's a faster way but not validating the range:
@@ -319,7 +320,7 @@ static VALUE _cookie_seg_str_new(const char* s, long len) {
   return rb_enc_str_new(s, len, u8_encoding);
 }
 
-static VALUE ext_parse_cookie(VALUE self, VALUE output, VALUE str) {
+VALUE ext_parse_cookie(VALUE self, VALUE output, VALUE str) {
   volatile VALUE arr = rb_ary_new();
   const char* s = RSTRING_PTR(str);
   long len = RSTRING_LEN(str);
@@ -350,9 +351,62 @@ static VALUE ext_parse_cookie(VALUE self, VALUE output, VALUE str) {
   return output;
 }
 
+static bool _should_escape(char c) {
+  return !isalnum(c) && c != '_' && c != '.' && c != '-';
+}
+
+// prereq: n always < 16
+static char _hex_char(unsigned char n) {
+  if (n < 10) {
+    return '0' + n;
+  } else {
+    return 'A' + (n - 10);
+  }
+}
+
+static void _concat_char(VALUE s, char c, bool ispath) {
+  static char buf[3] = {'%', 0, 0};
+  static char plus[1] = {'+'};
+
+  if (ispath) {
+    if (_should_escape(c) && c != '+' && c != '/') {
+      buf[1] = _hex_char((unsigned char)c / 16);
+      buf[2] = _hex_char((unsigned char)c % 16);
+      rb_str_cat(s, buf, 3);
+    } else {
+      rb_str_cat(s, &c, 1);
+    }
+  } else {
+    if (c == ' ') {
+      rb_str_cat(s, plus, 1);
+    } else if (_should_escape(c)) {
+      buf[1] = _hex_char((unsigned char)c / 16);
+      buf[2] = _hex_char((unsigned char)c % 16);
+      rb_str_cat(s, buf, 3);
+    } else {
+      rb_str_cat(s, &c, 1);
+    }
+  }
+}
+
+// escape for uri path ('/', '+' are not changed) or component ('/', '+' are changed)
+static VALUE ext_escape(VALUE _, VALUE s, VALUE v_ispath) {
+  Check_Type(s, T_STRING);
+  long len = RSTRING_LEN(s);
+  const char* ptr = RSTRING_PTR(s);
+  volatile VALUE res = rb_str_buf_new(len);
+  bool ispath = RTEST(v_ispath);
+  for (long i = 0; i < len; i++) {
+    _concat_char(res, ptr[i], ispath);
+  }
+  rb_enc_associate(res, u8_encoding);
+  return res;
+}
+
 void Init_url_encoded(VALUE ext) {
   rb_define_singleton_method(ext, "parse_param", ext_parse_param, 2);
   rb_define_singleton_method(ext, "parse_cookie", ext_parse_cookie, 2);
+  rb_define_singleton_method(ext, "escape", ext_escape, 2);
   // for test
   rb_define_singleton_method(ext, "parse_url_encoded_seg", ext_parse_url_encoded_seg, 3);
   rb_define_singleton_method(ext, "parse_path", ext_parse_path, 2);

data/lib/nyara/config.rb

@@ -1,32 +1,83 @@
 module Nyara
-  # other options:
-  # - session (see also Session)
-  # - host
-  # - views
-  # - public
+  # options:
+  #
+  # [env]         environment, default is +'development'+
+  # [port]        listen port number
+  # [workers]     number of workers
+  # [host]        host name used in `url_to` helper
+  # [root]        root path, default is +Dir.pwd+
+  # [views]       views (templates) directory, relative to root, default is +"views"+
+  # [public]      static files directory, relative to root, default is +"public"+
+  # [x_send_file] header field name for X-Sendfile or X-Accel-Redirect, see Nyara::Controller#send_file for details
+  # [session]     see Nyara::Session for sub options
+  # [prefer_erb]  use ERB instead of ERubis for +.erb+ templates
   Config = ConfigHash.new
   class << Config
+    # clear all settings
     def reset
       clear
       Route.clear
     end
 
-    def map prefix, controller
-      Route.register_controller prefix, controller
-    end
+    # init and check configures
+    def init
+      self['env'] ||= 'development'
 
-    def port n
-      n = n.to_i
+      n = (self['port'] || 3000).to_i
       assert n >= 0 && n <= 65535
-      Config['port'] = n
-    end
+      self['port'] = n
 
-    def workers n
-      n = n.to_i
+      n = (self['workers'] || self['worker'] || ((CpuCounter.count + 1)/ 2)).to_i
       assert n > 0 && n < 1000
-      Config['workers'] = n
+      self['workers'] = n
+
+      unless self['root']
+        set :root, Dir.pwd
+      end
+      self['root'] = File.expand_path self['root']
+
+      self['views'] = project_path(self['views'] || 'views')
+      self['public'] = project_path(self['public'] || 'public')
+
+      if self['public']
+        map '/', PublicController
+      end
+    end
+
+    # get absoute path under project path <br>
+    # if +strict+, return nil if path is not under the dir
+    def project_path path, strict=true
+      path_under 'root', path, strict
+    end
+
+    # get absoute path under public path <br>
+    # if +strict+, return nil if path is not under the dir
+    def public_path path, strict=true
+      path_under 'public', path, strict
+    end
+
+    # get absoute path under views path <br>
+    # if +strict+, return nil if path is not under the dir
+    def views_path path, strict=true
+      path_under 'views', path, strict
+    end
+
+    # get path under the dir configured +Nyara.config[key]+ <br>
+    # if +strict+, return nil if path is not under the dir
+    def path_under key, path, strict=true
+      dir = self[key]
+      path = File.expand_path File.join(dir, path)
+      if !strict or path.start_with?(dir)
+        path
+      end
+    end
+
+    # pass requests under a prefix to a controller
+    def map prefix, controller
+      Route.register_controller prefix, controller
     end
 
+    # get environment
     def env
       self['env'].to_s
     end
@@ -47,8 +98,8 @@ module Nyara
     alias set []=
     alias get []
 
-    def assert expr
-      raise ArgumentError unless expr
+    def assert expr # :nodoc:
+      raise ArgumentError, "expect #{expr.inspect} to be true", caller[1..-1] unless expr
     end
 
     # todo env aware configure

data/lib/nyara/controller.rb

@@ -93,13 +93,13 @@ module Nyara
       # +++
 
       # Set default layout
-      def layout l
+      def set_default_layout l
         @default_layout = l
       end
       attr_reader :default_layout
 
       # Set controller name, so you can use a shorter name to reference the controller in path helper
-      def set_name n
+      def set_controller_name n
         @controller_name = n
       end
       attr_reader :controller_name
@@ -204,6 +204,7 @@ module Nyara
       Ext.request_send_data r, HTTP_STATUS_FIRST_LINES[r.status]
       data = header.serialize
       data.concat r.response_header_extra_lines
+      data << Session.encode_set_cookie(r.session, r.ssl?)
       data << "\r\n"
       Ext.request_send_data r, data.join
 
@@ -338,8 +339,8 @@ module Nyara
 
       # forbid further modification
       header.freeze
-      session.freeze
-      flash.next.freeze
+      r.session.freeze
+      r.flash.next.freeze
     end
 
     # Send raw data, that is, not wrapped in chunked encoding<br>
@@ -359,20 +360,77 @@ module Nyara
     end
     alias send_string send_chunk
 
-    # Send file
-    def send_file file
-      if behind_proxy? # todo
-        header['X-Sendfile'] = file # todo escape name?
-        # todo content type and disposition
-        header['Content-Type'] = determine_ct_by_file_name
+    # Set aproppriate headers and send the file<br>
+    # :call-seq:
+    #
+    #   send_file '/home/www/no-virus-inside.exe', disposition: 'attachment'
+    #
+    # options are:
+    #
+    # [disposition]  'inline' by default, if set to 'attachment', the file is presented as a download item in browser.
+    # [x_send_file]  if not false/nil, it is considered to be behind a web server.
+    #                Then the app sends file with only header configures,
+    #                which proxies the actual action to the web server,
+    #                which can take the advantage of system calls and reduce transfered data,
+    #                thus faster.
+    # [filename]     name for the downloaded file, will use basename of +file+ if not set.
+    # [content_type] defaults to the MIME type matching +file+ or +filename+.
+    #
+    # To configure for lighttpd and apache2 mod_xsendfile (https://tn123.org/mod_xsendfile/):
+    #
+    #   configure do
+    #     set :x_send_file, 'X-Sendfile'
+    #   end
+    #
+    # To configure for nginx (http://wiki.nginx.org/XSendfile):
+    #
+    #   configure do
+    #     set :x_send_file, 'X-Accel-Redirect'
+    #   end
+    #
+    # To disable x_send_file while configured:
+    #
+    #   send_file '/some/file', x_send_file: false
+    #
+    # To enable x_send_file while not configured:
+    #
+    #   send_file '/some/file', x_send_file: 'X-Sendfile'
+    #
+    def send_file file, disposition: 'inline', x_send_file: Config['x_send_file'], filename: nil, content_type: nil
+      header = request.response_header
+
+      unless header['Content-Type']
+        unless content_type
+          extname = File.extname(file)
+          extname = File.extname(filename) if extname.blank? and filename
+          content_type = MIME_TYPES[extname] || 'application/octet-stream'
+        end
+        header['Content-Type'] = content_type
+      end
+
+      disposition = disposition.to_s
+      if disposition != 'inline'
+        if disposition != 'attachment'
+          raise ArgumentError, "disposition should be inline or attachment, but got #{disposition.inspect}"
+        end
+      end
+
+      filename ||= File.basename file
+      header['Content-Disposition'] = "#{disposition}; filename=#{Ext.escape filename, true}"
+
+      header['Transfer-Encoding'] = '' # delete it
+
+      if x_send_file
+        header[x_send_file] = file # todo escape name?
         send_header unless request.response_header.frozen?
       else
+        # todo nonblock read file?
         data = File.binread file
-        header['Content-Type'] = determine_ct_by_file_name
+        header['Content-Length'] = data.bytesize
         send_header unless request.response_header.frozen?
         send_data data
       end
-      Fiber.yield :term_close # is it right? content type changed
+      Fiber.yield :term_close
     end
 
     # Resume action after +seconds+
@@ -382,10 +440,10 @@ module Nyara
 
       # NOTE request_wake requires request as param, so this method can not be generalized to Fiber.sleep
 
-      Ext.request_sleep self # place sleep actions before wake
+      Ext.request_sleep request # place sleep actions before wake
       Thread.new do
-        sleep seconds
-        Ext.request_wakeup self
+        Kernel.sleep seconds
+        Ext.request_wakeup request
       end
       Fiber.yield :sleep # see event.c for the handler
     end
@@ -400,6 +458,9 @@ module Nyara
     #   # with template source, set content type to +text/html+ if not given
     #   render erb: "<%= 1 + 1 %>"
     #
+    #   # layout can be string or array
+    #   render 'index', ['inner_layout', 'outer_layout']
+    #
     # For steam rendering, see #stream
     def render view_path=nil, layout: self.class.default_layout, locals: nil, **opts
       view = View.new self, view_path, layout, locals, opts