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

data/spec/performance/layout_render.rb

@@ -0,0 +1,52 @@
+require_relative "performance_helper"
+require "slim"
+
+configure do
+  set :views, __dir__
+end
+Nyara::View.init
+$page_tilt = Tilt.new __dir__ + '/page.slim'
+$layout_tilt = Tilt.new __dir__ + '/layout.slim'
+
+class MyRenderable
+  def initialize items
+    @title = "layout_render"
+    @items = items
+  end
+  include Nyara::Renderable
+
+  def send_chunk s
+    @res ||= []
+    @res << s
+  end
+
+  def nyara_render
+    view = Nyara::View.new self, 'page.slim', ['layout.slim', 'layout.slim'], {items: @items}, {}
+    Fiber.new{ view.render }.resume
+  end
+
+  def tilt_render
+    Fiber.new{}.resume # XXX simulate the overhead of every request
+    $layout_tilt.render self do
+      $layout_tilt.render self do
+        $page_tilt.render self, items: @items
+      end
+    end
+  end
+end
+
+# prepare data
+Item = Struct.new :name, :price
+items = 10.times.map do |i|
+  Item.new "name#{i}", i
+end
+
+# precompile
+MyRenderable.new(items).nyara_render
+MyRenderable.new(items).tilt_render
+
+GC.disable
+
+nyara = bench(1000){ MyRenderable.new(items).nyara_render }
+tilt = bench(1000){ MyRenderable.new(items).tilt_render }
+dump nyara: nyara, tilt: tilt

data/spec/performance/parse_accept_value.rb

@@ -0,0 +1,13 @@
+require_relative "performance_helper"
+$0 = '' # don't let sinatra boot the server
+require "sinatra"
+
+v = 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'
+env = {'HTTP_ACCEPT' => env}
+
+GC.disable
+
+nyara = bench(1000){ Nyara::Ext.parse_accept_value v }
+sinatra = bench_raw(1000){ Sinatra::Request.new(env.dup).accept }
+sinatra_baseline = bench_raw(1000){ Sinatra::Request.new(env.dup) }
+dump nyara: nyara, sinatra: (sinatra - sinatra_baseline)

data/spec/performance/parse_param.rb

@@ -0,0 +1,18 @@
+require_relative "performance_helper"
+require "cgi"
+
+param = "utm_source=feedburner&utm_medium=feed&utm_campaign=Feed%3A+haishin%2Frss%2Findex+%28#{CGI.escape 'マイコミジャーナル'}%29&utm_content=livedoor"
+
+def ruby_parse param
+  h = {}
+  param.split('&').each do |s|
+    k, v = s.split '='
+    h[CGI.unescape(k)] = CGI.unescape(v)
+  end
+end
+
+GC.disable
+
+nyara = bench(1000){ Nyara::Ext.parse_param({}, param) }
+ruby = bench(1000){ ruby_parse param }
+dump nyara: nyara, ruby: ruby

data/spec/performance/performance_helper.rb

@@ -0,0 +1,25 @@
+require_relative "../../lib/nyara/nyara"
+
+# baseline is the raw loop
+def bench n
+  t = Time.now
+  n.times{ yield }
+  cost = Time.now - t
+
+  t = Time.now
+  n.times{}
+  baseline = Time.now - t
+
+  cost - baseline
+end
+
+# custom baseline
+def bench_raw n
+  t = Time.now
+  n.times{ yield }
+  Time.now - t
+end
+
+def dump data
+  print Marshal.dump data
+end

data/spec/performance_spec.rb

@@ -0,0 +1,33 @@
+require_relative "spec_helper"
+
+# run benchmarks in performance/, each output is a hash dumped with Marshal
+#
+#   { subject: used_time }
+#
+describe 'performance' do
+  def bm name
+    bm = __dir__ + '/performance/' + name + '.rb'
+    assert File.exist?(bm), "file not found: #{bm}"
+    res = IO.popen ['ruby', bm] do |io|
+      data = io.read
+      Marshal.load data
+    end
+    assert_nil $!, "an error stops script #{bm}"
+    res
+  end
+
+  it "[parse_accept_value] faster than sinatra" do
+    res = bm 'parse_accept_value'
+    assert res[:nyara] * 1.8 < res[:sinatra], res.inspect
+  end
+
+  it "[parse_param] faster than parse in pure ruby" do
+    res = bm 'parse_param'
+    assert res[:nyara] * 8 < res[:ruby], res.inspect
+  end
+
+  it "[layout_render] faster than using tilt" do
+    res = bm 'layout_render'
+    assert res[:nyara] * 1.1 < res[:tilt], res.inspect
+  end
+end

data/spec/request_delegate_spec.rb

@@ -6,10 +6,8 @@ module Nyara
     end
 
     before :each do
-      @client, @server = Socket.pair :UNIX, :STREAM
-      Ext.set_nonblock @server.fileno
-      @request = Ext.handle_request @server.fileno
-      Ext.set_request_attrs @request, {
+      @request = Ext.request_new
+      Ext.request_set_attrs @request, {
         method_num: HTTP_METHODS['GET'],
         path: '/search',
         query: ParamHash.new.tap{|h| h['q'] = 'nyara' },
@@ -40,20 +38,47 @@ module Nyara
       assert_equal 'en-US', @c.header['accept']
     end
 
-    it "set response header and send" do
-      pending
-      @c.set_header
-      @c.add_header_line
-      @c.send_header
-      @client
-    end
+    context "Simulate IO" do
+      before :each do
+        @client, @server = Socket.pair :UNIX, :STREAM
+        Ext.set_nonblock @server.fileno
+        Ext.request_set_fd @request, @server.fileno
+      end
 
-    it "set / delete / clear cookie" do
-      pending
-    end
+      def receive_header
+        @c.send_header
+        @server.close_write
+        @client.read
+      end
 
-    it "#session" do
-      pending
+      it "set response header and send" do
+        @c.set_header 'X-Test', true
+        @c.add_header_line "X-Test: also-true\r\n"
+        res = receive_header.lines
+        assert_includes res, "X-Test: true\r\n"
+        assert_includes res, "X-Test: also-true\r\n"
+      end
+
+      it "set cookie" do
+        @c.set_cookie 'set', 'set'
+        cookie = receive_header.lines.grep(/Set-Cookie:/).last
+        assert_includes cookie, "set=set; HttpOnly"
+      end
+
+      it "delete cookie" do
+        @c.delete_cookie 'del'
+        cookie = receive_header.lines.grep(/Set-Cookie:/).last
+        assert_includes cookie, "Expires"
+      end
+
+      it "clear cookie" do
+        @c.clear_cookie
+        pending 'incomplete implementation'
+      end
+
+      it "#session" do
+        pending
+      end
     end
   end
 end

data/spec/request_spec.rb

@@ -3,10 +3,7 @@ require_relative "spec_helper"
 module Nyara
   describe Request do
     before :each do
-      @server, @client = Socket.pair :UNIX, :STREAM, 0
-      Ext.set_nonblock @server.fileno
-      Ext.set_nonblock @client.fileno
-      @request = Ext.handle_request @server.fileno
+      @request = Ext.request_new
       @request_attrs = {
         method_num: HTTP_METHODS['GET'],
         path: '/',
@@ -15,7 +12,7 @@ module Nyara
         scope: '/',
         format: 'html'
       }
-      set_request_attrs
+      request_set_attrs
     end
 
     context "#scheme detect by forwarded.." do
@@ -41,8 +38,8 @@ module Nyara
       assert_equal 3000, @request.port
     end
 
-    def set_request_attrs
-      Ext.set_request_attrs @request, @request_attrs
+    def request_set_attrs
+      Ext.request_set_attrs @request, @request_attrs
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require_relative "../lib/nyara/nyara"
 require 'rspec/core'
 require 'rspec/mocks'
 require 'rspec/autorun'
@@ -7,6 +6,16 @@ require "slim"
 require "erb"
 require "haml"
 require "liquid"
+require "open-uri"
+require 'pp'
+
+if ENV['COVERAGE']
+  require "simplecov"
+  SimpleCov.start do
+    add_group 'lib', 'lib'
+  end
+end
+require_relative "../lib/nyara/nyara"
 
 RSpec.configure do |config|
   config.expect_with :stdlib
@@ -34,7 +43,6 @@ RSpec.configure do |config|
       xs
     end
 
-    require 'pp'
     module Kernel
       def pp obj
         s = CGI.escape_html(PP.pp obj, '')
@@ -42,19 +50,21 @@ RSpec.configure do |config|
         obj
       end
     end
-  end
 
-  config.before :each do
-    GC.stress = true
-  end
+  elsif config.formatters.any?{|f|f.class.to_s =~ /Document/}
+    puts "Enabling GC.stress with documentation formatter"
+
+    config.before :each do
+      GC.stress = true
+    end
+
+    config.after :each do
+      GC.stress = false
+    end
 
-  config.after :each do
-    GC.stress = false
   end
 end
 
 configure do
   set :env, 'test'
 end
-
-# todo a test helper to compile routes after app loaded

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyara
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.2
+  version: 0.0.1.pre.3
 platform: ruby
 authors:
 - Zete Lui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies: []
 description: Fast, slim and fuzzy ruby web framework + server, based on preforked
   event queue and Fiber. NO rack NOR eventmachine are used.
@@ -28,26 +28,34 @@ files:
 - ext/extconf.rb
 - hello.rb
 - lib/nyara/config.rb
-- lib/nyara/config_hash.rb
 - lib/nyara/controller.rb
 - lib/nyara/cookie.rb
 - lib/nyara/cpu_counter.rb
-- lib/nyara/header_hash.rb
+- lib/nyara/hashes/config_hash.rb
+- lib/nyara/hashes/header_hash.rb
+- lib/nyara/hashes/param_hash.rb
 - lib/nyara/mime_types.rb
 - lib/nyara/nyara.rb
-- lib/nyara/param_hash.rb
+- lib/nyara/patch_tcp_socket.rb
 - lib/nyara/request.rb
 - lib/nyara/route.rb
 - lib/nyara/route_entry.rb
 - lib/nyara/session.rb
 - lib/nyara/view.rb
 - lib/nyara.rb
+- spec/apps/connect.rb
+- spec/evented_io_spec.rb
 - spec/ext_mime_match_spec.rb
 - spec/ext_parse_accept_value_spec.rb
 - spec/ext_parse_spec.rb
 - spec/ext_route_spec.rb
 - spec/hashes_spec.rb
 - spec/path_helper_spec.rb
+- spec/performance/layout_render.rb
+- spec/performance/parse_accept_value.rb
+- spec/performance/parse_param.rb
+- spec/performance/performance_helper.rb
+- spec/performance_spec.rb
 - spec/request_delegate_spec.rb
 - spec/request_spec.rb
 - spec/route_entry_spec.rb
@@ -62,6 +70,7 @@ files:
 - ext/inc/str_intern.h
 - ext/multipart-parser-c/multipart_parser.h
 - ext/nyara.h
+- ext/request.h
 - ext/accept.c
 - ext/event.c
 - ext/hashes.c
@@ -75,6 +84,7 @@ files:
 - ext/multipart_parser.c
 - ext/nyara.c
 - ext/request.c
+- ext/request_parse.c
 - ext/url_encoded.c
 - ext/route.cc
 - ext/inc/status_codes.inc
@@ -108,4 +118,3 @@ signing_key:
 specification_version: 4
 summary: Fast, slim and fuzzy ruby web framework + server
 test_files: []
-has_rdoc: false