Pass assigns to {View,Router} render methods

mikezaby · zorbash · commit a539f37c3468 · 2016-12-11T20:10:51.000+02:00
diff --git a/installer/templates/new/dashboards/layout.html.eex b/installer/templates/new/dashboards/layout.html.eex
@@ -13,7 +13,7 @@
 
   <body>
     <div id="container">
-      <%= template %>
+      <%= @template %>
     </div>
 
     <script type="text/javascript" src="/assets/application.js"></script>
diff --git a/lib/kitto/router.ex b/lib/kitto/router.ex
@@ -79,7 +79,8 @@ defmodule Kitto.Router do
 
   match _, do: send_resp(conn, 404, "Not Found")
 
-  defp render(conn, template), do: send_resp(conn, 200, View.render(template))
+  defp render(conn, template, bindings \\ []),
+    do: send_resp(conn, 200, View.render(template, bindings))
 
   defp listen_sse(conn, :""), do: listen_sse(conn, nil)
   defp listen_sse(conn, topics) do
diff --git a/lib/kitto/view.ex b/lib/kitto/view.ex
@@ -17,16 +17,21 @@ defmodule Kitto.View do
   @doc """
   Returns the EEx compiled output of the template specified
   """
-  def render(template) do
-    @default_layout |> path |> EEx.eval_file([template: render_template(template)])
+  def render(template, assigns \\ []) do
+    @default_layout
+    |> path
+    |> EEx.eval_file(assigns: assigns ++ [template: render_template(template, assigns)])
   end
 
   @doc """
   Returns true if the given template exists in the templates directory
   """
   def exists?(template), do: template |> path |> File.exists?
 
-  defp render_template(template), do: template |> path |> EEx.eval_file
+  defp render_template(template, assigns \\ []) do
+    template |> path |> EEx.eval_file(assigns: assigns)
+  end
+
   defp path(template), do: Path.join templates_path, "#{template}.html.eex"
   defp templates_path, do: Path.join Kitto.root, @templates_dir
 end
diff --git a/test/fixtures/views/layout.html.eex b/test/fixtures/views/layout.html.eex
@@ -1 +1 @@
-<div class="layout"><%= template %></div>
+<div class="layout <%= @color %>"><%= @template %></div>
diff --git a/test/fixtures/views/sample.html.eex b/test/fixtures/views/sample.html.eex
@@ -1 +1,4 @@
 <h1>Hello from <%= Kitto.Mixfile.project[:app] %></h1>
+<%= if assigns[:user] do %>
+  <h2>Hello from <%= @user %></h2>
+<% end %>
diff --git a/test/router_test.exs b/test/router_test.exs
@@ -80,7 +80,7 @@ defmodule Kitto.RouterTest do
     view = "body"
     conn = conn(:get, "/dashboards/sample")
 
-    with_mock Kitto.View, [exists?: fn (_) -> true end, render: fn (_) -> view end] do
+    with_mock Kitto.View, [exists?: fn (_) -> true end, render: fn (_, _) -> view end] do
       conn = Kitto.Router.call(conn, @opts)
 
       assert conn.state == :sent
diff --git a/test/view_test.exs b/test/view_test.exs
@@ -2,10 +2,18 @@ defmodule Kitto.ViewTest do
   use ExUnit.Case, async: true
   use Plug.Test
 
-  test "#render(template) renders the given EEx template" do
-    html = "<div class=\"layout\"><h1>Hello from kitto</h1>\n</div>\n"
+  test "#render(template) renders layout with the given assigns" do
+    html = "<div class=\"layout blue\"><h1>Hello from kitto</h1>\n\n</div>\n"
 
-    assert Kitto.View.render("sample") == html
+    assert Kitto.View.render("sample", color: "blue") == html
+  end
+
+  test "#render(template) renders template with the given assigns" do
+    html = "<div class=\"layout green\"><h1>Hello from kitto</h1>" <>
+           "\n\n  <h2>Hello from contributor</h2>\n\n</div>\n"
+    assigns = [color: "green", user: "contributor"]
+
+    assert Kitto.View.render("sample", assigns) == html
   end
 
   test "#exists?(template) when the template exists, returns true" do

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<div class="layout"><%= template %></div>`
	`1`	`+<div class="layout <%= @color %>"><%= @template %></div>`