Merge branch 'master' of git://github.com/hexpm/diff

Author: RudolfMan

assets/css/app.css

@@ -281,6 +281,32 @@ input.search-input:focus {
   padding: 0 90px;
 }
 
+table.package-list tr:nth-child(even) {
+  background-color: rgba(255, 255, 255, 0.06);
+}
+
+table.package-list th{
+  text-align: left;
+  border-bottom: none;
+}
+
+table.package-list td {
+  text-align: left;
+  padding: 1.2rem 1.5rem;
+}
+
+table.package-list th:first-child {
+  padding-left: 1.5rem;
+}
+
+table.package-list td:last-child {
+  text-align: right;
+}
+
+table.package-list .button {
+  margin-bottom: 0;
+}
+
 @media only screen
   and (min-device-width: 320px)
   and (max-device-width: 480px) {

lib/diff_web/controllers/page_controller.ex

@@ -5,6 +5,19 @@ defmodule DiffWeb.PageController do
 
   @chunk_size 64 * 1024
 
+  def diffs(conn, %{"diffs" => diffs}) do
+    diffs =
+      diffs
+      |> Enum.map(&parse_diff/1)
+      |> Enum.reject(&is_nil/1)
+
+    conn
+    |> assign(:diffs, diffs)
+    |> render()
+  end
+
+  def diffs(conn, _params), do: render_error(conn, 400)
+
   def diff(conn, %{"package" => package, "versions" => versions}) do
     case parse_versions(versions) do
       {:ok, from, to} ->
@@ -193,4 +206,13 @@ defmodule DiffWeb.PageController do
     random_string = Base.encode16(:crypto.strong_rand_bytes(4))
     Path.join([System.tmp_dir!(), "diff", prefix <> random_string])
   end
+
+  defp parse_diff(diff) do
+    case String.split(diff, ":", trim: true) do
+      [app, from, to] -> {app, from, to, build_url(app, from, to)}
+      _ -> nil
+    end
+  end
+
+  defp build_url(app, from, to), do: "/diff/#{app}/#{from}..#{to}"
 end

lib/diff_web/router.ex

@@ -16,5 +16,6 @@ defmodule DiffWeb.Router do
 
     live "/", SearchLiveView
     get "/diff/:package/:versions", PageController, :diff
+    get "/diffs", PageController, :diffs
   end
 end

lib/diff_web/templates/page/diffs.html.eex

@@ -0,0 +1,8 @@
+<div class="message-container">
+  <table class="package-list">
+    <tr><th>Package Name</th><th>From</th><th>To</th><th></th></tr>
+<%= for {app, from, to, link} <- @diffs do %>
+    <tr><td><%= app %></td><td><%= from %></td><td><%= to %></td><td><a href="<%= link %>" class="button diff-button">View Diff</a></td></tr>
+<% end %>
+</table>
+</div>

test/diff_web/controllers/page_controller_test.exs

@@ -26,4 +26,19 @@ defmodule DiffWeb.PageControllerTest do
       assert html_response(conn, 200) =~ diff
     end
   end
+
+  describe "GET /diffs" do
+    setup :verify_on_exit!
+
+    test "does not accept an empty list of diffs", %{conn: conn} do
+      conn = get(conn, "/diffs")
+      assert html_response(conn, 400) =~ "Bad request"
+    end
+
+    test "shows all diffs in list", %{conn: conn} do
+      diff = "/diff/phoenix/1.4.5..1.4.9"
+      conn = get(conn, "diffs?diffs[]=phoenix:1.4.5:1.4.9")
+      assert html_response(conn, 200) =~ diff
+    end
+  end
 end