nyara 0.0.1.pre.9 → 0.1.pre.0

data/spec/performance/layout_render.rb

@@ -13,7 +13,6 @@ class MyRenderable
     @title = "layout_render"
     @items = items
   end
-  include Nyara::Renderable
 
   def send_chunk s
     @res ||= []
@@ -35,18 +34,24 @@ class MyRenderable
   end
 end
 
+def bm_nyara items
+  Nyara::Ext.rdtsc_start
+  MyRenderable.new(items).nyara_render
+  Nyara::Ext.rdtsc
+end
+
+def bm_tilt items
+  Nyara::Ext.rdtsc_start
+  MyRenderable.new(items).tilt_render
+  Nyara::Ext.rdtsc
+end
+
 # prepare data
 Item = Struct.new :name, :price
 items = 10.times.map do |i|
   Item.new "name#{i}", i
 end
+bm_nyara items
+bm_tilt items
 
-# 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
+dump nyara: bm_nyara(items), tilt: bm_tilt(items)

data/spec/performance/parse_accept_value.rb

@@ -1,13 +1,29 @@
 require_relative "performance_helper"
-$0 = '' # don't let sinatra boot the server
-require "sinatra"
+require "sinatra/base"
 
-v = 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'
-env = {'HTTP_ACCEPT' => env}
+V = 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'
+E = {'HTTP_ACCEPT' => V}
 
-GC.disable
+def nyara
+  Nyara::Ext.rdtsc_start
+  Nyara::Ext.parse_accept_value V
+  Nyara::Ext.rdtsc
+end
+
+def sinatra_baseline
+  Nyara::Ext.rdtsc_start
+  Sinatra::Request.new(E.dup)
+  Nyara::Ext.rdtsc
+end
+
+def sinatra
+  Nyara::Ext.rdtsc_start
+  Sinatra::Request.new(E.dup).accept
+  Nyara::Ext.rdtsc
+end
+
+nyara
+sinatra
+sinatra_baseline
 
-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

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

data/spec/performance/performance_helper.rb

@@ -1,25 +1,12 @@
 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
+  in_spec = ENV['NYARA_FORKED'] == 'spec'
+  GC.start
+  GC.disable
+  if in_spec
+    print Marshal.dump data
+  else
+    p data
+  end
 end

data/spec/performance_spec.rb

@@ -9,6 +9,7 @@ describe 'performance' do
   def bm name
     bm = __dir__ + '/performance/' + name + '.rb'
     assert File.exist?(bm), "file not found: #{bm}"
+    ENV['NYARA_FORKED'] = 'spec'
     res = IO.popen ['ruby', bm] do |io|
       data = io.read
       Marshal.load data
@@ -19,17 +20,17 @@ describe 'performance' do
 
   it "[parse_accept_value] faster than sinatra" do
     res = bm 'parse_accept_value'
-    assert res[:nyara] * 1.5 < res[:sinatra], res.inspect
+    assert res[:nyara] * 10 < 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
+    assert res[:nyara] * 7 < res[:ruby], res.inspect
   end
 
-  it "[layout_render] faster than using tilt" do
+  it "[layout_render] nearly as fast as using tilt..." do
     res = bm 'layout_render'
-    assert res[:nyara] * 1.1 < res[:tilt], res.inspect
+    assert res[:nyara] * 0.9 < res[:tilt], res.inspect
   end
 
   it "[escape] faster than CGI.escape" do

data/spec/route_spec.rb

@@ -22,7 +22,7 @@ module Nyara
       @r.path = '/a/%d/b'
       @r.compile :controller_stub, '/scope'
       assert_equal "/scope/a/", @r.prefix
-      assert_equal "^(-?[0-9]+)/b$", @r.suffix
+      assert_equal "^(-?\\d+)/b$", @r.suffix
       assert_equal [:to_i], @r.conv
     end
 
@@ -52,7 +52,7 @@ module Nyara
     end
 
     it "#compile_re with utf-8 chars" do
-      re, conv = @r.compile_re '/目录/%da/也可以'
+      re, conv = @r.compile_re '/目录/%.3da/也可以'
       assert_equal [:to_i], conv
       s = "/目录/12a/也可以"
       assert_equal [s, '12'], s.match(Regexp.new re).to_a
@@ -125,5 +125,10 @@ module Nyara
         assert_equal '.b:C', s
       end
     end
+
+    it ".print_routes" do
+      out = stdout { Route.print_routes }
+      assert_include(out, "all routes:")
+    end
   end
 end

data/spec/url_encoded_spec.rb

@@ -14,59 +14,29 @@ module Nyara
       end
     end
 
-    # note: this method is only used in C code
-    context "Ext.parse_url_encoded_seg" do
-      [false, true].each do |nested|
-        context (nested ? 'nested mode' : 'flat mode') do
-          it "normal parse" do
-            assert_equal({'a' => 'b'}, parse('a=b', nested))
-          end
-
-          it "param seg end with '='" do
-            assert_equal({'a' => ''}, parse('a=', nested))
-          end
-
-          it "param seg begin with '='" do
-            assert_equal({'' => 'b'}, parse('=b', nested))
-          end
-
-          it "param seg without value" do
-            assert_equal({'a' => ''}, parse('a', nested))
-          end
-
-          it "raises error" do
-            assert_raise ArgumentError do
-              parse 'a=&b'
-            end
-          end
-        end
+    context "Ext.decode_uri_kv" do
+      it "empty k" do
+        k, v = Ext.decode_uri_kv "=b"
+        assert_equal '', k
+        assert_equal 'b', v
       end
 
-      context "nested key" do
-        it "parses nested key" do
-          res = {"a"=>{"b"=>[[{"c"=>"1"}]]}}
-          assert_equal res, Ext.parse_url_encoded_seg({}, "a[b][][][c]=1", true)
-        end
-
-        it 'allows "[]" as input' do
-          res = {""=>[""]}
-          assert_equal res, Ext.parse_url_encoded_seg({}, "[]", true)
-        end
-
-        it 'ignores empty input' do
-          res = {}
-          assert_equal res, Ext.parse_url_encoded_seg({}, "", true)
-        end
+      it "empty v" do
+        k, v = Ext.decode_uri_kv "a="
+        assert_equal 'a', k
+        assert_equal '', v
+      end
 
-        it "content hash is ParamHash" do
-          h = ParamHash.new
-          assert_equal ParamHash, Ext.parse_url_encoded_seg(h, "a[b]=c", true)[:a].class
-        end
+      it "without '='" do
+        k, v = Ext.decode_uri_kv "a"
+        assert_equal 'a', k
+        assert_equal '', v
       end
 
-      def parse str, nested
-        h = {}
-        Ext.parse_url_encoded_seg h, str, nested
+      it "raises for bad kv" do
+        assert_raise ArgumentError do
+          Ext.decode_uri_kv 'a=&b'
+        end
       end
     end
 
@@ -139,31 +109,5 @@ module Nyara
         Ext.parse_path @output, input
       end
     end
-
-    context "Ext.parse_cookie" do
-      it "parses complex cookie" do
-        history = CGI.escape '历史'
-        cookie = "pgv_pvi; pgv_si= ; pgv_pvi=som; sid=1d6c75f0 ; PLHistory=<#{history}>;"
-        h = Ext.parse_cookie ParamHash.new, cookie
-        assert_equal '1d6c75f0', h['sid']
-        assert_equal '', h['pgv_si']
-        assert_equal '', h['pgv_pvi'] # left orverrides right
-        assert_equal '<历史>', h['PLHistory']
-      end
-
-      it "parses empty cookie" do
-        cookie = ''
-        h = Ext.parse_cookie ParamHash.new, cookie
-        assert_empty h
-      end
-    end
-
-    context "Ext.parse_param" do
-      it "parses param with non-utf-8 chars" do
-        bad_s = CGI.escape "\xE2"
-        h = Ext.parse_param ParamHash.new, bad_s
-        assert_equal "", h["\xE2"]
-      end
-    end
   end
 end

data/spec/view_spec.rb

@@ -1,8 +1,6 @@
 require_relative "spec_helper"
 
 class RenderableMock
-  include Nyara::Renderable
-
   def initialize
     @result = ''
   end
@@ -14,7 +12,7 @@ class RenderableMock
 end
 
 module Nyara
-  describe [View, Renderable] do
+  describe View do
     before :all do
       Config['views'] = __dir__ + '/views'
       View.init

data/spec/views/_partial.slim

@@ -0,0 +1 @@
+| This is a partial

data/spec/views/_partial_with_yield.erb

@@ -0,0 +1 @@
+yie<% Fiber.yield %>ld

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: nyara
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.9
+  version: 0.1.pre.0
 platform: ruby
 authors:
 - Zete Lui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
-dependencies: []
+date: 2013-07-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 description: Fast and fuzzy ruby web framework + server
 email: nobody@example.com
 executables:
@@ -23,24 +51,24 @@ files:
 - readme.md
 - copying
 - changes
-- example/factorial.rb
-- example/hello.rb
-- example/project.rb
-- example/stream.rb
 - ext/extconf.rb
-- lib/nyara/command.rb
+- lib/nyara.rb
 - lib/nyara/config.rb
+- lib/nyara/command.rb
 - lib/nyara/controller.rb
-- lib/nyara/controllers/public_controller.rb
 - lib/nyara/cookie.rb
 - lib/nyara/cpu_counter.rb
 - lib/nyara/flash.rb
+- lib/nyara/mime_types.rb
+- lib/nyara/nyara.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/request.rb
+- lib/nyara/route.rb
 - lib/nyara/part.rb
+- lib/nyara/session.rb
+- lib/nyara/view.rb
 - lib/nyara/patches/array.rb
 - lib/nyara/patches/blank.rb
 - lib/nyara/patches/json.rb
@@ -48,59 +76,56 @@ files:
 - lib/nyara/patches/string.rb
 - lib/nyara/patches/tcp_socket.rb
 - lib/nyara/patches/to_query.rb
-- lib/nyara/request.rb
-- lib/nyara/route.rb
-- lib/nyara/session.rb
+- lib/nyara/reload.rb
+- lib/nyara/templates/app/controllers/application_controller.rb
+- lib/nyara/templates/app/controllers/welcome_controller.rb
+- lib/nyara/templates/config/application.rb
 - lib/nyara/templates/config/boot.rb
 - lib/nyara/templates/config/development.rb
 - lib/nyara/templates/config/production.rb
 - lib/nyara/templates/config/test.rb
 - lib/nyara/templates/spec/spec_helper.rb
 - lib/nyara/test.rb
-- lib/nyara/view.rb
 - lib/nyara/view_handlers/erb.rb
 - lib/nyara/view_handlers/erubis.rb
 - lib/nyara/view_handlers/haml.rb
 - lib/nyara/view_handlers/slim.rb
-- lib/nyara.rb
+- spec/ext_mime_match_spec.rb
+- spec/ext_parse_accept_value_spec.rb
 - spec/apps/connect.rb
+- spec/dummy/app/controllers/dummy_controller.rb
+- spec/dummy/app/models/dmmy_model.rb
+- spec/ext_route_spec.rb
+- spec/hashes_spec.rb
+- spec/path_helper_spec.rb
+- spec/request_delegate_spec.rb
+- spec/request_spec.rb
 - spec/command_spec.rb
+- spec/route_spec.rb
+- spec/session_spec.rb
+- spec/spec_helper.rb
+- spec/view_spec.rb
 - spec/config_spec.rb
 - spec/controller_spec.rb
 - spec/cpu_counter_spec.rb
 - spec/evented_io_spec.rb
-- spec/ext_mime_match_spec.rb
-- spec/ext_parse_accept_value_spec.rb
-- spec/ext_route_spec.rb
 - spec/flash_spec.rb
-- spec/hashes_spec.rb
 - spec/integration_spec.rb
 - spec/mini_support_spec.rb
 - spec/multipart_spec.rb
-- spec/path_helper_spec.rb
 - spec/performance/escape.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_spec.rb
-- spec/session_spec.rb
-- spec/spec_helper.rb
 - spec/url_encoded_spec.rb
-- spec/view_spec.rb
-- tools/bench-cookie.rb
-- tools/foo.rb
-- tools/hello.rb
-- tools/memcheck.rb
-- tools/s.rb
 - ext/http-parser/http_parser.h
 - ext/inc/epoll.h
 - ext/inc/kqueue.h
-- ext/inc/status_codes.h
 - ext/inc/str_intern.h
+- ext/inc/rdtsc.h
+- ext/inc/status_codes.h
 - ext/multipart-parser-c/multipart_parser.h
 - ext/nyara.h
 - ext/request.h
@@ -117,31 +142,37 @@ files:
 - ext/multipart_parser.c
 - ext/nyara.c
 - ext/request.c
+- ext/url_encoded.c
 - ext/request_parse.c
 - ext/test_response.c
-- ext/url_encoded.c
 - ext/route.cc
+- ext/inc/status_codes.inc
 - ext/inc/version.inc
-- spec/performance/layout.slim
-- spec/performance/page.slim
-- spec/public/empty file.html
-- spec/public/index.html
-- spec/raw_requests/multipart
 - spec/views/edit.haml
 - spec/views/edit.slim
 - spec/views/index.liquid
 - spec/views/invalid_layout.liquid
 - spec/views/layout.erb
 - spec/views/show.slim
+- spec/views/_partial.slim
+- spec/views/_partial_with_yield.erb
+- spec/performance/layout.slim
+- spec/performance/page.slim
+- spec/public/empty file.html
+- spec/public/index.html
+- spec/raw_requests/multipart
 - ext/http-parser/AUTHORS
 - ext/http-parser/CONTRIBUTIONS
 - ext/http-parser/LICENSE-MIT
 - ext/multipart-parser-c/README.md
-- lib/nyara/templates/config/database.yml
-- lib/nyara/templates/config/session.key
 - lib/nyara/templates/Gemfile
-- lib/nyara/templates/public/robot.txt
 - lib/nyara/templates/Rakefile
+- lib/nyara/templates/app/views/layouts/application.erb
+- lib/nyara/templates/app/views/welcome/index.erb
+- lib/nyara/templates/config/database.yml
+- lib/nyara/templates/public/css/app.css
+- lib/nyara/templates/public/js/app.js
+- lib/nyara/templates/public/robot.txt
 - bin/nyara
 homepage: https://github.com/luikore/nyara
 licenses:
@@ -183,4 +214,3 @@ signing_key:
 specification_version: 4
 summary: Fast and fuzzy ruby web framework + server
 test_files: []
-has_rdoc: