Upgrade to Phoenix 1.7 (#188)

lib/bokken_web.ex

@@ -17,14 +17,34 @@ defmodule BokkenWeb do
   and import those modules here.
   """
 
-  def controller do
+  def static_paths, do: ~w(images favicon.ico dojo.html robots.txt)
+
+  def controller(version \\ "1.7") do
+    result =
+      case version do
+        "1.7" ->
+          quote do
+            use Phoenix.Controller,
+              namespace: BokkenWeb,
+              formats: [:html, :json],
+              layouts: [html: BokkenWeb.Layouts]
+
+            unquote(verified_routes())
+          end
+
+        _ ->
+          quote do
+            use Phoenix.Controller, namespace: BokkenWeb
+            alias BokkenWeb.Router.Helpers, as: Routes
+          end
+      end
+
     quote do
-      use Phoenix.Controller, namespace: BokkenWeb
+      unquote(result)
 
       import Plug.Conn
       import BokkenWeb.Gettext
       import Bokken.Guards
-      alias BokkenWeb.Router.Helpers, as: Routes
     end
   end
 
@@ -77,12 +97,27 @@ defmodule BokkenWeb do
       alias BokkenWeb.Router.Helpers, as: Routes
 
       import BokkenWeb.ViewUtils
+
+      unquote(verified_routes())
+    end
+  end
+
+  def verified_routes do
+    quote do
+      use Phoenix.VerifiedRoutes,
+        endpoint: BokkenWeb.Endpoint,
+        router: BokkenWeb.Router,
+        statics: BokkenWeb.static_paths()
     end
   end
 
   @doc """
   When used, dispatch to the appropriate controller/view/etc.
   """
+  defmacro __using__(controller: "1.6" = version) do
+    controller(version)
+  end
+
   defmacro __using__(which) when is_atom(which) do
     apply(__MODULE__, which, [])
   end

lib/bokken_web/controllers/admin/guardian_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.Admin.GuardianController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Accounts
   alias Bokken.Accounts.Guardian

lib/bokken_web/controllers/admin/mentor_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.Admin.MentorController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Accounts
   alias Bokken.Accounts.Mentor

lib/bokken_web/controllers/admin/ninja_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.Admin.NinjaController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Accounts
   alias Bokken.Accounts.Ninja

lib/bokken_web/controllers/admin/user_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.Admin.UserController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Accounts
   alias Bokken.Accounts.User

lib/bokken_web/controllers/auth_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.AuthController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Accounts
   alias Bokken.Accounts.User

lib/bokken_web/controllers/availability_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.AvailabilityController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Events
   alias Bokken.Events.Availability

lib/bokken_web/controllers/badge_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.BadgeController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Gamification
   alias Bokken.Gamification.Badge

lib/bokken_web/controllers/enrollment_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.EnrollmentController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Accounts
   alias Bokken.Events

lib/bokken_web/controllers/event_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.EventController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Accounts
   alias Bokken.Events

lib/bokken_web/controllers/fallback_controller.ex

@@ -4,7 +4,7 @@ defmodule BokkenWeb.FallbackController do
 
   See `Phoenix.Controller.action_fallback/1` for more details.
   """
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   # This clause handles errors returned by Ecto's insert/update/delete.
   def call(conn, {:error, %Ecto.Changeset{} = changeset}) do

lib/bokken_web/controllers/file_controller.ex

@@ -29,24 +29,24 @@ defmodule BokkenWeb.FileController do
   def index(conn, _params) when is_mentor(conn) do
     mentor_id = conn.assigns.current_user.mentor.id
     files = Documents.list_files(%{"mentor_id" => mentor_id})
-    render(conn, "index.json", files: files)
+    render(conn, :index, files: files)
   end
 
   def index(conn, _params) when is_ninja(conn) do
     ninja_id = conn.assigns.current_user.ninja.id
     files = Documents.list_files(%{"ninja_id" => ninja_id})
-    render(conn, "index.json", files: files)
+    render(conn, :index, files: files)
   end
 
   def index(conn, _params) when is_guardian(conn) do
     guardian_id = conn.assigns.current_user.guardian.id
     files = Documents.list_files(%{"guardian_id" => guardian_id})
-    render(conn, "index.json", files: files)
+    render(conn, :index, files: files)
   end
 
   def index(conn, _params) do
     files = Documents.list_files()
-    render(conn, "index.json", files: files)
+    render(conn, :index, files: files)
   end
 
   def create(conn, %{"file" => file_params}) do
@@ -56,8 +56,8 @@ defmodule BokkenWeb.FileController do
       {:ok, {:ok, file}} ->
         conn
         |> put_status(:created)
-        |> put_resp_header("location", Routes.file_path(conn, :show, file))
-        |> render("show.json", file: file)
+        |> put_resp_header("location", ~p"/api/files/#{file}")
+        |> render(:show, file: file)
 
       {:ok, {:error, reason}} ->
         conn
@@ -75,14 +75,14 @@ defmodule BokkenWeb.FileController do
 
   def show(conn, %{"id" => id}) do
     file = Documents.get_file!(id)
-    render(conn, "show.json", file: file)
+    render(conn, :show, file: file)
   end
 
   def update(conn, %{"id" => id, "file" => file_params}) do
     file = Documents.get_file!(id)
 
     with {:ok, %File{} = file} <- Documents.update_file(file, file_params) do
-      render(conn, "show.json", file: file)
+      render(conn, :show, file: file)
     end
   end
 

lib/bokken_web/controllers/file_json.ex

@@ -0,0 +1,23 @@
+defmodule BokkenWeb.FileJSON do
+  alias Bokken.Documents.File
+  alias Bokken.Uploaders.Document
+
+  def index(%{files: files}) do
+    %{data: for(file <- files, do: data(file))}
+  end
+
+  def show(%{file: file}) do
+    %{data: data(file)}
+  end
+
+  def data(%File{} = file) do
+    type = if is_nil(file.lecture_id), do: :projects, else: :snippets
+
+    %{
+      id: file.id,
+      title: file.title,
+      description: file.description,
+      document: Document.url({file.document, file}, type)
+    }
+  end
+end

lib/bokken_web/controllers/guardian_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.GuardianController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Accounts
   alias Bokken.Accounts.Guardian

lib/bokken_web/controllers/lecture_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.LectureController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Events
   alias Bokken.Events.Lecture

lib/bokken_web/controllers/location_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.LocationController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Events
   alias Bokken.Events.Location

lib/bokken_web/controllers/mentor_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.MentorController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Accounts
   alias Bokken.Accounts.Mentor

lib/bokken_web/controllers/ninja_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.NinjaController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Accounts
   alias Bokken.Accounts.Ninja

lib/bokken_web/controllers/organizer_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.OrganizerController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Accounts
   alias Bokken.Accounts.Organizer

lib/bokken_web/controllers/page_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.PageController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   @app Mix.Project.config()[:app]
   @version Mix.Project.config()[:version]

lib/bokken_web/controllers/pairing_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.PairingController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Events
   alias Bokken.Pairings

lib/bokken_web/controllers/reset_password_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.ResetPasswordController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Accounts
   alias Bokken.Mailer

lib/bokken_web/controllers/skill_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.SkillController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Accounts
   alias Bokken.Curriculum

lib/bokken_web/controllers/team_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.TeamController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Events
   alias Bokken.Events.Team

lib/bokken_web/controllers/token_controller.ex

@@ -1,5 +1,5 @@
 defmodule BokkenWeb.TokenController do
-  use BokkenWeb, :controller
+  use BokkenWeb, controller: "1.6"
 
   alias Bokken.Accounts
   alias Bokken.Accounts.Token

lib/bokken_web/endpoint.ex

@@ -24,7 +24,7 @@ defmodule BokkenWeb.Endpoint do
     at: "/",
     from: @app,
     gzip: false,
-    only: ~w(images favicon.ico dojo.html robots.txt)
+    only: BokkenWeb.static_paths()
 
   plug Plug.Static,
     at: "/uploads",

mix.exs

@@ -44,7 +44,8 @@ defmodule Bokken.MixProject do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      {:phoenix, "~> 1.6.0"},
+      {:phoenix, "~> 1.7.7"},
+      {:phoenix_view, "~> 2.0.2"},
 
       # database
       {:ecto, "~> 3.10.2"},