nyara 0.1.pre.0 → 0.1.pre.1

data/spec/hashes_spec.rb

@@ -21,14 +21,14 @@ module Nyara
       end
 
       %w(  a[  [  a]  a[b]c  a[[b]  a[[b]]  ).each do |k|
-        it "detects bad key: #{k}" do
+        it "does not accept bad key: #{k}" do
           assert_raise ArgumentError do
             ParamHash.split_name k
           end
         end
       end
 
-      it "detects empty key" do
+      it "does not accept empty key" do
         assert_raise ArgumentError do
           ParamHash.split_name ''
         end
@@ -37,7 +37,7 @@ module Nyara
 
     it "#nested_aset" do
       h = ParamHash.new
-      h.nested_aset ['a', '', 'b'], 'c'
+      h.send :nested_aset, ['a', '', 'b'], 'c'
       assert_equal({'a' => [{'b' => 'c'}]}, h)
     end
 
@@ -73,17 +73,15 @@ module Nyara
         h = ParamHash.parse_cookie ParamHash.new, 'a ;'
         assert_equal 1, h.size
         assert_equal '', h['a']
+      end
 
+      it "parses cookie with space around =" do
         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'
@@ -113,29 +111,55 @@ module Nyara
         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
+      it "does not accept HeaderHash" do
         assert_raise ArgumentError do
           ParamHash.parse_param(HeaderHash.new, '')
         end
       end
+
+      context "nested" do
+        it "parses nested kv and output with ParamHash" 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 output 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 "increases array index when there's existing key" do
+          h = ParamHash.parse_param({}, %w'
+            a[][foo]=0
+            a[][foo]=1
+            a[][bar]=1
+            a[][foo]=2
+          '.join('&'))
+          assert_equal({"a"=>[{"foo"=>"0"}, {"foo"=>"1", "bar"=>"1"}, {"foo"=>"2"}]}, h)
+        end
+
+        it "raises error for conflict key" do
+          assert_raise TypeError do
+            ParamHash.parse_param({}, 'a[a]=1&a[]=1')
+          end
+        end
+
+        it "raises error for conflict key in 2 parses" do
+          h = {}
+          ParamHash.parse_param(h, 'a[a]=1')
+          assert_raise TypeError do
+            ParamHash.parse_param(h, 'a[]=1')
+          end
+        end
+      end
     end
   end
 

data/spec/integration_spec.rb

@@ -1,4 +1,5 @@
 require_relative "spec_helper"
+require 'logger'
 
 class TestController < Nyara::Controller
   attr_reader :before_invoked
@@ -15,7 +16,7 @@ class TestController < Nyara::Controller
 
   meta '#create'
   post '/create' do
-    set_header 'partial', partial('_partial').strip
+    set_header 'partial', partial('_partial', locals: { a: '1' }).strip
     redirect_to '#index'
   end
 
@@ -86,13 +87,21 @@ module Nyara
 
     it "redirect" do
       @test.post @test.path_to('test#create')
-      assert_equal 'This is a partial', @test.response.header['Partial']
+      assert_equal 'This is a partial 1', @test.response.header['Partial']
       assert @test.response.success?
       assert_equal 'http://localhost:3000/', @test.redirect_location
       @test.follow_redirect
       assert_equal '/', @test.request.path
     end
 
+    it "post params log output" do
+      data = { name: 1, sex: 0 }
+      Nyara.config.stub(:logger).and_return(Logger.new($stdout))
+      out = capture(:stdout) { @test.post @test.path_to('test#create'), {}, data }
+      # puts out
+      assert_include out, 'params: {"name"=>"1", "sex"=>"0"}'
+    end
+
     it "session continuation" do
       @test.session['a'] = '3'
       @test.get "/"
@@ -162,6 +171,23 @@ module Nyara
         @test.get "/empty"
         assert_equal 404, @test.response.status
       end
+
+      it "found test.css and text/css content_type" do
+        @test.get "/test.css"
+        assert_equal "test css", @test.response.body
+        assert_include @test.response.header['Content-Type'],"text/css"
+      end
+
+      it "found test.js" do
+        @test.get "/test.js"
+        assert_equal "test js", @test.response.body
+        assert_include @test.response.header['Content-Type'],"application/javascript"
+      end
+
+      it "found test.jpg" do
+        @test.get "/test.jpg"
+        assert_include @test.response.header['Content-Type'],"image/jpeg"
+      end
     end
 
     context "before / after" do

data/spec/path_helper_spec.rb

@@ -79,6 +79,13 @@ module Nyara
         generated = c.path_to '#index', 1, format: 'js', 'utm_source' => 'a spam'
         assert_equal "/00001.js?utm_source=a+spam", generated
       end
+      
+      it "raise info with wrong route" do
+        c = FooController.new :stub_request
+        assert_raise ArgumentError do
+          c.path_to('#aksdgjajksdg')
+        end
+      end
     end
 
     context '#url_to' do

data/spec/performance_spec.rb

@@ -25,7 +25,7 @@ describe 'performance' do
 
   it "[parse_param] faster than parse in pure ruby" do
     res = bm 'parse_param'
-    assert res[:nyara] * 7 < res[:ruby], res.inspect
+    assert res[:nyara] * 5 < res[:ruby], res.inspect
   end
 
   it "[layout_render] nearly as fast as using tilt..." do

data/spec/public/test.css

@@ -0,0 +1 @@
+test css

data/spec/public/test.js

@@ -0,0 +1 @@
+test js

data/spec/reload_spec.rb

@@ -0,0 +1,50 @@
+require_relative "spec_helper"
+require_relative "../lib/nyara/reload"
+
+module Nyara
+  describe Reload do
+    before :all do
+      GC.stress = false
+      @reload_root = ENV['RELOAD_ROOT'] = Dir.mktmpdir 'root'
+      Dir.mkdir @reload_root + '/views'
+      touch_files 'app before', 'views before'
+      @server = fork do
+        Dir.chdir __dir__ + '/apps' do
+          exec "ruby reload.rb"
+        end
+      end
+      sleep 2
+    end
+
+    def touch_files app_content, views_content
+      File.open @reload_root + '/reloadee.rb', 'w' do |f|
+        f << 'RELOADEE = ' << app_content.inspect
+      end
+      File.open @reload_root + '/views/index.slim', 'w' do |f|
+        f << '== ' << views_content.inspect
+      end
+    end
+
+    after :all do
+      Process.kill :TERM, @server
+      sleep 0.2
+      Process.kill :KILL, @server
+    end
+
+    it "reloads" do
+      GC.stress = false
+      data = open 'http://localhost:3004/app', &:read
+      assert_equal 'app before', data
+      data = open 'http://localhost:3004/views', &:read
+      assert_equal 'views before', data
+
+      touch_files 'app after', 'views after'
+      sleep 1.2
+
+      data = open 'http://localhost:3004/views', &:read
+      assert_equal 'views after', data
+      data = open 'http://localhost:3004/app', &:read
+      assert_equal 'app after', data
+    end
+  end
+end

data/spec/route_spec.rb

@@ -15,7 +15,7 @@ module Nyara
 
       @r.path = '/'
       @r.compile :controller_stub, '/scope'
-      assert_equal '/scope', @r.prefix
+      assert_equal '/scope/', @r.prefix
       assert_equal '', @r.suffix
       assert_equal [], @r.conv
 
@@ -59,7 +59,7 @@ module Nyara
     end
 
     it "#analyse_path" do
-      r = @r.analyse_path '/hello/%d-world%u/%s/'
+      r = @r.analyse_path '/hello/%d-world%u/%s'
       assert_equal ['/hello/', '%d-world%u/%s'], r
 
       prefix, suffix = @r.analyse_path '/hello'
@@ -127,8 +127,8 @@ module Nyara
     end
 
     it ".print_routes" do
-      out = stdout { Route.print_routes }
-      assert_include(out, "all routes:")
+      out = capture(:stdout) { Route.print_routes }
+      assert_include(out, "All routes:")
     end
   end
 end

data/spec/spec_helper.rb

@@ -20,16 +20,22 @@ if ENV['COVERAGE']
 end
 require_relative "../lib/nyara/nyara"
 require_relative "../lib/nyara/test"
+require_relative "../lib/nyara/command"
 
-def stdout(&block)
-  original_stdout = $stdout
-  $stdout = fake = StringIO.new
-  begin
-    yield
-  ensure
-    $stdout = original_stdout
-  end
-  fake.string
+def capture(stream)
+  stream = stream.to_s
+  captured_stream = Tempfile.new(stream)
+  stream_io = eval("$#{stream}")
+  origin_stream = stream_io.dup
+  stream_io.reopen(captured_stream)
+
+  yield
+
+  stream_io.rewind
+  return captured_stream.read
+ensure
+  captured_stream.unlink
+  stream_io.reopen(origin_stream)
 end
 
 RSpec.configure do |config|

data/spec/url_encoded_spec.rb

@@ -33,6 +33,11 @@ module Nyara
         assert_equal '', v
       end
 
+      it "with escaped chars" do
+        k, v = Ext.decode_uri_kv "[b+]"
+        assert_equal '[b ]', k
+      end
+
       it "raises for bad kv" do
         assert_raise ArgumentError do
           Ext.decode_uri_kv 'a=&b'

data/spec/view_spec.rb

@@ -47,11 +47,18 @@ module Nyara
       assert_raise ArgumentError do
         render 'edit', nil, nil, {}
       end
+      
       render 'edit.slim', nil, nil, {}
       assert_equal "<div>slim:edit</div>", @instance.result.gsub(/\s/, '')
       render 'edit.haml', nil, nil, {}
       assert_equal "<div>haml:edit</div>", @instance.result.gsub(/\s/, '')
     end
+    
+    it "raises error with template not found" do
+      assert_raise ArgumentError do
+        render 'asdgasdgasdg'
+      end
+    end
 
     context "fallback to tilt" do
       it "inline render" do

data/spec/views/_partial.slim

@@ -1 +1 @@
-| This is a partial
+| This is a partial #{a}

data/tools/bug.rb

@@ -0,0 +1,53 @@
+require_relative "../lib/nyara/nyara"
+
+configure do
+  map '/posts', 'posts'
+end
+
+class ApplicationController < Nyara::Controller
+
+end
+
+class PostsController < ApplicationController
+  meta '#index'
+  get '/' do
+    send_string 'index'
+  end
+
+  meta '#show'
+  get '/%u' do |id|
+    @post = Post.find(id)
+    render "posts/show"
+  end
+
+  meta '#new'
+  get '/new' do
+    @post = Post.new
+    render "posts/new"
+  end
+
+  meta '#create'
+  post '/' do
+    @post = Post.new(params[:post])
+    if @post.save
+      success "Post created."
+      redirect_to 'posts#show', @post.id
+    else
+      render "posts/new"
+    end
+  end
+
+  meta '#edit'
+  get '/%u/edit' do
+    @post = Post.find(id)
+    render 'posts/edit'
+  end
+
+  meta '#update'
+  post '/%u' do |id|
+    @post = Post.find(id)
+  end
+end
+
+Nyara.setup
+Nyara.start_server

data/tools/hello.rb

@@ -0,0 +1,49 @@
+require_relative "../lib/nyara/nyara"
+# require "open-uri"
+require "pry"
+
+configure do
+  # set :env, 'production'
+  # set :workers, 3
+  map '/', 'my'
+  set :root, __dir__
+  set :public, '/'
+  # set :logger, false
+end
+
+class MyController < Nyara::Controller
+  get '/' do
+    # p param
+    raise 'a'
+    send_string 'hello world'
+  end
+
+  get '/exit' do
+    exit
+  end
+
+  get '/form' do
+    send_string <<-HTML
+    <form action="/form" enctype="multipart/form-data" method="post" accept-charset="utf-8">
+      bar
+      <input type="file" name="bar">
+      <br>
+      baz
+      <input type="file" name="baz[你好]">
+      <br>
+      foo<input name="foo">
+      <br>
+    </form>
+    HTML
+  end
+
+  post '/form' do
+    b = request.body
+    binding.pry
+  end
+end
+
+Nyara.setup
+Nyara.start_server
+
+# GC.stress = true