syntropy 0.11 → 0.12

data/test/test_app.rb

@@ -13,11 +13,11 @@ class AppTest < Minitest::Test
     @tmp_path = '/test/tmp'
     @tmp_fn = File.join(APP_ROOT, 'tmp.rb')
 
-    @app = Syntropy::App.load(
-      machine: @machine,
-      location: APP_ROOT,
+    @app = Syntropy::App.new(
+      root_dir: APP_ROOT,
       mount_path: '/test',
-      watch_files: 0.05
+      watch_files: 0.05,
+      machine: @machine
     )
   end
 
@@ -28,13 +28,17 @@ class AppTest < Minitest::Test
   end
 
   def test_app_rendering
+    # puts "*" * 40
+    # pp @app.routing_tree.root
+    # puts
+
     req = make_request(':method' => 'GET', ':path' => '/')
-    assert_equal 'Not found', req.response_body
     assert_equal Status::NOT_FOUND, req.response_status
+    assert_equal 'Not found', req.response_body
 
     req = make_request(':method' => 'HEAD', ':path' => '/')
-    assert_nil req.response_body
     assert_equal Status::NOT_FOUND, req.response_status
+    assert_nil req.response_body
 
     req = make_request(':method' => 'POST', ':path' => '/')
     assert_equal 'Not found', req.response_body
@@ -52,21 +56,6 @@ class AppTest < Minitest::Test
     assert_equal Status::METHOD_NOT_ALLOWED, req.response_status
     assert_nil req.response_body
 
-    req = make_request(':method' => 'GET', ':path' => '/test/index')
-    assert_equal '<h1>Hello, world!</h1>', req.response_body
-
-    req = make_request(':method' => 'GET', ':path' => '/test/index.html')
-    assert_equal '<h1>Hello, world!</h1>', req.response_body
-    assert_equal 'text/html', req.response_headers['Content-Type']
-
-    req = make_request(':method' => 'HEAD', ':path' => '/test/index.html')
-    assert_nil req.response_body
-    assert_equal 'text/html', req.response_headers['Content-Type']
-
-    req = make_request(':method' => 'POST', ':path' => '/test/index.html')
-    assert_nil req.response_body
-    assert_equal Status::METHOD_NOT_ALLOWED, req.response_status
-
     req = make_request(':method' => 'GET', ':path' => '/test/assets/style.css')
     assert_equal '* { color: beige }', req.response_body
     assert_equal 'text/css', req.response_headers['Content-Type']
@@ -126,17 +115,20 @@ class AppTest < Minitest::Test
 
     req = make_request(':method' => 'GET', ':path' => '/test/about/foo/bar')
     assert_equal Status::NOT_FOUND, req.response_status
+
+    req = make_request(':method' => 'GET', ':path' => '/test/params/abc')
+    assert_equal '/test/params/[foo]-abc', req.response_body.chomp
   end
 
   def test_app_file_watching
-    @machine.sleep 0.2
+    @machine.sleep 0.3
 
     req = make_request(':method' => 'GET', ':path' => @tmp_path)
     assert_equal 'foo', req.response_body
 
     orig_body = IO.read(@tmp_fn)
     IO.write(@tmp_fn, orig_body.gsub('foo', 'bar'))
-    @machine.sleep(0.5)
+    @machine.sleep(0.3)
 
     req = make_request(':method' => 'GET', ':path' => @tmp_path)
     assert_equal 'bar', req.response_body
@@ -166,7 +158,7 @@ class CustomAppTest < Minitest::Test
     @machine = UM.new
     @app = Syntropy::App.load(
       machine: @machine,
-      location: APP_ROOT,
+      root_dir: APP_ROOT,
       mount_path: '/'
     )
   end
@@ -193,7 +185,7 @@ class MultiSiteAppTest < Minitest::Test
     @machine = UM.new
     @app = Syntropy::App.load(
       machine: @machine,
-      location: APP_ROOT,
+      root_dir: APP_ROOT,
       mount_path: '/'
     )
   end

data/test/test_errors.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class ErrorsTest < Minitest::Test
+  ISE = Qeweney::Status::INTERNAL_SERVER_ERROR
+
+  def test_error_http_status_class_method
+    e = RuntimeError.new
+    assert_equal ISE, Syntropy::Error.http_status(e)
+
+    e = Syntropy::Error.new
+    assert_equal ISE, Syntropy::Error.http_status(e)
+
+    e = Syntropy::Error.new(Qeweney::Status::UNAUTHORIZED)
+    assert_equal Qeweney::Status::UNAUTHORIZED, Syntropy::Error.http_status(e)
+  end
+
+  def test_method_not_allowed_error
+    e = Syntropy::Error.method_not_allowed('foo')
+    assert_kind_of Syntropy::Error, e
+    assert_equal Qeweney::Status::METHOD_NOT_ALLOWED, e.http_status
+    assert_equal 'foo', e.message
+  end
+
+  def test_not_found_error
+    e = Syntropy::Error.not_found('bar')
+    assert_kind_of Syntropy::Error, e
+    assert_equal Qeweney::Status::NOT_FOUND, e.http_status
+    assert_equal 'bar', e.message
+  end
+
+  def test_validation_error
+    e = Syntropy::ValidationError.new('baz')
+    assert_equal Qeweney::Status::BAD_REQUEST, e.http_status
+    assert_equal 'baz', e.message
+  end
+end

data/test/test_request_extensions.rb

@@ -0,0 +1,163 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class MethodValidationTest < Minitest::Test
+  VE = Syntropy::ValidationError
+
+  def test_validate_http_method
+    @req = mock_req(':method' => 'GET', ':path' => '/foo')
+
+    assert_equal 'get', @req.validate_http_method('get', 'head')
+    assert_raises(Syntropy::Error) { @req.validate_http_method('post', 'put') }
+    assert_raises(Syntropy::Error) { @req.validate_http_method() }
+  end
+
+  def test_respond_by_http_method
+    @req = mock_req(':method' => 'GET', ':path' => '/foo')
+
+    @req.respond_by_http_method(
+      'get' => ['GET foo', {}],
+      'post' => ['POST foo', {}]
+    )
+    assert_equal 'GET foo', @req.response_body
+
+    assert_raises(Syntropy::Error) {
+      @req.respond_by_http_method(
+        'post' => ['POST foo', {}]
+      )
+    }
+  end
+end
+
+class ValidationTest < Minitest::Test
+  def setup
+    @req = mock_req(':method' => 'GET', ':path' => '/foo?q=foo&x=bar&y=123&z1=t&z2=f')
+  end
+
+  VE = Syntropy::ValidationError
+
+  def test_validate_param
+    assert_nil @req.validate_param(:azerty, nil)
+    assert_equal 'foo', @req.validate_param(:q)
+    assert_equal 'foo', @req.validate_param(:q, String)
+    assert_equal 'foo', @req.validate_param(:q, [String, nil])
+    assert_nil @req.validate_param(:r, [String, nil])
+
+    assert_equal 123, @req.validate_param(:y, Integer)
+    assert_equal 123, @req.validate_param(:y, Integer, 120..125)
+    assert_equal 123.0, @req.validate_param(:y, Float)
+
+    assert_equal true, @req.validate_param(:z1, :bool)
+    assert_equal false, @req.validate_param(:z2, :bool)
+
+    assert_raises(VE) { @req.validate_param(:azerty, String) }
+    assert_raises(VE) { @req.validate_param(:q, Integer) }
+    assert_raises(VE) { @req.validate_param(:q, Float) }
+    assert_raises(VE) { @req.validate_param(:q, nil) }
+
+    assert_raises(VE) { @req.validate_param(:y, Integer, 1..100) }
+
+    assert_raises(VE) { @req.validate_param(:y, :bool) }
+  end
+
+  def test_validate
+    assert_equal 'foo', @req.validate('foo')
+    assert_raises(VE) { @req.validate(nil) }
+
+    assert_nil          @req.validate(nil, nil)
+    assert_raises(VE) { @req.validate(1, nil) }
+
+    assert_equal 'foo', @req.validate('foo', String)
+    assert_equal 'foo', @req.validate('foo', [String, nil])
+    assert_nil          @req.validate(nil, [String, nil])
+
+    assert_equal 123,   @req.validate('123', Integer)
+    assert_raises(VE) { @req.validate('a123', Integer) }
+    assert_equal 123,   @req.validate('123', Integer, 120..125)
+    assert_raises(VE) { @req.validate('223', Integer, 120..125) }
+    assert_equal 123.0, @req.validate('123.0', Float)
+    assert_equal 123.0, @req.validate('123', Float)
+    assert_raises(VE) { @req.validate('123.0', Integer) }
+    assert_raises(VE) { @req.validate('x123.0', Float) }
+    assert_equal 123.0,   @req.validate('123.0', Float, 120..125)
+    assert_raises(VE) { @req.validate('223', Float, 120..125) }
+
+    assert_equal true,  @req.validate('t', :bool)
+    assert_equal false, @req.validate('f', :bool)
+    assert_equal true,  @req.validate('1', :bool)
+    assert_equal false, @req.validate('0', :bool)
+    assert_raises(VE) { @req.validate('foo', :bool) }
+    assert_raises(VE) { @req.validate(nil, :bool) }
+  end
+end
+
+class FormDataTest < Minitest::Test
+  def test_get_form_data_multipart
+    @req = mock_req({
+      ':method' => 'POST',
+      ':path' => '/',
+      'content-type' => 'multipart/form-data; boundary=87654321'
+    }, nil)
+    assert_raises(Syntropy::Error) { @req.get_form_data }
+
+    @req = mock_req({
+      ':method' => 'POST',
+      ':path' => '/',
+      'content-type' => 'multipart/form-data; boundary=87654321'
+    }, "foobar")
+    assert_raises(Syntropy::Error) { @req.get_form_data }
+
+    body = <<~EOF
+      --87654321
+      Content-Disposition: form-data; name="foo"
+
+      barbaz
+      --87654321
+      Content-Disposition: form-data; name="bar"
+
+      BARBAR
+      --87654321--
+    EOF
+
+    @req = mock_req({
+      ':method' => 'POST',
+      ':path' => '/',
+      'content-type' => 'multipart/form-data; boundary=87654321'
+    }, body.gsub("\n", "\r\n"))
+
+    data = @req.get_form_data
+    assert_equal ['bar', 'foo'], data.keys.sort
+
+    assert_equal 'barbaz', data['foo']
+    assert_equal 'BARBAR', data['bar']
+  end
+
+  def test_get_form_data_urlencoded
+    @req = mock_req({
+      ':method' => 'POST',
+      ':path' => '/',
+      'content-type' => 'application/x-www-form-urlencoded'
+    }, nil)
+    assert_raises(Syntropy::Error) { @req.get_form_data }
+
+    @req = mock_req({
+      ':method' => 'POST',
+      ':path' => '/',
+      'content-type' => 'application/x-www-form-urlencoded'
+    }, 'abc')
+    data = @req.get_form_data
+    assert_equal ['abc'], data.keys
+    assert_equal true, data['abc']
+
+    @req = mock_req({
+      ':method' => 'POST',
+      ':path' => '/',
+      'content-type' => 'application/x-www-form-urlencoded'
+    }, 'foo=bar&bar=baz')
+    data = @req.get_form_data
+    assert_equal ['bar', 'foo'], data.keys.sort
+    assert_equal 'bar', data['foo']
+    assert_equal 'baz', data['bar']
+  end
+end