tynn 2.0.0.alpha → 2.0.0.beta1

data/test/plugin_test.rb

@@ -4,7 +4,7 @@ require_relative "helper"
 
 class PluginTest < Minitest::Test
   def setup
-    @app = Class.new(Tynn)
+    @app = new_app
   end
 
   def test_class_methods

data/test/render_test.rb

@@ -2,20 +2,17 @@
 
 require_relative "helper"
 require_relative "../lib/tynn/render"
-require "tilt/erubis"
 
 class RenderTest < Minitest::Test
-  VIEWS_PATH = File.expand_path("views", __dir__)
-
   def setup
-    @app = Class.new(Tynn)
+    @app = new_app
 
-    @app.plugin(Tynn::Render, views: VIEWS_PATH)
+    @app.plugin(Tynn::Render, root: __dir__)
   end
 
   def test_partial
     @app.define do
-      on("partial") do
+      on "partial" do
         res.write(partial("partial", name: "alice"))
       end
     end
@@ -23,12 +20,12 @@ class RenderTest < Minitest::Test
     ts = Tynn::Test.new(@app)
     ts.get("/partial")
 
-    assert_equal "alice", ts.res.body.strip
+    assert_equal "alice", ts.res.body.join.strip
   end
 
   def test_view
     @app.define do
-      on("view") do
+      on "view" do
         res.write(view("view", title: "welcome", name: "alice"))
       end
     end
@@ -36,12 +33,25 @@ class RenderTest < Minitest::Test
     ts = Tynn::Test.new(@app)
     ts.get("/view")
 
-    assert_equal "welcome / alice", ts.res.body.strip
+    assert_equal "welcome / alice", ts.res.body.join.strip
   end
 
   def test_render
     @app.define do
-      on("render") do
+      on "render" do
+        render("view", title: "welcome", name: "alice")
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/render")
+
+    assert_equal "welcome / alice", ts.res.body.join.strip
+  end
+
+  def test_render_content_type
+    @app.define do
+      on "render" do
         render("view", title: "welcome", name: "alice")
       end
     end
@@ -50,12 +60,11 @@ class RenderTest < Minitest::Test
     ts.get("/render")
 
     assert_equal "text/html", ts.res.content_type
-    assert_equal "welcome / alice", ts.res.body.strip
   end
 
   def test_escaping
     @app.define do
-      on("escape") do
+      on "escape" do
         res.write(partial("partial", name: "<a></a>"))
       end
     end
@@ -63,14 +72,14 @@ class RenderTest < Minitest::Test
     ts = Tynn::Test.new(@app)
     ts.get("/escape")
 
-    assert_equal "&lt;a&gt;&lt;/a&gt;", ts.res.body.strip
+    assert_equal "&lt;a&gt;&lt;&#x2F;a&gt;", ts.res.body.join.strip
   end
 
   def test_custom_layout
     @app.set(:render, layout: "custom_layout")
 
     @app.define do
-      get do
+      on get do
         render("view", title: "welcome", name: "alice")
       end
     end
@@ -78,6 +87,6 @@ class RenderTest < Minitest::Test
     ts = Tynn::Test.new(@app)
     ts.get("/")
 
-    assert_equal "custom / welcome / alice", ts.res.body.strip
+    assert_equal "custom / welcome / alice", ts.res.body.join.strip
   end
 end

data/test/request_headers_test.rb

@@ -4,14 +4,18 @@ require_relative "helper"
 
 class RequestHeadersTest < Minitest::Test
   def setup
-    env = { "HTTP_HOST" => "127.0.0.1", "CONTENT_TYPE" => "text/plain" }
-    request = Tynn::Request.new(env)
-
-    @headers = Tynn::Request::Headers.new(request)
+    @headers = Tynn::Request::Headers.new(
+       "HTTP_HOST" => "127.0.0.1",
+       "CONTENT_TYPE" => "text/plain"
+    )
   end
 
   def test_get_header
     assert_equal "127.0.0.1", @headers["Host"]
+    assert_equal "127.0.0.1", @headers["host"]
+    assert_equal "text/plain", @headers["Content-Type"]
+    assert_equal "text/plain", @headers["content-type"]
+    assert_equal "text/plain", @headers["CONTENT_TYPE"]
   end
 
   def test_check_if_key_exists

data/test/request_test.rb

@@ -0,0 +1,9 @@
+require_relative "helper"
+
+class RequestTest < Minitest::Test
+  def test_content_length_as_int
+    req = Tynn::Request.new("CONTENT_LENGTH" => "20")
+
+    assert_kind_of Integer, req.content_length
+  end
+end

data/test/response_test.rb

@@ -0,0 +1,217 @@
+require_relative "helper"
+
+class ResponseTest < Minitest::Test
+  def test_new
+    res = Tynn::Response.new
+
+    assert_nil res.status
+    assert_empty res.headers
+    assert_empty res.body
+  end
+
+  def test_new_with_headers
+    res = Tynn::Response.new("Content-Type" => "text/plain")
+
+    assert_equal "text/plain", res.headers["Content-Type"]
+  end
+
+  def test_status
+    res = Tynn::Response.new
+
+    res.status = 200
+
+    assert_equal 200, res.status
+  end
+
+  def test_headers
+    res = Tynn::Response.new
+
+    res.headers["Content-Type"] = "text/plain"
+
+    assert_equal "text/plain", res.headers["Content-Type"]
+  end
+
+  def test_content_length
+    res = Tynn::Response.new
+
+    res.headers["Content-Length"] = "42"
+
+    assert_equal 42, res.content_length
+  end
+
+  def test_content_type
+    res = Tynn::Response.new
+
+    res.content_type = "text/html"
+
+    assert_equal "text/html", res.headers["Content-Type"]
+    assert_equal "text/html", res.content_type
+  end
+
+  def test_location
+    res = Tynn::Response.new
+
+    res.location = "/users"
+
+    assert_equal "/users", res.headers["Location"]
+    assert_equal "/users", res.location
+  end
+
+  def test_write_body
+    res = Tynn::Response.new
+
+    res.write("foo")
+    res.write("bar")
+
+    assert_equal ["foo", "bar"], res.body
+  end
+
+  def test_write_content_length
+    res = Tynn::Response.new
+
+    res.write("foo")
+    res.write("bar")
+
+    assert_equal "6", res.headers["Content-Length"]
+  end
+
+  def test_finish_without_status_and_body
+    res = Tynn::Response.new
+
+    status, _, body = res.finish
+
+    assert_equal 404, status
+    assert_empty body
+  end
+
+  def test_finish_without_status_but_body
+    res = Tynn::Response.new
+
+    res.write("hei!")
+
+    status, _, body = res.finish
+
+    assert_equal 200, status
+    assert_equal ["hei!"], body
+  end
+
+  def test_redirect_with_path
+    res = Tynn::Response.new
+
+    res.redirect("/path")
+
+    assert_equal 302, res.status
+    assert_equal "/path", res.location
+  end
+
+  def test_redirect_with_url
+    res = Tynn::Response.new
+
+    res.redirect("https://google.com")
+
+    assert_equal 302, res.status
+    assert_equal "https://google.com", res.location
+  end
+
+  def test_redirect_with_status
+    res = Tynn::Response.new
+
+    res.redirect("/path", 303)
+
+    assert_equal 303, res.status
+  end
+
+  def test_set_cookie
+    res = Tynn::Response.new
+
+    res.set_cookie("foo", "bar")
+
+    assert_equal "foo=bar", res.headers["Set-Cookie"]
+  end
+
+  def test_set_multiple_cookies
+    res = Tynn::Response.new
+
+    res.set_cookie("foo1", "bar1")
+    res.set_cookie("foo2", "bar2")
+
+    assert_equal "foo1=bar1\nfoo2=bar2", res.headers["Set-Cookie"]
+  end
+
+  def test_set_cookie_with_options
+    res = Tynn::Response.new
+
+    time = Time.new(2016)
+
+    res.set_cookie("foo", "bar", {
+      domain: "example.org",
+      path: "/path",
+      max_age: 100, # seconds
+      expires: time,
+      httponly: true,
+      secure: true,
+      same_site: :Lax
+    })
+
+    expected = %W(
+      foo=bar
+      domain=example.org
+      path=/path
+      max-age=100
+      expires=#{ time.gmtime.rfc2822 }
+      secure
+      HttpOnly
+      SameSite=Lax
+    ).join("; ")
+
+    assert_equal expected, res.headers["Set-Cookie"]
+  end
+
+  def test_delete_cookie
+    res = Tynn::Response.new
+
+    res.set_cookie("foo1", "bar1")
+    res.set_cookie("foo2", "bar2")
+
+    res.delete_cookie("foo1")
+
+    expected = [
+      "foo2=bar2",
+      "foo1=; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 -0000"
+    ].join("\n")
+
+    assert_equal expected, res.headers["Set-Cookie"]
+  end
+
+  def test_delete_cookie_with_multiple_domains
+    res = Tynn::Response.new
+
+    res.set_cookie("foo1", "bar1", domain: "foo1.example.org")
+    res.set_cookie("foo2", "bar2", domain: "foo2.example.org")
+
+    res.delete_cookie("foo1", domain: "foo1.example.org")
+
+    expected = [
+      "foo2=bar2; domain=foo2.example.org",
+      "foo1=; domain=foo1.example.org; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 -0000"
+    ].join("\n")
+
+    assert_equal expected, res.headers["Set-Cookie"]
+  end
+
+  def test_delete_cookie_with_same_domain_and_multiple_paths
+    res = Tynn::Response.new
+
+    res.set_cookie("foo1", "bar1", domain: "example.org", path: "/foo1")
+    res.set_cookie("foo2", "bar2", domain: "example.org", path: "/foo2")
+
+    res.delete_cookie("foo1", domain: "example.org", path: "/foo1")
+
+    expected = [
+      "foo2=bar2; domain=example.org; path=/foo2",
+      "foo1=; domain=example.org; path=/foo1; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 -0000"
+    ].join("\n")
+
+    assert_equal expected, res.headers["Set-Cookie"]
+  end
+end

data/test/routing_test.rb

@@ -4,17 +4,31 @@ require_relative "helper"
 
 class RoutingTest < Minitest::Test
   def setup
-    @app = Class.new(Tynn)
+    @app = new_app
   end
 
   def test_raise_if_not_handler
-    assert_raises { @app.call({}) }
+    assert_raises(Tynn::Error) { @app.call({}) }
   end
 
   def test_path_matching
     @app.define do
-      on "hello" do
-        res.write("hello")
+      on "path" do
+        res.write("/path")
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/path")
+
+    assert_equal 200, ts.res.status
+    assert_equal "/path", ts.res.body.join
+  end
+
+  def test_path_dont_match
+    @app.define do
+      on "private" do
+        res.write("nothing to see here")
       end
     end
 
@@ -22,90 +36,166 @@ class RoutingTest < Minitest::Test
     ts.get("/")
 
     assert_equal 404, ts.res.status
+    assert_empty ts.res.body
+  end
+
+  def test_capture
+    @app.define do
+      on :foo do |foo|
+        on :bar do |bar|
+          res.write(sprintf("%s:%s", foo, bar))
+        end
+      end
+    end
 
-    ts.get("/hello")
+    ts = Tynn::Test.new(@app)
+    ts.get("/foo/bar")
 
     assert_equal 200, ts.res.status
-    assert_equal "hello", ts.res.body
+    assert_equal "foo:bar", ts.res.body.join
   end
 
-  def test_http_methods
-    methods = %i(get post put patch delete head options)
+  def test_capture_root
+    @app.define do
+      on :foo do |foo|
+        res.write(foo)
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/")
 
-    methods.each do |method|
-      @app.define do
-        send(method) { res.write(method) }
+    assert_equal 404, ts.res.status
+    assert_empty ts.res.body
+  end
+
+  def test_path_and_verbs
+    methods = %w(get post patch put delete)
+
+    @app.define do
+      methods.each do |method|
+        on method do
+          on send(method) do
+            res.write(method)
+          end
+        end
       end
+    end
 
-      ts = Tynn::Test.new(@app)
-      ts.send(method, "/")
+    ts = Tynn::Test.new(@app)
+
+    methods.each do |method|
+      ts.send(method, "/#{ method }")
 
       assert_equal 200, ts.res.status
-      assert_equal method.to_s, ts.res.body
+      assert_equal method, ts.res.body.join
     end
   end
 
-  def test_capturing_path
+  def test_verbs_on_root
     @app.define do
-      on(:foo) do |foo|
-        on(:bar) do |bar|
-          res.write(sprintf("%s/%s", foo, bar))
+      on "foo" do
+        get do
+          res.write("nothing to see here")
         end
       end
     end
 
     ts = Tynn::Test.new(@app)
-    ts.get("/john/doe")
+    ts.get("/foo/bar/baz")
 
-    assert_equal 200, ts.res.status
-    assert_equal "john/doe", ts.res.body
+    assert_equal 404, ts.res.status
+    assert_empty ts.res.body
   end
 
   def test_composition
-    foo = Class.new(@app)
+    admin = new_app
+
+    admin.define do
+      on get do
+        res.write("/admin")
+      end
+    end
 
     @app.define do
-      on("foo") do
-        run(foo, foo: 42)
+      on "admin" do
+        run(admin)
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/admin")
+
+    assert_equal 200, ts.res.status
+    assert_equal "/admin", ts.res.body.join
+  end
+
+  def test_composition_with_inbox
+    foo = new_app
+    bar = new_app
+    baz = new_app
+
+    @app.define do
+      on "foo" do
+        run(foo, foo: "foo")
       end
     end
 
     foo.define do
-      get do
-        res.write(inbox[:foo])
+      on "bar" do
+        run(bar, inbox.merge(bar: "bar"))
+      end
+    end
+
+    bar.define do
+      on "baz" do
+        run(baz, inbox.merge(baz: "baz"))
+      end
+    end
+
+    baz.define do
+      on get do
+        res.write(sprintf("%{foo}/%{bar}/%{baz}", inbox))
       end
     end
 
     ts = Tynn::Test.new(@app)
-    ts.get("/foo")
+    ts.get("/foo/bar/baz")
 
     assert_equal 200, ts.res.status
-    assert_equal "42", ts.res.body
+    assert_equal "foo/bar/baz", ts.res.body.join
   end
 
-  def test_request_class
+  def test_run_rack_app
     @app.define do
-      get do
-        res.write(req.class.name)
-      end
+      run(proc { |_|
+        [200, { "Content-Type" => "text/plain", "Content-Length" => "4" }, ["hei!"]]
+      })
     end
 
     ts = Tynn::Test.new(@app)
     ts.get("/")
 
-    assert_equal Tynn::Request.name, ts.res.body
+    assert_equal 200, ts.res.status
+    assert_equal "hei!", ts.res.body.join
+    assert_equal 4, ts.res.content_length
+    assert_equal "text/plain", ts.res.content_type
   end
 
-  def test_response_class
+  def test_halt
     @app.define do
-      get do
-        res.write(res.class.name)
-      end
+      res.status = 401
+      res.write("Unauthorized")
+
+      halt(res.finish)
+
+      raise "nothing to see here"
     end
 
     ts = Tynn::Test.new(@app)
     ts.get("/")
 
-    assert_equal Tynn::Response.name, ts.res.body
+    assert_equal 401, ts.res.status
+    assert_equal "Unauthorized", ts.res.body.join
   end
 end