tynn 2.0.0.beta3 → 2.0.0.beta4

data/test/render_test.rb

@@ -2,7 +2,6 @@
 
 require_relative "helper"
 require_relative "../lib/tynn/render"
-require "tilt/erubis"
 
 class RenderTest < Minitest::Test
   def setup
@@ -14,7 +13,7 @@ class RenderTest < Minitest::Test
   def test_partial
     @app.define do
       on "partial" do
-        res.write(partial("partial", name: "alice"))
+        res.write(partial("partial", locals: { name: "alice" }))
       end
     end
 
@@ -27,7 +26,7 @@ class RenderTest < Minitest::Test
   def test_view
     @app.define do
       on "view" do
-        res.write(view("view", title: "welcome", name: "alice"))
+        res.write(view("view", locals: { title: "welcome", name: "alice" }))
       end
     end
 
@@ -40,7 +39,7 @@ class RenderTest < Minitest::Test
   def test_render
     @app.define do
       on "render" do
-        render("view", title: "welcome", name: "alice")
+        render("view", locals: { title: "welcome", name: "alice" })
       end
     end
 
@@ -53,7 +52,7 @@ class RenderTest < Minitest::Test
   def test_render_content_type
     @app.define do
       on "render" do
-        render("view", title: "welcome", name: "alice")
+        render("view", locals: { title: "welcome", name: "alice" })
       end
     end
 
@@ -63,10 +62,42 @@ class RenderTest < Minitest::Test
     assert_equal "text/html", ts.res.content_type
   end
 
+  def test_render_content_type_custom
+    @app.define do
+      on "render" do
+        render(
+          "view",
+          content_type: "text/plain",
+          locals: { title: "welcome", name: "alice" }
+        )
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/render")
+
+    assert_equal "text/plain", ts.res.content_type
+  end
+
+  def test_render_content_type_global
+    @app.set(:render, content_type: "text/plain")
+
+    @app.define do
+      on "render" do
+        render("view", locals: { title: "welcome", name: "alice" })
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/render")
+
+    assert_equal "text/plain", ts.res.content_type
+  end
+
   def test_escaping
     @app.define do
       on "escape" do
-        res.write(partial("partial", name: "<a></a>"))
+        res.write(partial("partial", locals: { name: "<a></a>" }))
       end
     end
 
@@ -76,12 +107,29 @@ class RenderTest < Minitest::Test
     assert_equal "&lt;a&gt;&lt;/a&gt;", ts.res.body.join.strip
   end
 
-  def test_custom_layout
+  def test_custom_global_layout
     @app.set(:render, layout: "custom_layout")
 
     @app.define do
       on get do
-        render("view", title: "welcome", name: "alice")
+        render("view", locals: { title: "welcome", name: "alice" })
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/")
+
+    assert_equal "custom / welcome / alice", ts.res.body.join.strip
+  end
+
+  def test_custom_layout
+    @app.define do
+      on get do
+        render(
+          "view",
+          layout: "custom_layout",
+          locals: { title: "welcome", name: "alice" }
+        )
       end
     end
 

data/test/request_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "helper"
 
 class RequestTest < Minitest::Test

data/test/response_test.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require_relative "helper"
 
 class ResponseTest < Minitest::Test
-  def test_new
+  def test_new_with_defaults
     res = Tynn::Response.new
 
     assert_nil res.status
@@ -9,10 +11,12 @@ class ResponseTest < Minitest::Test
     assert_empty res.body
   end
 
-  def test_new_with_headers
-    res = Tynn::Response.new("Content-Type" => "text/plain")
+  def test_new
+    res = Tynn::Response.new(200, { "Content-Type" => "text/plain" }, ["hei!"])
 
+    assert_equal 200, res.status
     assert_equal "text/plain", res.headers["Content-Type"]
+    assert_equal "hei!", res.body.join
   end
 
   def test_status

data/test/routing_test.rb

@@ -11,6 +11,14 @@ class RoutingTest < Minitest::Test
     assert_raises(RuntimeError) { @app.call({}) }
   end
 
+  def test_freeze_when_define
+    @app.define {}
+
+    assert @app.app.frozen?
+    assert @app.middleware.frozen?
+    assert @app.settings.frozen?
+  end
+
   def test_path_matching
     @app.define do
       on "path" do
@@ -108,6 +116,50 @@ class RoutingTest < Minitest::Test
     assert_empty ts.res.body
   end
 
+  def test_match_true
+    @app.define do
+      on true do
+        on get do
+          res.write("true")
+        end
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/")
+
+    assert_equal 200, ts.res.status
+    assert_equal "true", ts.res.body.join
+  end
+
+  def test_dont_match_false
+    @app.define do
+      on false do
+        res.write("nothing to see here")
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/")
+
+    assert_equal 404, ts.res.status
+    assert_empty ts.res.body
+  end
+
+  def test_dont_match_falsy
+    @app.define do
+      on nil do
+        res.write("nothing to see here")
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/")
+
+    assert_equal 404, ts.res.status
+    assert_empty ts.res.body
+  end
+
   def test_composition
     admin = new_app
 
@@ -130,7 +182,7 @@ class RoutingTest < Minitest::Test
     assert_equal "/admin", ts.res.body.join
   end
 
-  def test_composition_with_inbox
+  def test_composition_with_vars
     foo = new_app
     bar = new_app
     baz = new_app
@@ -143,19 +195,19 @@ class RoutingTest < Minitest::Test
 
     foo.define do
       on "bar" do
-        run(bar, inbox.merge(bar: "bar"))
+        run(bar, vars.merge(bar: "bar"))
       end
     end
 
     bar.define do
       on "baz" do
-        run(baz, inbox.merge(baz: "baz"))
+        run(baz, vars.merge(baz: "baz"))
       end
     end
 
     baz.define do
       on get do
-        res.write(sprintf("%{foo}/%{bar}/%{baz}", inbox))
+        res.write(sprintf("%{foo}/%{bar}/%{baz}", vars))
       end
     end
 

data/test/settings_test.rb

@@ -50,4 +50,35 @@ class SettingsTest < Minitest::Test
     assert_equal "foo", @child1.settings[:foo]
     assert_equal "bar", @child2.settings[:foo]
   end
+
+  def test_inheritance_deep_dup
+    @app.set(:foo, bar: ["bar"], baz: { foo: "baz" })
+
+    @child1 = new_app(parent: @app)
+    @child1.set(:foo, foo: "foo")
+    @child1.settings[:foo][:bar].push("foo")
+    @child1.settings[:foo][:baz][:foo] = "foo"
+
+    assert_equal ["bar"], @app.settings[:foo][:bar]
+    assert_equal "baz", @app.settings[:foo][:baz][:foo]
+  end
+
+  def test_freeze
+    @app.set(:foo, foo: "foo", bar: { foo: "foo" })
+
+    @app.define do
+      on get do
+        self.class.settings[:foo][:foo] = "bar"
+      end
+
+      on post do
+        self.class.settings[:foo][:bar][:foo] = "bar"
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+
+    assert_raises { ts.get("/") }
+    assert_raises { ts.post("/") }
+  end
 end

data/test/versioning_test.rb

@@ -0,0 +1,201 @@
+# frozen_string_literal: true
+
+require_relative "helper"
+require_relative "../lib/tynn/x/versioning"
+
+class VersioningTest < Minitest::Test
+  def setup
+    @app = new_app
+  end
+
+  def test_default_vendor
+    @app.plugin(Tynn::Versioning)
+
+    @app.define do
+      on version do |v|
+        res.write(v)
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/", nil, "HTTP_ACCEPT" => "application/vnd.api+json; version = 1")
+
+    assert_equal 200, ts.res.status
+    assert_equal "1", ts.res.body.join
+  end
+
+  def test_custom_vendor
+    @app.plugin(Tynn::Versioning)
+
+    @app.define do
+      on version(vendor: "tynn") do |v|
+        res.write(v)
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/", nil, "HTTP_ACCEPT" => "application/vnd.tynn+json; version=1")
+
+    assert_equal 200, ts.res.status
+    assert_equal "1", ts.res.body.join
+  end
+
+  def test_version_and_format
+    @app.plugin(Tynn::Versioning)
+
+    @app.define do
+      on version do |version, format|
+        res.write(version)
+        res.write(format)
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/", nil, "HTTP_ACCEPT" => "application/vnd.api+json; version=1")
+
+    assert_equal 200, ts.res.status
+    assert_equal "1", ts.res.body[0]
+    assert_equal "json", ts.res.body[1]
+  end
+
+  def test_custom_format
+    @app.plugin(Tynn::Versioning)
+
+    @app.define do
+      on version do |_, format|
+        res.write(format)
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/", nil, "HTTP_ACCEPT" => "application/vnd.api+raw; version=1")
+
+    assert_equal 200, ts.res.status
+    assert_equal "raw", ts.res.body.join
+  end
+
+  def test_version_without_spaces
+    @app.plugin(Tynn::Versioning)
+
+    @app.define do
+      on version do |v|
+        res.write(v)
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/", nil, "HTTP_ACCEPT" => "application/vnd.api+json;version=1")
+
+    assert_equal 200, ts.res.status
+    assert_equal "1", ts.res.body.join
+  end
+
+  def test_multiple_accepts
+    @app.plugin(Tynn::Versioning)
+
+    @app.define do
+      on version do |v|
+        res.write(v)
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/", nil, "HTTP_ACCEPT" => "application/json, application/vnd.api+json; version = 1")
+
+    assert_equal 200, ts.res.status
+    assert_equal "1", ts.res.body.join
+  end
+
+  def test_no_accept_header
+    @app.plugin(Tynn::Versioning)
+
+    @app.define do
+      on version do |v|
+        res.write(v)
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/")
+
+    assert_equal 404, ts.res.status
+  end
+
+  def test_invalid_vendor
+    @app.plugin(Tynn::Versioning)
+
+    @app.define do
+      on version do |v|
+        res.write(v)
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/", nil, "HTTP_ACCEPT" => "application/vnd.invalid+json; version=1")
+
+    assert_equal 404, ts.res.status
+  end
+
+  def test_no_version
+    @app.plugin(Tynn::Versioning)
+
+    @app.define do
+      on version do |v|
+        res.write(v)
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/", nil, "HTTP_ACCEPT" => "application/vnd.invalid+json; version=")
+
+    assert_equal 404, ts.res.status
+  end
+
+  def test_default_version_without_accept
+    @app.plugin(Tynn::Versioning)
+
+    @app.define do
+      on version(default: 10) do |v|
+        res.write(v)
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/")
+
+    assert_equal 200, ts.res.status
+    assert_equal "10", ts.res.body.join
+  end
+
+  def test_default_version_without_version_tag
+    @app.plugin(Tynn::Versioning)
+
+    @app.define do
+      on version(default: 10) do |v|
+        res.write(v)
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/", nil, "HTTP_ACCEPT" => "application/vnd.api+json")
+
+    assert_equal 200, ts.res.status
+    assert_equal "10", ts.res.body.join
+  end
+
+  def test_default_version_without_version_value
+    @app.plugin(Tynn::Versioning)
+
+    @app.define do
+      on version(default: 10) do |v|
+        res.write(v)
+      end
+    end
+
+    ts = Tynn::Test.new(@app)
+    ts.get("/", nil, "HTTP_ACCEPT" => "application/vnd.tynn+json; version=")
+
+    assert_equal 200, ts.res.status
+    assert_equal "10", ts.res.body.join
+  end
+end