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

data/nyara.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "nyara"
-  s.version = "0.0.1.pre.9"
+  s.version = "0.1.pre.0"
   s.author = "Zete Lui"
   s.email = "nobody@example.com"
   s.homepage = "https://github.com/luikore/nyara"
@@ -20,6 +20,8 @@ Gem::Specification.new do |s|
   s.executables << 'nyara'
   s.extensions = ["ext/extconf.rb"]
   s.rubygems_version = '2.0.3'
+  s.add_runtime_dependency 'tilt', '>= 1.3'
+  s.add_runtime_dependency 'listen', '>= 1.1.3'
 
   s.rdoc_options += %w[
     -v

data/rakefile

@@ -34,7 +34,7 @@ file version_file => ['nyara.gemspec', __FILE__] do
   version = nil
   lines.each do |line|
     if line =~ /s\.version =/
-      version = line[/\d+(\.\d+)*(\.pre\d+)?/]
+      version = line[/\d+(\.\d+)*(\.pre\.\d+)?/]
       break
     end
   end

data/readme.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/luikore/nyara.png)](https://travis-ci.org/luikore/nyara)
 
-- No dependencies, faster than any web framework on rack.
+- Very few runtime dependencies, faster than any web framework on rack.
 - Nonblock but no callback hell, very low CPU and memory usage.
 - Simple usage, and you don't have to make everything non-block.
 - Prefork production server, with signal-based management which enables graceful restart.

data/spec/command_spec.rb

@@ -1,46 +1,50 @@
 require_relative "spec_helper"
 
 module Nyara
-  describe Command do    
+  describe Command do
     it "#help" do
-      assert_include(stdout { Nyara::Command.help },"Usage")
+      assert_include(stdout { Nyara::Command.help }, "Usage")
     end
-    
+
     it "#version" do
-      assert_equal(stdout { Nyara::Command.version }.strip,"Nyara #{Nyara::VERSION}")
+      assert_equal(stdout { Nyara::Command.version }.strip, "Nyara #{Nyara::VERSION}")
     end
-    
+
     describe "#new_project" do
       before :all do
-        @tmp_dir = '/tmp/nyara_test'
-        @old_dir = Dir.pwd
+        @tmp_dir = Dir.mktmpdir 'nyara'
+        @old_dir = File.dirname __dir__
         FileUtils.mkdir_p(@tmp_dir)
-        Dir.chdir(@tmp_dir)
-        
         @app_name = "app_#{Time.now.to_i}"
+        @stdout = stdout do
+          Dir.chdir @tmp_dir do
+            Nyara::Command.new_project(@app_name)
+          end
+        end
       end
-      
+
       after :all do
         FileUtils.rm_rf(@tmp_dir)
-        Dir.chdir(@old_dir)
       end
-      
+
       describe "should create app dir" do
-        
-        
         it "should run finish" do
-          a = stdout { Nyara::Command.new_project(@app_name) }
-          assert_include(a,"Enjoy!")
+          assert_include(@stdout, "Enjoy!")
+        end
+
+        it "should copy same files into new dir" do
+          des_files = filter_files Dir.glob(File.join @tmp_dir, @app_name, "**/*")
+          assert_not_equal(des_files.count, 0)
+          src_files = filter_files Dir.glob("#{@old_dir}/lib/nyara/templates/**/*")
+          assert_equal(des_files.count, src_files.count)
         end
-        
-        
-        it "should copy same files in to new dir" do
-          des_files = Dir.glob("./#{@app_name}/**/*")
-          assert_not_equal(des_files.count,0)
-          assert_equal(des_files.count,Dir.glob("#{@old_dir}/lib/nyara/templates/**/*").count)
+
+        def filter_files files
+          files.select do |f|
+            File.basename(f) !~ /\.DS_Store|\.gitignore|session\.key/
+          end
         end
       end
-  
     end
   end
-end
+end

data/spec/config_spec.rb

@@ -37,7 +37,7 @@ module Nyara
     it "views and public default" do
       Config[:root] = '/root'
       Config.init
-      assert_equal '/root/public', Config['public']
+      assert_equal nil, Config['public']
       assert_equal '/root/views', Config['views']
     end
 
@@ -97,6 +97,17 @@ module Nyara
       Config.reset
     end
 
+    it "root helpers" do
+      Config.init
+      assert_equal Dir.pwd, Config.root
+      Config.set :root, 'aaa'
+      assert_equal 'aaa', Config.root
+      Config.configure do
+        set :root,'bbb'
+      end
+      assert_equal 'bbb', Config.root
+    end
+
     it "creates logger" do
       assert Nyara.logger
     end
@@ -106,5 +117,17 @@ module Nyara
       Config.init
       assert_nil Nyara.logger
     end
+
+    it "auto load file" do
+      Config.configure do
+        set :env, 'test'
+        set :root, File.join(__dir__, 'dummy')
+        set :app_files, 'app/**/*.rb'
+      end
+      Config.init
+      Nyara.load_app
+      assert_equal true, Object.const_defined?('DummyModel')
+      assert_equal true, Object.const_defined?('DummyController')
+    end
   end
 end

data/spec/dummy/app/controllers/dummy_controller.rb

@@ -0,0 +1,2 @@
+class DummyController
+end

data/spec/dummy/app/models/dmmy_model.rb

@@ -0,0 +1,2 @@
+class DummyModel
+end

data/spec/evented_io_spec.rb

@@ -7,7 +7,8 @@ module Nyara
       @server = fork do
         exec 'ruby', __dir__ + '/apps/connect.rb'
       end
-      sleep 1 # wait for server startup
+      GC.stress = false
+      sleep 1.8 # wait for server startup
     end
 
     after :all do

data/spec/ext_route_spec.rb

@@ -58,13 +58,13 @@ module Nyara
       scope, cont, args = Ext.lookup_route 'GET', '/hello/3world', nil
       assert_equal @e1.scope, scope
       assert_equal @e1.controller, cont
-      assert_equal [3, :'#1'], args
+      assert_equal [:'#1', 3], args
 
       scope, _ = Ext.lookup_route 'GET', '/world', nil
       assert_equal nil, scope
 
       scope, _, args = Ext.lookup_route 'GET', '/a目录/2013-6-1', nil
-      assert_equal [2013, 6, 1, :'#dir'], args
+      assert_equal [:'#dir', 2013, 6, 1], args
     end
   end
 end

data/spec/flash_spec.rb

@@ -21,5 +21,13 @@ module Nyara
       assert_nil @flash.next['foo']
       assert_empty @session.values.first
     end
+
+    it "#clear" do
+      @flash.now['foo'] = 'foo'
+      @flash.next['bar'] = 'bar'
+      @flash.clear
+      assert_empty @flash.now
+      assert_empty @flash.next
+    end
   end
 end

data/spec/hashes_spec.rb

@@ -10,6 +10,133 @@ module Nyara
       assert_equal true, h.key?('a')
       assert_equal 1, h.size
     end
+
+    context ".split_name" do
+      it "many entries" do
+        assert_equal ['a', 'b', '', '', 'c'], ParamHash.split_name("a[b][][][c]")
+      end
+
+      it "only 1 entry" do
+        assert_equal ['a'], ParamHash.split_name('a')
+      end
+
+      %w(  a[  [  a]  a[b]c  a[[b]  a[[b]]  ).each do |k|
+        it "detects bad key: #{k}" do
+          assert_raise ArgumentError do
+            ParamHash.split_name k
+          end
+        end
+      end
+
+      it "detects empty key" do
+        assert_raise ArgumentError do
+          ParamHash.split_name ''
+        end
+      end
+    end
+
+    it "#nested_aset" do
+      h = ParamHash.new
+      h.nested_aset ['a', '', 'b'], 'c'
+      assert_equal({'a' => [{'b' => 'c'}]}, h)
+    end
+
+    context ".parse_cookie" do
+      it "parses complex cookie" do
+        history = CGI.escape '历史'
+        cookie = "pgv_pvi; pgv_si= ; pgv_pvi=som; sid=1d6c75f0 ; PLHistory=<#{history}>;"
+        h = ParamHash.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 = ParamHash.parse_cookie ParamHash.new, cookie
+        assert_empty h
+      end
+
+      it "parses cookie start with ','" do
+        h = ParamHash.parse_cookie ParamHash.new, ',a'
+        assert_equal 1, h.size
+        assert_equal '', h['a']
+
+        h = ParamHash.parse_cookie ParamHash.new, ' ,b = 1,a'
+        assert_equal 2, h.size
+        assert_equal '', h['a']
+        assert_equal '1', h['b']
+      end
+
+      it "parses cookie end with ';'" do
+        h = ParamHash.parse_cookie ParamHash.new, 'a ;'
+        assert_equal 1, h.size
+        assert_equal '', h['a']
+
+        h = ParamHash.parse_cookie ParamHash.new, 'b = 1; a ;'
+        assert_equal 2, h.size
+        assert_equal '', h['a']
+        assert_equal '1', h['b']
+      end
+
+      it "parses cookie with space around =" do
+
+      end
+
+      it "refuses to parse cookie into HeaderHash" do
+        assert_raise ArgumentError do
+          ParamHash.parse_cookie HeaderHash.new, 'session=3'
+        end
+      end
+    end
+
+    context ".parse_param" do
+      it "parses single char" do
+        h = ParamHash.parse_param ParamHash.new, 'a'
+        assert_equal '', h['a']
+      end
+
+      it "parses str end with '&'" do
+        h = ParamHash.parse_param ParamHash.new, 'a=b&'
+        assert_equal({'a' => 'b'}, h)
+      end
+
+      it "parses str begin with '&'" do
+        h = ParamHash.parse_param ParamHash.new, '&a=b'
+        assert_equal({'a' => 'b'}, h)
+      end
+
+      it "parses param with non-utf-8 chars" do
+        bad_s = CGI.escape "\xE2"
+        h = ParamHash.parse_param ParamHash.new, bad_s
+        assert_equal "", h["\xE2"]
+      end
+
+      it "parses nested kv and preserves hash class" do
+        h = ParamHash.parse_param ParamHash.new, "a[b][]=c"
+        assert_equal({'a' => {'b' => ['c']}}, h)
+        assert_equal ParamHash, h['a'].class
+      end
+
+      it "parses k without v and preserves hash class" do
+        h = ParamHash.parse_param ConfigHash.new, "a%5B%5d[b]"
+        assert_equal({'a' => [{'b' => ''}]}, h)
+        assert_equal Array, h[:a].class
+        assert_equal ConfigHash, h[:a].first.class
+      end
+
+      it "parses blank string" do
+        h = ParamHash.parse_param({}, '')
+        assert h.empty?
+      end
+
+      it "raises for HeaderHash" do
+        assert_raise ArgumentError do
+          ParamHash.parse_param(HeaderHash.new, '')
+        end
+      end
+    end
   end
 
   describe HeaderHash do

data/spec/integration_spec.rb

@@ -15,6 +15,7 @@ class TestController < Nyara::Controller
 
   meta '#create'
   post '/create' do
+    set_header 'partial', partial('_partial').strip
     redirect_to '#index'
   end
 
@@ -37,6 +38,12 @@ class TestController < Nyara::Controller
     view.end
   end
 
+  http :trace, '/stream-with-partial' do
+    view = stream erb: "before:<%= partial '_partial_with_yield' %>:after"
+    view.resume
+    view.end
+  end
+
   options '/error' do
     raise 'error'
   end
@@ -53,6 +60,7 @@ module Nyara
         reset
         map '/', TestController
         set :root, __dir__
+        set :public, 'public'
         set :logger, false
       end
       Nyara.setup
@@ -78,6 +86,7 @@ module Nyara
 
     it "redirect" do
       @test.post @test.path_to('test#create')
+      assert_equal 'This is a partial', @test.response.header['Partial']
       assert @test.response.success?
       assert_equal 'http://localhost:3000/', @test.redirect_location
       @test.follow_redirect
@@ -110,6 +119,12 @@ module Nyara
       assert_include @test.response.body, "slim:edit"
     end
 
+    it "stream-with-yield" do
+      @test.http :trace, '/stream-with-partial'
+      assert @test.response.success?
+      assert_equal "before:yield:after", @test.response.body.strip
+    end
+
     it "error" do
       @test.options '/error'
       assert_equal 500, @test.response.status

data/spec/path_helper_spec.rb

@@ -2,7 +2,11 @@ require_relative "spec_helper"
 
 class FooController < Nyara::Controller
   meta '#index'
-  get '/%d' do |id|
+  get '/%.5d' do |id|
+  end
+
+  meta '#put'
+  put '/' do
   end
 
   class BarController < Nyara::Controller
@@ -36,7 +40,7 @@ module Nyara
     context '#path_to' do
       it "local query" do
         c = FooController.new :stub_request
-        assert_equal '/12', c.path_to('#index', 12)
+        assert_equal '/00012', c.path_to('#index', 12)
         assert_raise ArgumentError do
           c.path_to '#index'
         end
@@ -59,13 +63,21 @@ module Nyara
       end
 
       it "perserves _method query" do
-        pending
+        c = FooController.new :stub_request
+        path = c.path_to('#put')
+        assert_equal '/?_method=PUT', path
+
+        path = c.path_to('#put', :_method => 'POST')
+        assert_equal '/?_method=POST', path
+
+        path = c.path_to('#put', '_method' => nil)
+        assert_equal '/?_method=', path
       end
 
       it "appends format and query" do
         c = FooController.new :stub_request
         generated = c.path_to '#index', 1, format: 'js', 'utm_source' => 'a spam'
-        assert_equal "/1.js?utm_source=a+spam", generated
+        assert_equal "/00001.js?utm_source=a+spam", generated
       end
     end
 
@@ -78,7 +90,7 @@ module Nyara
         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')
+        assert_equal 'https://localhost:4567/00001', c.url_to('foo#index', 1, scheme: 'https', host: 'localhost:4567')
       end
     end
   end

data/spec/performance/escape.rb

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