nyara 0.0.1.pre.5 → 0.0.1.pre.6

data/readme.md

@@ -2,6 +2,7 @@ Not Yet Another Ruby Async web framework and server.
 
 [![Build Status](https://travis-ci.org/luikore/nyara.png)](https://travis-ci.org/luikore/nyara)
 
+- Fast
 - Evented IO while API remains synchrony
 - Prefork production server, mixing a bit blocking operations won't block other users
 - Sinatra-like http method and scanf-like http path and path helper
@@ -39,6 +40,7 @@ ruby nyahaha.rb
 
 # Documentation
 
+- [Wiki](https://github.com/luikore/nyara/wiki/Home)
 - [Manual](https://github.com/luikore/nyara/wiki/Manual)
 - [API doc](http://rubydoc.info/github/luikore/nyara/master/frames)
 - [Building from source](https://github.com/luikore/nyara/wiki/Building)
@@ -50,4 +52,9 @@ ruby nyahaha.rb
 
 # License
 
-BSD, see [copying](https://github.com/luikore/nyara/blob/master/copying)
+BSD 3-Clause, see [copying](https://github.com/luikore/nyara/blob/master/copying)
+
+# Contributors
+
+luikore
+hooopo

data/spec/config_spec.rb

@@ -0,0 +1,28 @@
+require_relative "spec_helper"
+
+module Nyara
+  describe Config do
+    after :all do
+      Config.reset
+    end
+
+    it "#workers" do
+      Nyara.config.workers '3'
+      assert_equal 3, Config['workers']
+    end
+
+    it "#port" do
+      Config.port '1000'
+      assert_equal 1000, Config['port']
+    end
+
+    it "env helpers" do
+      Config.set :env, 'test'
+      assert_equal true, Config.test?
+      assert_equal false, Config.development?
+
+      Config.set :env, 'production'
+      assert_equal false, Config.test?
+    end
+  end
+end

data/spec/cpu_counter_spec.rb

@@ -0,0 +1,9 @@
+require_relative "spec_helper"
+
+module Nyara
+  describe CpuCounter do
+    it "counts" do
+      assert CpuCounter.count.is_a?(Integer)
+    end
+  end
+end

data/spec/evented_io_spec.rb

@@ -15,6 +15,7 @@ module Nyara
     end
 
     it "works" do
+      GC.stress = false # open-uri creates too many objects!
       result1 = open "http://localhost:3003", &:read
       result2 = open "http://baidu.com", &:read
       assert_equal result2, result1

data/spec/flash_spec.rb

@@ -0,0 +1,29 @@
+require_relative "spec_helper"
+
+module Nyara
+  describe Flash do
+    before :each do
+      @session = ParamHash.new
+      @flash = Flash.new @session
+    end
+
+    it "#next" do
+      @flash[:foo] = 'foo'
+      assert_equal 'foo', @flash.next['foo']
+      assert_not_empty @session.values.first
+
+      @flash.next[:bar] = 'bar'
+      assert_nil @flash[:bar]
+    end
+
+    it "#now" do
+      @flash.now['foo'] = 'foo'
+      assert_nil @flash.next['foo']
+      assert_empty @session.values.first
+    end
+
+    it "#now is from session, and #next is to session" do
+      
+    end
+  end
+end

data/spec/hashes_spec.rb

@@ -26,6 +26,14 @@ module Nyara
       assert_equal ['Content-Type', 'text/plain'], h.to_a.first
     end
 
+    it "can serialize into an array" do
+      h = HeaderHash.new
+      h['Content-Length'] = 3
+      h['X-Weird'] = '奇怪'
+      arr = h.serialize
+      assert_equal ["Content-Length: 3\r\n", "X-Weird: 奇怪\r\n"], arr
+    end
+
     class HaHash < HeaderHash
     end
 

data/spec/mini_support_spec.rb

@@ -0,0 +1,54 @@
+require_relative "spec_helper"
+
+module Nyara
+  describe 'mini_support' do
+    it "Array#sum" do
+      assert_equal 0, [].sum
+      assert_equal 3, [1, 2].sum
+    end
+
+    # just test existence, no need to repeat activesupport tests
+    it "Object#blank?" do
+      assert [].respond_to? :blank?
+    end
+
+    # just test existence, no need to repeat activesupport tests
+    it "Object#to_query" do
+      assert ''.respond_to? :to_query
+    end
+
+    it "to_json works with inheritance" do
+      h = HeaderHash.new
+      h[:Accept] = 'en'
+      assert_equal('{"Accept":"en"}', h.to_json)
+    end
+
+    # just a class with .json_create(attrs)
+    class MyClass
+      def self.json_create attrs
+        1
+      end
+    end
+    it "json load security" do
+      assert_equal({"json_class" => "MyClass", "length" => 1}, JSON.load('{"json_class":"MyClass","length":1}'))
+    end
+
+    it "json dump security" do
+      h = {"a" => '</script>', "b" => true}
+      assert_not_include(h.to_json, '</script>')
+      assert_equal h, JSON.parse(h.to_json)
+    end
+
+    if RUBY_VERSION <= '2.0.0'
+      it "String#b" do
+        assert_equal 'ASCII-8BIT', "你".b.encoding.to_s
+      end
+
+      it "String#scrub" do
+        # from rdoc examples
+        assert_equal "abc\u3042\uFFFD", "abc\u3042\x81".scrub
+        assert_equal "abc\u3042*", "abc\u3042\x81".scrub("*")
+      end
+    end
+  end
+end

data/spec/part_spec.rb

@@ -0,0 +1,52 @@
+require_relative "spec_helper"
+
+module Nyara
+  describe Part do
+    it "bottom case" do
+      p = Part.new({})
+      p.final
+      assert_equal '', p['data']
+    end
+
+    it "parses base64" do
+      p = Part.new\
+        'Content-Type' => 'image/jpeg; bla bla',
+        'Content-Disposition' => "inline; fiLename *= gbk'zh-CN'%C8%CB%B2%CE.jpg; namE= \"file\"",
+        'Content-Transfer-Encoding' => 'base64'
+
+      # total length a multiple to 8
+      data = [
+        "fNfaX7SRKfEfXMcYmHT/AHRXw94r0",
+        'G',
+        'xXxTqQFlaAC6l/5Yr/AHz7V6nAtam414yhf3',
+        'jhzqEoODUt0f/Z'
+      ]
+      data.each do |datum|
+        p.update datum.dup
+      end
+      p.final
+
+      assert_equal 'base64', p['mechanism']
+      assert_equal 'image/jpeg', p['type']
+      assert_equal '人参.jpg', p['filename']
+      assert_equal 'file', p['name']
+      assert_equal data.join, Base64.strict_encode64(p['data'])
+    end
+
+    it "parses 7bit data" do
+      p = Part.new\
+        'Content-Transfer-Encoding' => '7bit'
+      p.update 'foo bar'
+      assert_equal 'foo bar', p['data']
+    end
+
+    it "parses QP data" do
+      p = Part.new\
+        'Content-Transfer-Encoding' => 'quoted-PrintaBle'
+      p.update "a =3F ="
+      p.update "04"
+      p.final
+      assert_equal "a \x3F \x04", p['data']
+    end
+  end
+end

data/spec/path_helper_spec.rb

@@ -23,36 +23,39 @@ end
 module Nyara
   describe [Controller, Route] do
     before :all do
-      Route.clear
       Config.configure do
+        reset
         set 'host', 'yavaeye.com'
         map '/', 'foo'
         map '/bar-prefix', 'foo_controller::bar'
         map '/baz-prefix', 'foo_controller::baz'
       end
-      Route.compile
+      Nyara.setup
     end
 
-    context '#path_for' do
+    context '#path_to' do
       it "local query" do
         c = FooController.new :stub_request
-        assert_equal '/12', c.path_for('#index', 12)
+        assert_equal '/12', c.path_to('#index', 12)
         assert_raise ArgumentError do
-          c.path_for '#index'
+          c.path_to '#index'
         end
         assert_raise ArgumentError do
-          c.path_for('#index', 'a')
+          c.path_to('#index', 'a')
         end
       end
 
       it "global query" do
         c = FooController::BarController.new :stub_request
-        assert_equal '/bar-prefix/', c.path_for('foo_controller::bar#index')
-        assert_equal '/baz-prefix/1', c.path_for('baz#index', 1)
+        assert_equal '/bar-prefix/', c.path_to('foo_controller::bar#index')
+        assert_equal '/baz-prefix/1', c.path_to('baz#index', 1)
       end
 
       it "generates for nested query" do
-        pending
+        c = FooController.new :stub_request
+        path = c.path_to('#index', 1, post: {array: [1, 2]})
+        items = URI.parse(path).query.split('&').map{|q| CGI.unescape q }
+        assert_equal ["post[array][]=1", "post[array][]=2"], items
       end
 
       it "perserves _method query" do
@@ -61,16 +64,21 @@ module Nyara
 
       it "appends format and query" do
         c = FooController.new :stub_request
-        generated = c.path_for '#index', 1, format: 'js', 'utm_source' => 'a spam'
+        generated = c.path_to '#index', 1, format: 'js', 'utm_source' => 'a spam'
         assert_equal "/1.js?utm_source=a+spam", generated
       end
     end
 
-    context '#url_for' do
+    context '#url_to' do
       it "works" do
-        c = FooController::BazController.new :stub_request
-        assert_equal '//yavaeye.com/baz-prefix/1', c.url_for('#index', 1)
-        assert_equal 'https://localhost:4567/1', c.url_for('foo#index', 1, scheme: 'https', host: 'localhost:4567')
+        request = Object.new
+        class << request
+          attr_accessor :host_with_port
+        end
+        request.host_with_port = 'yavaeye.com'
+        c = FooController::BazController.new request
+        assert_equal '//yavaeye.com/baz-prefix/1', c.url_to('#index', 1)
+        assert_equal 'https://localhost:4567/1', c.url_to('foo#index', 1, scheme: 'https', host: 'localhost:4567')
       end
     end
   end

data/spec/request_delegate_spec.rb

@@ -5,15 +5,26 @@ module Nyara
     class DelegateController < Controller
     end
 
+    before :all do
+      Session.init
+    end
+
     before :each do
       @request = Ext.request_new
+      session = ParamHash.new
       Ext.request_set_attrs @request, {
         method_num: HTTP_METHODS['GET'],
         path: '/search',
         query: ParamHash.new.tap{|h| h['q'] = 'nyara' },
         fiber: Fiber.new{},
         scope: '/scope',
-        header: HeaderHash.new.tap{|h| h['Accept'] = 'en-US' }
+        header: HeaderHash.new.tap{|h| h['Accept'] = 'en-US' },
+        session: session,
+        flash: Flash.new(session),
+        cookie: ParamHash.new.tap{|h|
+          h['key1'] = 1
+          h['key2'] = 2
+        }
         # ext: nil
         # response_header:
         # response_header_extra_lines:
@@ -38,7 +49,7 @@ module Nyara
       assert_equal 'en-US', @c.header['accept']
     end
 
-    context "Simulate IO" do
+    context "Emulate output IO" do
       before :each do
         @client, @server = Socket.pair :UNIX, :STREAM
         Ext.set_nonblock @server.fileno
@@ -61,23 +72,20 @@ module Nyara
 
       it "set cookie" do
         @c.set_cookie 'set', 'set'
-        cookie = receive_header.lines.grep(/Set-Cookie:/).last
-        assert_includes cookie, "set=set; HttpOnly"
+        cookie_lines = receive_header.lines.grep(/Set-Cookie:/)
+        assert cookie_lines.grep(/set=set; HttpOnly/).first, cookie_lines.inspect
       end
 
       it "delete cookie" do
         @c.delete_cookie 'del'
-        cookie = receive_header.lines.grep(/Set-Cookie:/).last
-        assert_includes cookie, "Expires"
+        cookie_lines = receive_header.lines.grep(/Set-Cookie:/)
+        assert cookie_lines.grep(/del.*Expires/).first, cookie_lines.inspect
       end
 
       it "clear cookie" do
         @c.clear_cookie
-        pending 'incomplete implementation'
-      end
-
-      it "#session" do
-        pending
+        cookie_lines = receive_header.lines
+        assert_equal 2, cookie_lines.grep(/Set-Cookie: (key1|key2);/).size, cookie_lines.inspect
       end
     end
   end

data/spec/route_entry_spec.rb

@@ -2,11 +2,66 @@ require_relative "spec_helper"
 
 module Nyara
   describe RouteEntry do
+    before :each do
+      @r = RouteEntry.new
+    end
+
+    it "#compile prefix, suffix and conv" do
+      @r.path = '/'
+      @r.compile :controller_stub, '/'
+      assert_equal '/', @r.prefix
+      assert_equal '', @r.suffix
+      assert_equal [], @r.conv
+
+      @r.path = '/'
+      @r.compile :controller_stub, '/scope'
+      assert_equal '/scope', @r.prefix
+      assert_equal '', @r.suffix
+      assert_equal [], @r.conv
+
+      @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 [:to_i], @r.conv
+    end
+
     it "#set_accept_exts" do
       r = RouteEntry.new
       r.set_accept_exts ['html', :js]
       assert_equal [%w"text html html", %w"application javascript js"], r.accept_mimes
       assert_equal ({'html'=>true, 'js'=>true}), r.accept_exts
     end
+
+    it "#compile_re" do
+      re, conv = @r.compile_re '%s/%u/%d/%f/%x'
+      assert_equal [:to_s, :to_i, :to_i, :to_f, :hex], conv
+      s = '1/2/-3/4.5/F'
+      assert_equal [s, *s.split('/')], s.match(Regexp.new re).to_a
+
+      re, conv = @r.compile_re '/'
+      assert_equal '^/$', re
+      assert_equal [], conv
+    end
+
+    it "#compile_re with utf-8 chars" do
+      re, conv = @r.compile_re '/目录/%da/也可以'
+      assert_equal [:to_i], conv
+      s = "/目录/12a/也可以"
+      assert_equal [s, '12'], s.match(Regexp.new re).to_a
+    end
+
+    it "#analyse_path" do
+      r = @r.analyse_path '/hello/%d-world%u/%s/'
+      assert_equal ['/hello/', '%d-world%u/%s'], r
+
+      prefix, suffix = @r.analyse_path '/hello'
+      assert_equal '/hello', prefix
+      assert_equal nil, suffix
+
+      prefix, suffix = @r.analyse_path '/'
+      assert_equal '/', prefix
+      assert_equal nil, suffix
+    end
   end
 end

data/spec/session_spec.rb

@@ -2,18 +2,74 @@ require_relative "spec_helper"
 
 module Nyara
   describe Session do
+    context ".encode_set_cookie options" do
+      before :all do
+        @session = {'hello' => 'world'}
+      end
+
+      it "is HttpOnly" do
+        Session.init
+        line = Session.encode_set_cookie @session, false
+        assert_includes line, '; HttpOnly'
+      end
+
+      it "adds Secure" do
+        init_configure_with :session, :secure, true
+        line = Session.encode_set_cookie @session, false
+        assert_includes line, '; Secure'
+
+        init_configure_with :session, :secure, false
+        line = Session.encode_set_cookie @session, true
+        assert_not_includes line, 'Secure'
+
+        init_configure_with :session, :secure, nil
+        line = Session.encode_set_cookie @session, true
+        assert_includes line, '; Secure'
+        line = Session.encode_set_cookie @session, false
+        assert_not_includes line, 'Secure'
+      end
+
+      it "adds Expires" do
+        init_configure_with :session, :expire, nil
+        line = Session.encode_set_cookie @session, false
+        assert_not_includes line, 'Expires'
+
+        init_configure_with :session, :expires, 30 * 60
+        line = Session.encode_set_cookie @session, false
+        assert_includes line, '; Expires='
+      end
+
+      it "raises for unkown keys" do
+        assert_raise RuntimeError do
+          init_configure_with :session, :ciphre_key, 'adsf'
+        end
+      end
+
+      def init_configure_with *options
+        Config.configure do
+          reset
+          set *options
+        end
+        Session.init
+      end
+    end
+
     context "no cipher" do
       before :all do
-        Config['session', 'cipher_key'] = nil
+        Config.configure do
+          reset
+          set 'session', 'cipher_key', nil
+        end
         Session.init
       end
 
       it "should encode and decode" do
         cookie = {}
         session = {'hello' => 'world'}
-        Session.encode session, cookie
+        Session.encode_to_cookie session, cookie
 
-        assert_includes cookie[Session.name], 'world'
+        session_data = cookie[Session.name].split('/')[1]
+        assert_includes Base64.urlsafe_decode64(session_data), 'world'
 
         session2 = Session.decode cookie
         assert_equal 'world', session2[:hello]
@@ -22,7 +78,7 @@ module Nyara
       it "drops bad signature" do
         cookie = {}
         session = {'hello' => 'world'}
-        Session.encode session, cookie
+        Session.encode_to_cookie session, cookie
 
         cookie[Session.name].sub!(/\w/, &:swapcase)
 
@@ -33,16 +89,22 @@ module Nyara
 
     context "with cipher" do
       before :all do
-        Config['session', 'cipher_key'] = "some cipher key"
+        Config.configure do
+          reset
+          set 'session', 'cipher_key', "some cipher key"
+        end
         Session.init
       end
 
       it "encode and decode" do
         cookie = {}
         session = {'hello' => 'world'}
-        Session.encode session, cookie
+        Session.encode_to_cookie session, cookie
 
-        assert_not_includes cookie[Session.name], 'world'
+        session_data = cookie[Session.name].split('/')[1]
+        if session_data
+          assert_not_includes Base64.urlsafe_decode64(session_data), 'world'
+        end
 
         session2 = Session.decode cookie
         assert_equal 'world', session2[:hello]

data/spec/spec_helper.rb

@@ -7,15 +7,18 @@ require "erb"
 require "haml"
 require "liquid"
 require "open-uri"
+require "base64"
 require 'pp'
 
 if ENV['COVERAGE']
   require "simplecov"
   SimpleCov.start do
+    coverage_dir '.coverage'
     add_group 'lib', 'lib'
   end
 end
 require_relative "../lib/nyara/nyara"
+require_relative "../lib/nyara/test"
 
 RSpec.configure do |config|
   config.expect_with :stdlib

data/spec/test_spec.rb

@@ -0,0 +1,58 @@
+require_relative "spec_helper"
+
+class TestController < Nyara::Controller
+  meta '#index'
+  get '/' do
+    content_type 'txt'
+    send_string '初めまして from test'
+  end
+
+  meta '#create'
+  post '/create' do
+    redirect_to '#index'
+  end
+end
+
+class MyTest
+  include Nyara::Test
+end
+
+module Nyara
+  describe Nyara::Test do
+    before :all do
+      configure do
+        reset
+        set :env, 'test'
+        map '/', TestController
+      end
+      Nyara.setup
+      @test = MyTest.new
+    end
+
+    it "response" do
+      @test.get "/", {'Xample' => 'résumé'}
+      assert @test.response.success?
+      assert_equal 'résumé', @test.request.header['Xample']
+      assert_equal '初めまして from test', @test.response.body
+      assert_equal 'text/plain; charset=UTF-8', @test.response.header['Content-Type']
+    end
+
+    it "redirect" do
+      @test.post @test.path_to('test#create')
+      assert @test.response.success?
+      assert_equal 'http://localhost/', @test.redirect_location
+      @test.follow_redirect
+      assert_equal '/', @test.request.path
+    end
+
+    it "session continuation" do
+      @test.session['a'] = '3'
+      @test.get "/"
+      assert_equal '3', @test.session['a']
+      @test.session['b'] = '4'
+      @test.get "/"
+      assert_equal '4', @test.session['b']
+      assert_equal '3', @test.session['a']
+    end
+  end
+end

data/tools/hello.rb

@@ -1,6 +1,6 @@
 require_relative "../lib/nyara"
-require "open-uri"
-require "pry"
+# require "open-uri"
+# require "pry"
 
 configure do
   # set :env, 'production'
@@ -8,8 +8,16 @@ configure do
 end
 
 get '/' do
-  open 'http://baidu.com', &:read
+  # open 'http://baidu.com', &:read
   send_string 'hello world'
 end
 
+get '/exit' do
+  exit
+end
+
+get '/redi' do
+  redirect '/'
+end
+
 # GC.stress = true