nyara 0.0.1.pre.8 → 0.0.1.pre.9

data/spec/integration_spec.rb

@@ -1,6 +1,12 @@
 require_relative "spec_helper"
 
 class TestController < Nyara::Controller
+  attr_reader :before_invoked
+
+  before ":delete" do
+    @before_invoked = true
+  end
+
   meta '#index'
   get '/' do
     content_type 'txt'
@@ -12,6 +18,11 @@ class TestController < Nyara::Controller
     redirect_to '#index'
   end
 
+  post '/upload' do
+    params
+    # no response
+  end
+
   put '/send_file/%z' do |name|
     send_file Nyara.config.views_path name
   end
@@ -19,6 +30,16 @@ class TestController < Nyara::Controller
   delete '/render' do
     render 'edit.slim'
   end
+
+  patch '/stream' do
+    view = stream 'edit.slim'
+    view.resume
+    view.end
+  end
+
+  options '/error' do
+    raise 'error'
+  end
 end
 
 class MyTest
@@ -30,14 +51,23 @@ module Nyara
     before :all do
       configure do
         reset
-        # set :env, 'test'
         map '/', TestController
         set :root, __dir__
+        set :logger, false
       end
       Nyara.setup
       @test = MyTest.new
     end
 
+    before :each do
+      GC.stress = false
+    end
+
+    it "decodes cookie" do
+      @test.get "/", {"Cookie" => 'foo=bar'}
+      assert_equal 'bar', @test.env.cookie['foo']
+    end
+
     it "response" do
       @test.get "/", {'Xample' => 'résumé'}
       assert @test.response.success?
@@ -64,7 +94,7 @@ module Nyara
       assert_equal '3', @test.session['a']
     end
 
-    it "send file" do
+    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
@@ -75,6 +105,26 @@ module Nyara
       assert_include @test.response.body, "slim:edit"
     end
 
+    it "stream" do
+      @test.patch '/stream'
+      assert_include @test.response.body, "slim:edit"
+    end
+
+    it "error" do
+      @test.options '/error'
+      assert_equal 500, @test.response.status
+      assert_equal false, @test.response.success?
+    end
+
+    it "multipart upload" do
+      data = File.binread(__dir__ + '/raw_requests/multipart')
+      @test.env.process_request_data data
+      param = @test.env.request.param
+      assert_equal 'foo', param['foo']
+      assert_equal 'bar', param['bar']['data']
+      assert_equal 'baz', param['baz']['你好']['data']
+    end
+
     context "public static content" do
       it "found file" do
         @test.get "/index.html"
@@ -98,5 +148,16 @@ module Nyara
         assert_equal 404, @test.response.status
       end
     end
+
+    context "before / after" do
+      it "invokes lifecycle callback" do
+        @test.get '/'
+        assert_nil @test.env.controller.before_invoked
+        assert @test.request.message_complete?
+
+        @test.delete "/render"
+        assert @test.env.controller.before_invoked
+      end
+    end
   end
 end

data/spec/{part_spec.rb → multipart_spec.rb}

@@ -1,6 +1,18 @@
 require_relative "spec_helper"
 
 module Nyara
+  describe Ext do
+    it ".parse_multipart_boundary" do
+      header = HeaderHash.new
+      boundary = Ext.parse_multipart_boundary header
+      assert_nil boundary
+
+      header['Content-Type'] = 'multipart/form-data; boundary=----WebKitFormBoundaryn3ghstHtZs1Z3VTi'
+      boundary = Ext.parse_multipart_boundary header
+      assert_equal '------WebKitFormBoundaryn3ghstHtZs1Z3VTi', boundary
+    end
+  end
+
   describe Part do
     it "bottom case" do
       p = Part.new({})
@@ -48,5 +60,11 @@ module Nyara
       p.final
       assert_equal "a \x3F \x04", p['data']
     end
+
+    it "inspec and pp helpers" do
+      p = Part.new Hash.new
+      p.inspect
+      p.pretty_inspect
+    end
   end
 end

data/spec/raw_requests/multipart

@@ -0,0 +1,20 @@
+POST /upload HTTP/1.1
+Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
+Content-Length: 431
+Content-Type: multipart/form-data; boundary=----WebKitFormBoundarykkJ0CDXe4jYnH95C
+
+------WebKitFormBoundarykkJ0CDXe4jYnH95C
+Content-Disposition: form-data; name="bar"; filename="bar"
+Content-Type: application/octet-stream
+
+bar
+------WebKitFormBoundarykkJ0CDXe4jYnH95C
+Content-Disposition: form-data; name="baz[你好]"; filename="baz.txt"
+Content-Type: text/plain
+
+baz
+------WebKitFormBoundarykkJ0CDXe4jYnH95C
+Content-Disposition: form-data; name="foo"
+
+foo
+------WebKitFormBoundarykkJ0CDXe4jYnH95C--

data/spec/request_delegate_spec.rb

@@ -56,6 +56,10 @@ module Nyara
         Ext.request_set_fd @request, @server.fileno
       end
 
+      after :each do
+        Ext.request_unset_fd @request
+      end
+
       def receive_header
         @c.send_header
         @server.close_write

data/spec/request_spec.rb

@@ -58,6 +58,14 @@ module Nyara
       assert_equal %w[utf-8 iso-8859-1], @request.accept_charset
     end
 
+    it "#param" do
+      @request_attrs[:method_num] = HTTP_METHODS['POST']
+      @request_attrs[:body] = "foo[bar]=baz"
+      request_set_attrs
+      assert_equal({'foo' => {'bar' => 'baz'}}, @request.param)
+      assert_equal 'baz', @request.param[:foo][:bar]
+    end
+
     def request_set_attrs
       Ext.request_set_attrs @request, @request_attrs
     end

data/spec/{route_entry_spec.rb → route_spec.rb}

@@ -1,9 +1,9 @@
 require_relative "spec_helper"
 
 module Nyara
-  describe RouteEntry do
+  describe Route do
     before :each do
-      @r = RouteEntry.new
+      @r = Route.new
     end
 
     it "#compile prefix, suffix and conv" do
@@ -27,7 +27,7 @@ module Nyara
     end
 
     it "#set_accept_exts" do
-      r = RouteEntry.new
+      r = Route.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
@@ -70,5 +70,60 @@ module Nyara
       assert_equal '/', prefix
       assert_equal nil, suffix
     end
+
+    context "#matched_lifecycle_callbacks" do
+      before :each do
+        @r.http_method = HTTP_METHODS['DELETE']
+        @r.classes = %w[.foo .bar]
+        @r.id = '#foo'
+      end
+
+      it "returns empty set when filters empty" do
+        cbs = @r.matched_lifecycle_callbacks({})
+        assert_equal [], cbs
+      end
+
+      it "works" do
+        cbs = @r.matched_lifecycle_callbacks ':DELETE' => [:delete], '#foo' => [:foo], '.bar' => [:bar], '#baz' => [:baz]
+        assert_equal [:delete, :foo, :bar], cbs
+      end
+
+      it "when classes not set" do
+        @r.classes = nil
+        cbs = @r.matched_lifecycle_callbacks ':DELETE' => [:delete], '#foo' => [:foo], '.bar' => [:bar], '#baz' => [:baz]
+        assert_equal [:delete, :foo], cbs
+      end
+    end
+
+    context ".canonicalize_callback_selector" do
+      it "works" do
+        s = Route.canonicalize_callback_selector '#a'
+        assert_equal '#a', s
+        s = Route.canonicalize_callback_selector '.b'
+        assert_equal '.b', s
+      end
+
+      it "checks bad selectors" do
+        assert_raise ArgumentError do
+          Route.canonicalize_callback_selector ''
+        end
+        assert_raise ArgumentError do
+          Route.canonicalize_callback_selector '*'
+        end
+        assert_raise ArgumentError do
+          Route.canonicalize_callback_selector 'a#b'
+        end
+      end
+
+      it "removes classes and pseudo classes after id" do
+        s = Route.canonicalize_callback_selector "#a.b:c"
+        assert_equal '#a', s
+      end
+
+      it "does not remove pseudo class after class, and upcases it" do
+        s = Route.canonicalize_callback_selector ".b:c"
+        assert_equal '.b:C', s
+      end
+    end
   end
 end

data/spec/session_spec.rb

@@ -21,19 +21,19 @@ module Nyara
 
         init_configure_with :session, :secure, false
         line = Session.encode_set_cookie @session, true
-        assert_not_includes line, 'Secure'
+        assert_not_include 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'
+        assert_not_include 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'
+        assert_not_include line, 'Expires'
 
         init_configure_with :session, :expires, 30 * 60
         line = Session.encode_set_cookie @session, false
@@ -107,7 +107,7 @@ module Nyara
 
         session_data = cookie[Session.name].split('/')[1]
         if session_data
-          assert_not_includes Base64.urlsafe_decode64(session_data), 'world'
+          assert_not_include Base64.urlsafe_decode64(session_data), 'world'
         end
 
         session2 = Session.decode cookie

data/spec/spec_helper.rb

@@ -21,6 +21,17 @@ end
 require_relative "../lib/nyara/nyara"
 require_relative "../lib/nyara/test"
 
+def stdout(&block)
+  original_stdout = $stdout
+  $stdout = fake = StringIO.new
+  begin
+    yield
+  ensure
+    $stdout = original_stdout
+  end
+  fake.string
+end
+
 RSpec.configure do |config|
   config.expect_with :stdlib
   if config.formatters.first.class.to_s =~ /TextMate/
@@ -54,9 +65,10 @@ RSpec.configure do |config|
         obj
       end
     end
+  end
 
-  elsif config.formatters.any?{|f|f.class.to_s =~ /Document/}
-    puts "Enabling GC.stress with documentation formatter"
+  if ENV['STRESS']
+    puts "Enabling GC.stress mode"
 
     config.before :each do
       GC.stress = true
@@ -65,10 +77,5 @@ RSpec.configure do |config|
     config.after :each do
       GC.stress = false
     end
-
   end
 end
-
-configure do
-  set :env, 'test'
-end

data/tools/hello.rb

@@ -1,15 +1,17 @@
 require_relative "../lib/nyara/nyara"
 # require "open-uri"
-# require "pry"
+require "pry"
 
 configure do
   # set :env, 'production'
   # set :workers, 3
   map '/', 'my'
+  # set :logger, false
 end
 
 class MyController < Nyara::Controller
   get '/' do
+    p param
     send_string 'hello world'
   end
 
@@ -17,8 +19,24 @@ class MyController < Nyara::Controller
     exit
   end
 
-  get '/redi' do
-    redirect '/'
+  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
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: nyara
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.8
+  version: 0.0.1.pre.9
 platform: ruby
 authors:
 - Zete Lui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-07-13 00:00:00.000000000 Z
 dependencies: []
-description: Fast, slim and fuzzy ruby web framework + server, based on preforked
-  event queue and Fiber. NO rack NOR eventmachine are used.
+description: Fast and fuzzy ruby web framework + server
 email: nobody@example.com
-executables: []
+executables:
+- nyara
 extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
@@ -21,11 +21,14 @@ files:
 - rakefile
 - nyara.gemspec
 - 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/config.rb
 - lib/nyara/controller.rb
 - lib/nyara/controllers/public_controller.rb
@@ -47,8 +50,12 @@ files:
 - lib/nyara/patches/to_query.rb
 - lib/nyara/request.rb
 - lib/nyara/route.rb
-- lib/nyara/route_entry.rb
 - lib/nyara/session.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
@@ -57,7 +64,9 @@ files:
 - lib/nyara/view_handlers/slim.rb
 - lib/nyara.rb
 - spec/apps/connect.rb
+- spec/command_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
@@ -67,7 +76,7 @@ files:
 - spec/hashes_spec.rb
 - spec/integration_spec.rb
 - spec/mini_support_spec.rb
-- spec/part_spec.rb
+- spec/multipart_spec.rb
 - spec/path_helper_spec.rb
 - spec/performance/escape.rb
 - spec/performance/layout_render.rb
@@ -77,7 +86,7 @@ files:
 - spec/performance_spec.rb
 - spec/request_delegate_spec.rb
 - spec/request_spec.rb
-- spec/route_entry_spec.rb
+- spec/route_spec.rb
 - spec/session_spec.rb
 - spec/spec_helper.rb
 - spec/url_encoded_spec.rb
@@ -117,6 +126,7 @@ files:
 - 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
@@ -127,12 +137,33 @@ files:
 - 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
+- bin/nyara
 homepage: https://github.com/luikore/nyara
 licenses:
 - BSD 3-Clause
 metadata: {}
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- -v
+- --markup=markdown
+- --main
+- readme.md
+- --line-numbers
+- -x
+- ext/http-parser/.*
+- -x
+- ext/multipart-parser-c/.*
+- -x
+- ext/inc/.*
+- -x
+- .*\.o
+- -x
+- .*\.bundle
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -150,5 +181,6 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Fast, slim and fuzzy ruby web framework + server
+summary: Fast and fuzzy ruby web framework + server
 test_files: []
+has_rdoc: 

data/lib/nyara/route_entry.rb

@@ -1,111 +0,0 @@
-module Nyara
-  class RouteEntry
-    REQUIRED_ATTRS = [:http_method, :scope, :prefix, :suffix, :controller, :id, :conv]
-    attr_reader *REQUIRED_ATTRS
-    attr_writer :http_method, :id
-    # stores symbol for C conenience, and returns string for Ruby side goodness
-    def id
-      @id.to_s
-    end
-
-    # optional
-    attr_accessor :accept_exts, :accept_mimes
-
-    # tmp
-    attr_accessor :path, :blk
-
-    def initialize &p
-      instance_eval &p if p
-    end
-
-    def path_template
-      File.join @scope, (@path.gsub '%z', '%s')
-    end
-
-    # compute prefix, suffix, conv
-    # NOTE route_entries may be inherited, so late-setting controller is necessary
-    def compile controller, scope
-      @controller = controller
-      @scope = scope
-
-      path = scope.sub /\/?$/, @path
-      if path.empty?
-        path = '/'
-      end
-      @prefix, suffix = analyse_path path
-      @suffix, @conv = compile_re suffix
-    end
-
-    # compute accept_exts, accept_mimes
-    def set_accept_exts a
-      @accept_exts = {}
-      @accept_mimes = []
-      if a
-        a.each do |e|
-          e = e.to_s.dup.freeze
-          @accept_exts[e] = true
-          if MIME_TYPES[e]
-            v1, v2 = MIME_TYPES[e].split('/')
-            raise "bad mime type: #{MIME_TYPES[e].inspect}" if v1.nil? or v2.nil?
-            @accept_mimes << [v1, v2, e]
-          end
-        end
-      end
-      @accept_mimes = nil if @accept_mimes.empty?
-      @accept_exts = nil if @accept_exts.empty?
-    end
-
-    def validate
-      REQUIRED_ATTRS.each do |attr|
-        unless instance_variable_get("@#{attr}")
-          raise ArgumentError, "missing #{attr}"
-        end
-      end
-      raise ArgumentError, "id must be symbol" unless @id.is_a?(Symbol)
-    end
-
-    # private
-
-    # returns [str_re, conv]
-    def compile_re suffix
-      return ['', []] unless suffix
-      conv = []
-      re_segs = suffix.split(/(?<=%[dfsuxz])|(?=%[dfsuxz])/).map do |s|
-        case s
-        when '%d'
-          conv << :to_i
-          '(-?[0-9]+)'
-        when '%f'
-          conv << :to_f
-          # just copied from scanf
-          '([-+]?(?:0[xX](?:\.\h+|\h+(?:\.\h*)?)[pP][-+]\d+|\d+(?![\d.])|\d*\.\d*(?:[eE][-+]?\d+)?))'
-        when '%u'
-          conv << :to_i
-          '([0-9]+)'
-        when '%x'
-          conv << :hex
-          '(\h+)'
-        when '%s'
-          conv << :to_s
-          '([^/]+)'
-        when '%z'
-          conv << :to_s
-          '(.*)'
-        else
-          Regexp.quote s
-        end
-      end
-      ["^#{re_segs.join}$", conv]
-    end
-
-    # split the path into 2 parts: <br>
-    # fixed prefix and variable suffix
-    def analyse_path path
-      raise 'path must contain no new line' if path.index "\n"
-      raise 'path must start with /' unless path.start_with? '/'
-      path = path.sub(/\/$/, '') if path != '/'
-
-      path.split(/(?=%[dfsuxz])/, 2)
-    end
-  end
-end