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

data/lib/nyara/view_handlers/erubis.rb

@@ -0,0 +1,81 @@
+require "erubis"
+
+module Nyara
+  class View
+    # mostly same as actionpack/action_view/template/handlers/erb.rb
+    class Erubis < ::Erubis::Eruby
+      def self.src template
+        new(template).src
+      end
+
+      def add_preamble(src)
+        @newline_pending = 0
+        src << "_erbout = @_nyara_view.out;"
+      end
+
+      # ensure 1:1 mapping of "\n" between template and output
+      def add_text(src, text)
+        return if text.empty?
+
+        if text == "\n"
+          @newline_pending += 1
+        else
+          src << "_erbout.safe_append='"
+          src << "\n" * @newline_pending if @newline_pending > 0
+          src << escape_text(text)
+          src << "';"
+
+          @newline_pending = 0
+        end
+      end
+
+      # Erubis toggles <%= and <%== behavior when escaping is enabled.
+      # We override to always treat <%== as escaped.
+      def add_expr(src, code, indicator)
+        case indicator
+        when '=='
+          add_expr_escaped(src, code)
+        else
+          super
+        end
+      end
+
+      BLOCK_EXPR = /\s+(do|\{)(\s*\|[^|]*\|)?\s*\Z/
+
+      def add_expr_literal(src, code)
+        flush_newline_if_pending(src)
+        if code =~ BLOCK_EXPR
+          src << '_erbout.append= ' << code
+        else
+          src << '_erbout.append=(' << code << ');'
+        end
+      end
+
+      def add_expr_escaped(src, code)
+        flush_newline_if_pending(src)
+        if code =~ BLOCK_EXPR
+          src << "_erbout.safe_append= " << code
+        else
+          src << "_erbout.safe_append=(" << code << ");"
+        end
+      end
+
+      def add_stmt(src, code)
+        flush_newline_if_pending(src)
+        super
+      end
+
+      def add_postamble(src)
+        flush_newline_if_pending(src)
+        src << '_erbout.join'
+      end
+
+      def flush_newline_if_pending(src)
+        if @newline_pending > 0
+          src << "_erbout.safe_append='#{"\n" * @newline_pending}';"
+          @newline_pending = 0
+        end
+      end
+    end
+  end
+end

data/lib/nyara/view_handlers/haml.rb

@@ -0,0 +1,17 @@
+require "haml"
+
+module Nyara
+  class View
+    module Haml
+      def self.src template
+        e = ::Haml::Engine.new template
+        # todo trim mode
+        <<-RUBY
+_hamlout = ::Haml::Buffer.new(nil, encoding: 'utf-8'); _hamlout.buffer = @_nyara_view.out
+#{e.precompiled}
+_hamlout.buffer.join
+RUBY
+      end
+    end
+  end
+end

data/lib/nyara/view_handlers/slim.rb

@@ -0,0 +1,16 @@
+require "slim"
+
+module Nyara
+  class View
+    class Slim
+      def self.src template
+        t = ::Slim::Template.new(nil, nil, pretty: false){ template }
+        src = t.instance_variable_get :@src
+        if src.start_with?('_buf = []')
+          src.sub! '_buf = []', '_buf = @_nyara_view.out'
+        end
+        src
+      end
+    end
+  end
+end

data/nyara.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "nyara"
-  s.version = "0.0.1.pre.6"
+  s.version = "0.0.1.pre.8"
   s.author = "Zete Lui"
   s.email = "nobody@example.com"
   s.homepage = "https://github.com/luikore/nyara"
@@ -11,8 +11,10 @@ Gem::Specification.new do |s|
   s.licenses = ['BSD 3-Clause']
 
   s.files = Dir.glob('{rakefile,nyara.gemspec,readme.md,**/*.{rb,h,c,cc,inc}}')
+  s.files += Dir.glob('spec/**/*')
   s.files += Dir.glob('ext/http-parser/{AUTHORS,CONTRIBUTIONS,LICENSE-MIT}')
   s.files += Dir.glob('ext/multipart-parser-c/README.md')
+  s.files.uniq!
   s.require_paths = ["lib"]
   s.extensions = ["ext/extconf.rb"]
   s.rubygems_version = '2.0.3'

data/readme.md

@@ -56,5 +56,5 @@ BSD 3-Clause, see [copying](https://github.com/luikore/nyara/blob/master/copying
 
 # Contributors
 
-luikore
-hooopo
+- luikore
+- hooopo

data/spec/apps/connect.rb

@@ -5,7 +5,7 @@ require "pry"
 require "open-uri"
 
 configure do
-  port 3003
+  set :port, 3003
 end
 
 get '/' do

data/spec/config_spec.rb

@@ -6,16 +6,87 @@ module Nyara
       Config.reset
     end
 
-    it "#workers" do
-      Nyara.config.workers '3'
+    it "Nyara.config forbids block" do
+      Nyara.config
+      assert_raise ArgumentError do
+        Nyara.config{}
+      end
+    end
+
+    it "convert workers" do
+      Config.configure do
+        set :workers, '3'
+      end
+      Config.init
       assert_equal 3, Config['workers']
     end
 
-    it "#port" do
-      Config.port '1000'
+    it "convert port" do
+      Config.configure do
+        set :port, '1000'
+      end
+      Config.init
       assert_equal 1000, Config['port']
     end
 
+    it "port default" do
+      Config.reset
+      Config.init
+      assert_equal 3000, Config['port']
+    end
+
+    it "views and public default" do
+      Config.reset
+      Config[:root] = '/root'
+      Config.init
+      assert_equal '/root/public', Config['public']
+      assert_equal '/root/views', Config['views']
+    end
+
+    context "#project_path" do
+      before :all do
+        Config.configure do
+          set :root, '/a'
+          init
+        end
+      end
+
+      it "works" do
+        path = Config.project_path 'b/../../c', false
+        assert_equal '/c', path
+      end
+
+      it "restrict mode ensures dir safety" do
+        path = Config.project_path 'b/../../c'
+        assert_equal nil, path
+      end
+
+      it "restrict mode allows '..' if it doesn't get outside" do
+        path = Config.project_path 'b/../c', true
+        assert_equal '/a/c', path
+      end
+    end
+
+    it "#public_path" do
+      Config.configure do
+        set :root, '/root'
+        set :public, 'a'
+        init
+      end
+      path = Config.public_path '/b'
+      assert_equal '/root/a/b', path
+    end
+
+    it "#views_path" do
+      Config.configure do
+        set :root, '/'
+        set :views, '/a'
+        init
+      end
+      path = Config.views_path '../..', false
+      assert_equal '/', path
+    end
+
     it "env helpers" do
       Config.set :env, 'test'
       assert_equal true, Config.test?
@@ -23,6 +94,7 @@ module Nyara
 
       Config.set :env, 'production'
       assert_equal false, Config.test?
+      assert_equal true, Config.production?
     end
   end
 end

data/spec/{test_spec.rb → integration_spec.rb}

@@ -11,6 +11,14 @@ class TestController < Nyara::Controller
   post '/create' do
     redirect_to '#index'
   end
+
+  put '/send_file/%z' do |name|
+    send_file Nyara.config.views_path name
+  end
+
+  delete '/render' do
+    render 'edit.slim'
+  end
 end
 
 class MyTest
@@ -18,12 +26,13 @@ class MyTest
 end
 
 module Nyara
-  describe Nyara::Test do
+  describe Nyara::Test, 'integration' do
     before :all do
       configure do
         reset
-        set :env, 'test'
+        # set :env, 'test'
         map '/', TestController
+        set :root, __dir__
       end
       Nyara.setup
       @test = MyTest.new
@@ -40,7 +49,7 @@ module Nyara
     it "redirect" do
       @test.post @test.path_to('test#create')
       assert @test.response.success?
-      assert_equal 'http://localhost/', @test.redirect_location
+      assert_equal 'http://localhost:3000/', @test.redirect_location
       @test.follow_redirect
       assert_equal '/', @test.request.path
     end
@@ -54,5 +63,40 @@ module Nyara
       assert_equal '4', @test.session['b']
       assert_equal '3', @test.session['a']
     end
+
+    it "send file" do
+      @test.put "/send_file/layout.erb"
+      data = File.read Nyara.config.views_path('layout.erb')
+      assert_equal data, @test.response.body
+    end
+
+    it "render" do
+      @test.delete "/render"
+      assert_include @test.response.body, "slim:edit"
+    end
+
+    context "public static content" do
+      it "found file" do
+        @test.get "/index.html"
+        assert_equal 200, @test.response.status
+        assert_equal "index.html", @test.response.body
+      end
+
+      it "found empty file" do
+        @test.get "/empty file.html"
+        assert_equal 200, @test.response.status
+        assert_empty @test.response.body
+      end
+
+      it "missing file" do
+        @test.get "/missing.html"
+        assert_equal 404, @test.response.status
+      end
+
+      it "found but directory" do
+        @test.get "/empty"
+        assert_equal 404, @test.response.status
+      end
+    end
   end
 end

data/spec/path_helper_spec.rb

@@ -12,7 +12,7 @@ class FooController < Nyara::Controller
   end
 
   class BazController < Nyara::Controller
-    set_name 'baz'
+    set_controller_name 'baz'
 
     meta '#index'
     get '/%d' do |id|

data/spec/performance/escape.rb

@@ -0,0 +1,10 @@
+require_relative "performance_helper"
+require "cgi"
+
+s = 'abcde マfgイ'
+
+GC.disable
+
+nyara = bench(10000){ Nyara::Ext.escape s, false }
+cgi = bench(10000){ CGI.escape s }
+dump nyara: nyara, cgi: cgi

data/spec/performance/layout.slim

@@ -0,0 +1,14 @@
+- # for layout_render.rb, captures: @title
+doctype html
+html
+  head
+    meta charset="utf-8"
+    meta http-equiv="X-UA-Compatible" content="IE=edge"
+    title == @title
+    link rel="icon" type="image/x-icon" href="/favicon.ico"
+    script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"
+  body
+    == yield
+
+    div#footer
+      | Copyright © #{Time.now}

data/spec/performance/page.slim

@@ -0,0 +1,16 @@
+- # for layout_render.rb, locals: items
+h1 Markup examples
+
+#content
+  p This example shows you how a basic Slim file looks like.
+
+  - unless items.empty?
+    table
+      - items.each do |item|
+        tr
+          td.name = item.name
+          td.price = item.price
+  - else
+    p
+     | No items found.  Please add some inventory.
+       Thank you!

data/spec/performance_spec.rb

@@ -19,7 +19,7 @@ describe 'performance' do
 
   it "[parse_accept_value] faster than sinatra" do
     res = bm 'parse_accept_value'
-    assert res[:nyara] * 1.7 < res[:sinatra], res.inspect
+    assert res[:nyara] * 1.5 < res[:sinatra], res.inspect
   end
 
   it "[parse_param] faster than parse in pure ruby" do
@@ -31,6 +31,11 @@ describe 'performance' do
     res = bm 'layout_render'
     assert res[:nyara] * 1.1 < res[:tilt], res.inspect
   end
+
+  it "[escape] faster than CGI.escape" do
+    res = bm 'escape'
+    assert res[:nyara] * 8 < res[:cgi], res.inspect
+  end
 end
 
 end # unless

data/spec/public/index.html

@@ -0,0 +1 @@
+index.html

data/spec/request_delegate_spec.rb

@@ -11,7 +11,7 @@ module Nyara
 
     before :each do
       @request = Ext.request_new
-      session = ParamHash.new
+      session = Session.new
       Ext.request_set_attrs @request, {
         method_num: HTTP_METHODS['GET'],
         path: '/search',

data/spec/request_spec.rb

@@ -38,6 +38,26 @@ module Nyara
       assert_equal 3000, @request.port
     end
 
+    it "#host_with_port ignores port on 80" do
+      @request.header['Host'] = '127.0.0.1'
+      assert_equal '127.0.0.1', @request.host_with_port
+    end
+
+    it "#accept_language" do
+      @request.header['accept-language'] = "en-US,en;q=0.8"
+      assert_equal ['en-US', 'en'], @request.accept_language
+    end
+
+    it "#accept_encoding with blank header" do
+      @request.header.delete 'Accept-Encoding'
+      assert_equal [], @request.accept_encoding
+    end
+
+    it "#accept_charset" do
+      @request.header['ACCEPT-CHARSET'] = "iso-8859-1;q=0.2, utf-8"
+      assert_equal %w[utf-8 iso-8859-1], @request.accept_charset
+    end
+
     def request_set_attrs
       Ext.request_set_attrs @request, @request_attrs
     end

data/spec/route_entry_spec.rb

@@ -44,6 +44,13 @@ module Nyara
       assert_equal [], conv
     end
 
+    it "#compile %z" do
+      re, conv = @r.compile_re '/%z'
+      assert_equal [:to_s], conv
+      s = '/foo bar.baz'
+      assert_equal [s, s[1..-1]], s.match(Regexp.new re).to_a
+    end
+
     it "#compile_re with utf-8 chars" do
       re, conv = @r.compile_re '/目录/%da/也可以'
       assert_equal [:to_i], conv

data/spec/session_spec.rb

@@ -4,7 +4,8 @@ module Nyara
   describe Session do
     context ".encode_set_cookie options" do
       before :all do
-        @session = {'hello' => 'world'}
+        @session = Session.new
+        @session['hello'] = 'world'
       end
 
       it "is HttpOnly" do
@@ -65,7 +66,8 @@ module Nyara
 
       it "should encode and decode" do
         cookie = {}
-        session = {'hello' => 'world'}
+        session = Session.new
+        session['hello'] = 'world'
         Session.encode_to_cookie session, cookie
 
         session_data = cookie[Session.name].split('/')[1]
@@ -77,7 +79,8 @@ module Nyara
 
       it "drops bad signature" do
         cookie = {}
-        session = {'hello' => 'world'}
+        session = Session.new
+        session['hello'] = 'world'
         Session.encode_to_cookie session, cookie
 
         cookie[Session.name].sub!(/\w/, &:swapcase)
@@ -98,7 +101,8 @@ module Nyara
 
       it "encode and decode" do
         cookie = {}
-        session = {'hello' => 'world'}
+        session = Session.new
+        session['hello'] = 'world'
         Session.encode_to_cookie session, cookie
 
         session_data = cookie[Session.name].split('/')[1]

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'rspec/autorun'
 require "pry"
 require "slim"
 require "erb"
+require "erubis"
 require "haml"
 require "liquid"
 require "open-uri"

data/spec/{ext_parse_spec.rb → url_encoded_spec.rb}

@@ -1,9 +1,21 @@
 require_relative "spec_helper"
 
 module Nyara
-  describe Ext, "parse" do
+  describe Ext, "url_encoded.c" do
+    context "Ext.escape" do
+      it "escapes path" do
+        s = "/a/path.js"
+        assert_equal s, Ext.escape(s, true)
+      end
+
+      it "escapes uri component" do
+        s = "/a/path.js"
+        assert_equal CGI.escape(s), Ext.escape(s, false)
+      end
+    end
+
     # note: this method is only used in C code
-    context "#parse_url_encoded_seg" do
+    context "Ext.parse_url_encoded_seg" do
       [false, true].each do |nested|
         context (nested ? 'nested mode' : 'flat mode') do
           it "normal parse" do
@@ -58,7 +70,7 @@ module Nyara
       end
     end
 
-    context "#parse_path" do
+    context "Ext.parse_path" do
       before :each do
         @output = ''
       end
@@ -128,7 +140,7 @@ module Nyara
       end
     end
 
-    context ".parse_cookie" do
+    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}>;"
@@ -146,7 +158,7 @@ module Nyara
       end
     end
 
-    context ".parse_param" do
+    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

data/spec/views/edit.haml

@@ -0,0 +1,2 @@
+%div
+  = 'haml:edit'

data/spec/views/edit.slim

@@ -0,0 +1,2 @@
+div
+  = 'slim:edit'

data/spec/views/layout.erb

@@ -0,0 +1 @@
+<html><%== yield %></html>

data/spec/views/show.slim

@@ -0,0 +1 @@
+= a

data/tools/foo.rb

@@ -0,0 +1,9 @@
+require_relative "../lib/nyara"
+
+post '/' do
+  data = File.binread('text.gz')
+  set_header 'Content-Length', data.bytesize
+  set_header 'Content-Encoding', 'gzip'
+  set_header 'Transfer-Encoding', 'chunked'
+  send_string data
+end

data/tools/hello.rb

@@ -1,23 +1,28 @@
-require_relative "../lib/nyara"
+require_relative "../lib/nyara/nyara"
 # require "open-uri"
 # require "pry"
 
 configure do
   # set :env, 'production'
-  # set :workers, 2
+  # set :workers, 3
+  map '/', 'my'
 end
 
-get '/' do
-  # open 'http://baidu.com', &:read
-  send_string 'hello world'
-end
+class MyController < Nyara::Controller
+  get '/' do
+    send_string 'hello world'
+  end
 
-get '/exit' do
-  exit
-end
+  get '/exit' do
+    exit
+  end
 
-get '/redi' do
-  redirect '/'
+  get '/redi' do
+    redirect '/'
+  end
 end
 
+Nyara.setup
+Nyara.start_server
+
 # GC.stress = true