nyara 0.0.1.pre.2 → 0.0.1.pre.3

data/ext/url_encoded.c

@@ -1,4 +1,5 @@
-// parse path / query / url-encoded body
+/* url-encoded parsing */
+
 #include "nyara.h"
 #include <ruby/encoding.h>
 
@@ -18,13 +19,13 @@ static char _half_octet(char c) {
   }
 }
 
-static long _decode_url_seg(VALUE path, const char*s, long len, char stop_char) {
+static long _decode_url_seg(VALUE output, const char*s, long len, char stop_char) {
   const char* last_s = s;
   long last_len = 0;
 
 # define FLUSH_UNESCAPED\
   if (last_len) {\
-    rb_str_cat(path, last_s, last_len);\
+    rb_str_cat(output, last_s, last_len);\
     last_s += last_len;\
     last_len = 0;\
   }
@@ -50,7 +51,7 @@ static long _decode_url_seg(VALUE path, const char*s, long len, char stop_char)
       unsigned char r = ((unsigned char)r1 << 4) | (unsigned char)r2;
       FLUSH_UNESCAPED;
       last_s += 3;
-      rb_str_cat(path, (char*)&r, 1);
+      rb_str_cat(output, (char*)&r, 1);
 
     } else if (s[i] == stop_char) {
       i++;
@@ -58,7 +59,7 @@ static long _decode_url_seg(VALUE path, const char*s, long len, char stop_char)
 
     } else if (s[i] == '+') {
       FLUSH_UNESCAPED;
-      rb_str_cat(path, " ", 1);
+      rb_str_cat(output, " ", 1);
 
     } else {
       last_len++;
@@ -70,9 +71,68 @@ static long _decode_url_seg(VALUE path, const char*s, long len, char stop_char)
   return i;
 }
 
+// s should contain no space
 // return parsed len, s + return == start of query
+// NOTE it's similar to _decode_url_seg, but:
+// - "+" is not escaped
+// - matrix uri params (segments starting with ";") are ignored
 long nyara_parse_path(VALUE output, const char* s, long len) {
-  return _decode_url_seg(output, s, len, '?');
+  const char* last_s = s;
+  long last_len = 0;
+
+# define FLUSH_UNESCAPED\
+  if (last_len) {\
+    rb_str_cat(output, last_s, last_len);\
+    last_s += last_len;\
+    last_len = 0;\
+  }
+
+  long i;
+  for (i = 0; i < len; i++) {
+    if (s[i] == '%') {
+      if (i + 2 >= len) {
+        last_len++;
+        continue;
+      }
+      char r1 = _half_octet(s[i + 1]);
+      if (r1 < 0) {
+        last_len++;
+        continue;
+      }
+      char r2 = _half_octet(s[i + 2]);
+      if (r2 < 0) {
+        last_len++;
+        continue;
+      }
+      i += 2;
+      unsigned char r = ((unsigned char)r1 << 4) | (unsigned char)r2;
+      FLUSH_UNESCAPED;
+      last_s += 3;
+      rb_str_cat(output, (char*)&r, 1);
+
+    } else if (s[i] == ';') {
+      // skip matrix uri params
+      i++;
+      for (; i < len; i++) {
+        if (s[i] == '?') {
+          i++;
+          break;
+        }
+      }
+      break;
+
+    } else if (s[i] == '?') {
+      i++;
+      break;
+
+    } else {
+      last_len++;
+    }
+  }
+  FLUSH_UNESCAPED;
+# undef FLUSH_UNESCAPED
+
+  return i;
 }
 
 static VALUE ext_parse_path(VALUE self, VALUE output, VALUE input) {

data/hello.rb

@@ -1,8 +1,14 @@
-# require_relative "lib/nyara"
+require_relative "lib/nyara"
+require "open-uri"
+require "pry"
 
-require 'nyara'
+configure do
+  # set :env, 'production'
+  # set :workers, 2
+end
 
 get '/' do
+  open 'http://baidu.com', &:read
   send_string 'hello world'
 end
 

data/lib/nyara/controller.rb

@@ -183,7 +183,7 @@ module Nyara
     def add_header_line h
       raise 'can not modify sent header' if request.response_header.frozen?
       h = h.sub /(?<![\r\n])\z/, "\r\n"
-      request.response_header_extra_lines << s
+      request.response_header_extra_lines << h
     end
 
     # todo args helper
@@ -198,15 +198,34 @@ module Nyara
     end
     alias cookies cookie
 
-    def set_cookie k, v=nil, opts
+    # Set cookie, if expires is +Time.now+, will remove the cookie entry
+    #
+    # :call-seq:
+    #
+    #   set_cookie 'JSESSIONID', 'not-exist'
+    #   set_cookie 'key-without-value'
+    #
+    # +opt: default_value+ are:
+    #
+    #   expires: nil
+    #   max_age: nil
+    #   domain: nil
+    #   path: nil
+    #   secure: nil
+    #   httponly: true
+    #
+    def set_cookie name, value=nil, opts={}
+      if value.is_a?(Hash)
+        raise ArgumentError, 'hash not allowed in cookie value, did you mean to use it as options?'
+      end
       # todo default domain ?
       opts = Hash[opts.map{|k,v| [k.to_sym,v]}]
-      Cookie.output_set_cookie response.response_header_extra_lines, k, v, opts
+      Cookie.add_set_cookie request.response_header_extra_lines, name, value, opts
     end
 
-    def delete_cookie k
+    def delete_cookie name
       # todo domain ? path ?
-      set_cookie k, expires: Time.now, max_age: 0
+      set_cookie name, nil, expires: Time.now, max_age: 0
     end
 
     def clear_cookie
@@ -238,7 +257,7 @@ module Nyara
       r = request
       header = r.response_header
 
-      Ext.send_data r, HTTP_STATUS_FIRST_LINES[r.status]
+      Ext.request_send_data r, HTTP_STATUS_FIRST_LINES[r.status]
 
       header.aset_content_type \
         r.response_content_type ||
@@ -254,7 +273,7 @@ module Nyara
       end
       data.concat r.response_header_extra_lines
       data << "\r\n"
-      Ext.send_data r, data.join
+      Ext.request_send_data r, data.join
 
       # forbid further modification
       header.freeze
@@ -263,17 +282,17 @@ module Nyara
     # Send raw data, that is, not wrapped in chunked encoding<br>
     # NOTE: often you should call send_header before doing this.
     def send_data data
-      Ext.send_data request, data.to_s
+      Ext.request_send_data request, data.to_s
     end
 
     # Send a data chunk, it can send_header first if header is not sent.
-    # 
+    #
     # :call-seq:
     #
     #   send_chunk 'hello world!'
     def send_chunk data
       send_header unless request.response_header.frozen?
-      Ext.send_chunk request, data.to_s
+      Ext.request_send_chunk request, data.to_s
     end
     alias send_string send_chunk
 

data/lib/nyara/cookie.rb

@@ -11,8 +11,8 @@ module Nyara
       res
     end
 
-    def add_set_cookie r, k, v, expires: nil, max_age: nil, domain: nil, path: nil, secure: nil, httponly: true
-      r << "Set-Cookie: "
+    def add_set_cookie header_lines, k, v, expires: nil, max_age: nil, domain: nil, path: nil, secure: nil, httponly: true
+      r = "Set-Cookie: "
       if v.nil? or v == true
         r << "#{CGI.escape k.to_s}; "
       else
@@ -26,6 +26,7 @@ module Nyara
       r << "Secure; " if secure
       r << "HttpOnly; " if httponly
       r << "\r\n"
+      header_lines << r
     end
   end
 end

data/lib/nyara/nyara.rb

@@ -8,9 +8,9 @@ require "socket"
 require "tilt"
 
 require_relative "../../ext/nyara"
-require_relative "param_hash"
-require_relative "header_hash"
-require_relative "config_hash"
+require_relative "hashes/param_hash"
+require_relative "hashes/header_hash"
+require_relative "hashes/config_hash"
 require_relative "mime_types"
 require_relative "controller"
 require_relative "request"
@@ -43,40 +43,54 @@ module Nyara
 
     def start_server
       port = Config[:port] || 3000
-      workers = Config[:workers] || (CpuCounter.count - 1)
 
       puts "starting #{Config[:env]} server at 0.0.0.0:#{port}"
       case Config[:env].to_s
-
       when 'production'
-        server = TCPServer.new '0.0.0.0', port
-        server.listen 1000
-        trap :INT do
-          @workers.each do |w|
-            Process.kill :KILL, w
-          end
-        end
-        GC.start
-        @workers = workers.times.map do
-          fork {
-            Ext.init_queue
-            Ext.run_queue server.fileno
-          }
-        end
-        Process.waitall
-
+        patch_tcp_socket
+        start_production_server port
       when 'test'
         # don't
-
       else
-        t = Thread.new do
-          server = TCPServer.new '0.0.0.0', port
-          server.listen 1000
+        patch_tcp_socket
+        start_development_server port
+      end
+    end
+
+    def patch_tcp_socket
+      puts "patching TCPSocket"
+      require_relative "patch_tcp_socket"
+    end
+
+    def start_production_server port
+      workers = Config[:workers] || ((CpuCounter.count + 1)/ 2)
+
+      puts "workers: #{workers}"
+      server = TCPServer.new '0.0.0.0', port
+      server.listen 1000
+      trap :INT do
+        @workers.each do |w|
+          Process.kill :KILL, w
+        end
+      end
+      GC.start
+      @workers = workers.times.map do
+        fork {
           Ext.init_queue
           Ext.run_queue server.fileno
-        end
-        t.join
+        }
+      end
+      Process.waitall
+    end
+
+    def start_development_server port
+      t = Thread.new do
+        server = TCPServer.new '0.0.0.0', port
+        server.listen 1000
+        Ext.init_queue
+        Ext.run_queue server.fileno
       end
+      t.join
     end
   end
 end

data/lib/nyara/patch_tcp_socket.rb

@@ -0,0 +1,22 @@
+# patch TCPSocket to make operations synchrony
+class TCPSocket
+  alias _orig_initialize initialize
+
+  def initialize *xs
+    _orig_initialize *xs
+    Nyara::Ext.set_nonblock fileno
+    Nyara::Ext.fd_watch fileno
+  end
+
+  def send data, flags, dest_addr=nil, &blk
+    if dest_addr
+      super
+    else
+      Nyara::Ext.fd_send fileno, data, flags, &blk
+    end
+  end
+
+  def recv max_len, flags=0
+    Nyara::Ext.fd_recv fileno, max_len, flags
+  end
+end

data/lib/nyara/request.rb

@@ -133,9 +133,7 @@ module Nyara
 
     # todo rename and move it into Ext
     def not_found
-      puts "not found"
-      Ext.send_data self, "HTTP/1.1 404 Not Found\r\nConnection: close\r\nContent-Length: 0\r\n\r\n"
-      Ext.close self
+      Ext.request_send_data self, "HTTP/1.1 404 Not Found\r\nConnection: close\r\nContent-Length: 0\r\n\r\n"
     end
   end
 end

data/lib/nyara/view.rb

@@ -128,6 +128,7 @@ module Nyara
         ENGINE_DEFAULT_CONTENT_TYPES[ext] = default_content_type
       end
 
+      # local keys are for first-time code generation, values not used
       # returns +[meth, ext_without_dot]+
       def template path, locals={}
         if File.extname(path).empty?

data/nyara.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "nyara"
-  s.version = "0.0.1.pre.2"
+  s.version = "0.0.1.pre.3"
   s.author = "Zete Lui"
   s.email = "nobody@example.com"
   s.homepage = "https://github.com/luikore/nyara"

data/rakefile

@@ -58,43 +58,6 @@ task :build => makefile do
   end
 end
 
-def term_color n
-  print "\e[38;5;#{n}m"
-end
-
-def reset_color
-  print "\e[00m"
-end
-
-desc "check arity of rb_define_method/rb_define_singleton_method"
-task :check_arity do
-  Dir.glob 'ext/*.{c,cc}' do |f|
-    puts "validatign #{f}"
-    arities = {}
-    data = File.read f
-    data.scan /^(?:static )?VALUE (\w+)\((.+)\)/ do |func, params|
-      arities[func] = params.count(',')
-      puts "  scan: #{func}/#{arities[func]}"
-    end
-    data.scan /rb_define(?:_singleton)?_method\(.*?(\w+)\s*\,\s*(\d+)\)/ do |func, arity|
-      print "  check: #{func}/#{arity} "
-      if arities[func].nil?
-        term_color 5
-        print "UNSCANNED"
-        reset_color
-        puts
-      elsif arities[func] != arity.to_i
-        term_color 9
-        print "MISMATCH #{arities[func]}"
-        reset_color
-        puts
-      else
-        puts "OK"
-      end
-    end
-  end
-end
-
 desc "test"
 task :test => :build do
   sh 'rspec', '-c'
@@ -118,6 +81,7 @@ task :clean do
   sh 'rm', '-f', '*.gem'
   Dir.chdir 'ext' do
     sh 'make', 'clean'
+    sh 'rm', '-f', 'Makefile'
   end
 end
 
@@ -125,15 +89,72 @@ end
 
 desc "collect line stat"
 task :lines do
-  c = 0
-  Dir.glob('{**/*.rb,ext/*.{c,cc,h}}') do |f|
-    c += (File.read(f).count "\n")
+  rb_c = 0
+  Dir.glob('**/*.rb') do |f|
+    rb_c += (File.read(f).count "\n")
+  end
+
+  c_c = 0
+  Dir.glob('ext/*.{c,cc,h}') do |f|
+    c_c += (File.read(f).count "\n")
+  end
+
+  spec_c = 0
+  Dir.glob('spec/**/*.rb') do |f|
+    spec_c += (File.read(f).count "\n")
   end
-  puts "#{c} lines"
+
+  puts "c: #{c_c} lines"
+  puts "rb: #{rb_c - spec_c} lines"
+  puts "spec: #{spec_c} lines"
 end
 
 desc "list Nyara::Ext methods"
 task :list_ext do
   require_relative "lib/nyara/nyara"
-  puts Nyara::Ext.methods - Module.methods
+  methods = (Nyara::Ext.methods - Module.methods).sort
+  [/queue/, /route/, /parse/, /request/].each do |r|
+    group = methods.grep r
+    puts group
+    puts
+    methods -= group
+  end
+  puts methods
+end
+
+def term_color n
+  print "\e[38;5;#{n}m"
+end
+
+def reset_color
+  print "\e[00m"
+end
+
+desc "audit arity of rb_define_method/rb_define_singleton_method"
+task :audit_arity do
+  Dir.glob 'ext/*.{c,cc}' do |f|
+    puts "validatign #{f}"
+    arities = {}
+    data = File.read f
+    data.scan /^(?:static )?VALUE (\w+)\((.+)\)/ do |func, params|
+      arities[func] = params.count(',')
+      puts "  scan: #{func}/#{arities[func]}"
+    end
+    data.scan /rb_define(?:_singleton)?_method\(.*?(\w+)\s*\,\s*(\d+)\)/ do |func, arity|
+      print "  check: #{func}/#{arity} "
+      if arities[func].nil?
+        term_color 5
+        print "UNSCANNED"
+        reset_color
+        puts
+      elsif arities[func] != arity.to_i
+        term_color 9
+        print "MISMATCH #{arities[func]}"
+        reset_color
+        puts
+      else
+        puts "OK"
+      end
+    end
+  end
 end

data/readme.md

@@ -8,7 +8,7 @@ Not Yet Another Ruby Async web framework and server. Not on rack nor rack-compat
 
 # Getting started
 
-Requires Ruby 2.0+, BSD/Linux/Mac OS X.
+Requires Ruby 2.0+, BSD/Linux/Mac OS X, GCC4.7+ or Clang.
 
 Install
 
@@ -42,6 +42,33 @@ rake gen
 rake gem
 ```
 
+If you have cloned the repo once, and want to update code
+
+```bash
+git pull --recurse-submodules
+git submodule foreach git fetch
+```
+
+# Testing
+
+Simply run the test
+
+```bash
+rspec -c
+```
+
+Test in GC.stress mode
+
+```bash
+rspec -c -f d
+```
+
+With coverage (generates *coverage/index.html*)
+
+```bash
+COVERAGE=1 rspec -c
+```
+
 # Why fast
 
 ### Solid http parsers written in C
@@ -87,10 +114,12 @@ In Nyara, nested templates of Slim, ERB or Haml share the same output buffer, so
 
 # How fast
 
-Performance is feature, there are specs on (TODO):
+Performance is feature, there are specs on:
 
-- Accept-* parse vs rack
-- MIME matching vs rack
+- Accept-* parse vs sinatra
 - param parse vs ruby
 - layout rendering vs tilt
-- evented IO vs eventmachine
+
+# License
+
+BSD, see copying

data/spec/apps/connect.rb

@@ -0,0 +1,14 @@
+# connect remote server, and read / write data
+
+require_relative "../../lib/nyara"
+require "pry"
+require "open-uri"
+
+configure do
+  port 3003
+end
+
+get '/' do
+  data = open "http://baidu.com", &:read
+  send_string data
+end

data/spec/evented_io_spec.rb

@@ -0,0 +1,23 @@
+require_relative "spec_helper"
+
+module Nyara
+  describe 'evented IO' do
+    before :all do
+      pid = Process.pid
+      @server = fork do
+        exec 'ruby', __dir__ + '/apps/connect.rb'
+      end
+      sleep 1 # wait for server startup
+    end
+
+    after :all do
+      Process.kill :KILL, @server
+    end
+
+    it "works" do
+      result1 = open "http://localhost:3003", &:read
+      result2 = open "http://baidu.com", &:read
+      assert_equal result2, result1
+    end
+  end
+end

data/spec/ext_parse_spec.rb

@@ -63,47 +63,66 @@ module Nyara
         @output = ''
       end
 
-      it "parses" do
+      it "converts '%' bytes but not '+'" do
         i = '/%23+%24'
         assert_equal i.bytesize, parse(i)
-        assert_equal "/\x23 \x24", @output
+        assert_equal "/\x23+\x24", @output
       end
 
-      it "truncates ? after %" do
+      it "truncates '?' after %" do
         i = '/hello%f3%?world'
         len = parse i
         assert_equal '/hello%f3%?'.bytesize, len
         assert_equal "/hello\xf3%", @output
       end
 
-      it "truncates ? after begin" do
+      it "truncates '?' after begin" do
         i = '?a'
         len = parse i
         assert_equal 1, len
         assert_equal '', @output
       end
 
-      it "truncates ? before end" do
+      it "truncates '?' before end" do
         i = 'a?'
         len = parse i
         assert_equal 2, len
         assert_equal 'a', @output
       end
 
-      it "truncates ? after unescaped char" do
+      it "truncates '?' after unescaped char" do
         i = 'a?a'
         len = parse i
         assert_equal 2, len
         assert_equal 'a', @output
       end
 
-      it "truncates ? after escaped char" do
+      it "truncates '?' after escaped char" do
         i = '%40?'
         len = parse i
         assert_equal 4, len
         assert_equal "\x40", @output
       end
 
+      it "removes matrix uri params" do
+        i = '/a;matrix;matrix=3'
+        len = parse i
+        assert_equal i.size, len
+        assert_equal "/a", @output
+
+        @output = ''
+        i += '?'
+        len = parse i
+        assert_equal i.size, len
+        assert_equal "/a", @output
+
+        @output = ''
+        i += 'query'
+        len = parse i
+        assert_equal i.size - 'query'.size, len
+        assert_equal '/a', @output
+      end
+
       def parse input
         Ext.parse_path @output, input
       end