Merge pull request #18 from danschultzer/phoenix-1.4

Add support for Phoenix 1.4

Author: danschultzer

config/test.exs

@@ -30,3 +30,5 @@ for extension <- [PowEmailConfirmation, PowResetPassword, PowPersistentSession]
     extensions: [extension],
     controller_callbacks: Pow.Extension.Phoenix.ControllerCallbacks
 end
+
+config :phoenix, :json_library, Jason

lib/pow/phoenix/html/bootstrap.ex

@@ -1,4 +1,6 @@
 defmodule Pow.Phoenix.HTML.Bootstrap do
+  # TODO: Remove module by 1.1.0 and only support Phoenix 1.4.0
+
   @moduledoc """
   Module that helps build HTML for Phoenix with Bootstrap CSS.
   """

lib/pow/phoenix/html/form_template.ex

@@ -2,10 +2,8 @@ defmodule Pow.Phoenix.HTML.FormTemplate do
   @moduledoc """
   Module that can build user form templates for Phoenix.
 
-  This module is build to support Phoenix 1.4 with minimalist CSS. Another
-  module `Pow.Phoenix.HTML.Bootstrap` exists to ensure Phoenix 1.3 templates
-  can be rendered with Bootstrap CSS classes. This is the default behaviour
-  until Phoenix 1.4 is released.
+  For Phoenix 1.3, or bootstrap templates, `Pow.Phoenix.HTML.Bootstrap` can be
+  used.
   """
   alias Pow.Phoenix.HTML.Bootstrap
 
@@ -34,18 +32,26 @@ defmodule Pow.Phoenix.HTML.FormTemplate do
   ## Options
 
     * `:button_label` - the submit button label, defaults to "Submit".
-    * `:bootstrap` - to render form as bootstrap, defaults to true.
+    * `:bootstrap` - to render form as bootstrap, defaults to false with
+      phoenix 1.4 and true with phoenix 1.3.
   """
   @spec render(list(), Keyword.t()) :: Macro.t()
   def render(inputs, opts \\ []) do
     button_label = Keyword.get(opts, :button_label, "Submit")
 
-    case Keyword.get(opts, :bootstrap, true) do
+    case bootstrap?(opts) do
       true -> Bootstrap.render_form(inputs, button_label)
       _any -> render_form(inputs, button_label)
     end
   end
 
+  # TODO: Remove bootstrap support by 1.1.0 and only support Phoenix 1.4.0
+  defp bootstrap?(opts) do
+    bootstrap = Pow.dependency_vsn_match?(:phoenix, "~> 1.3.0")
+
+    Keyword.get(opts, :bootstrap, bootstrap)
+  end
+
   defp render_form(inputs, button_label) do
     inputs = for {type, key} <- inputs, do: input(type, key)
 

mix.exs

@@ -36,7 +36,7 @@ defmodule Pow.MixProject do
   defp deps do
     [
       {:ecto, "~> 2.2 or ~> 3.0"},
-      {:phoenix, "~> 1.3.0"},
+      {:phoenix, "~> 1.3.0 or ~> 1.4.0"},
       {:phoenix_html, ">= 2.0.0 and <= 3.0.0"},
       {:plug, ">= 1.5.0 and < 1.8.0", optional: true},
 
@@ -46,6 +46,8 @@ defmodule Pow.MixProject do
       {:ex_doc, "~> 0.19.0", only: :dev},
 
       {:ecto_sql, "~> 3.0.0", only: [:test]},
+      {:plug_cowboy, "~> 2.0", only: [:test]},
+      {:jason, "~> 1.0", only: [:test]},
       {:postgrex, "~> 0.14.0", only: [:test]}
     ]
   end

mix.lock

@@ -1,24 +1,29 @@
 %{
   "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm"},
   "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm"},
+  "cowboy": {:hex, :cowboy, "2.5.0", "4ef3ae066ee10fe01ea3272edc8f024347a0d3eb95f6fbb9aed556dacbfc1337", [:rebar3], [{:cowlib, "~> 2.6.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.6.2", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm"},
+  "cowlib": {:hex, :cowlib, "2.6.0", "8aa629f81a0fc189f261dc98a42243fa842625feea3c7ec56c48f4ccdb55490f", [:rebar3], [], "hexpm"},
   "credo": {:hex, :credo, "0.9.3", "76fa3e9e497ab282e0cf64b98a624aa11da702854c52c82db1bf24e54ab7c97a", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:poison, ">= 0.0.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
   "db_connection": {:hex, :db_connection, "2.0.1", "09454c6c6e8e4295f400b72580b19f0ac68fda2602e209533285206cb99bee6b", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm"},
   "decimal": {:hex, :decimal, "1.5.0", "b0433a36d0e2430e3d50291b1c65f53c37d56f83665b43d79963684865beab68", [:mix], [], "hexpm"},
   "earmark": {:hex, :earmark, "1.2.6", "b6da42b3831458d3ecc57314dff3051b080b9b2be88c2e5aa41cd642a5b044ed", [:mix], [], "hexpm"},
   "ecto": {:hex, :ecto, "3.0.1", "a26605ee7b243a754e6609d1c23da27bcb22823659b07bf03f9020da92a8e4f4", [:mix], [{:decimal, "~> 1.5", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:poison, "~> 2.2 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: true]}], "hexpm"},
   "ecto_sql": {:hex, :ecto_sql, "3.0.0", "8d1883376bee02a0e76b5ef797e39d04333c34b9935d0b4785dbf3cbdb571e2a", [:mix], [{:db_connection, "~> 2.0", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:mariaex, "~> 0.9.0", [hex: :mariaex, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.14.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.2.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"},
   "ex_doc": {:hex, :ex_doc, "0.19.1", "519bb9c19526ca51d326c060cb1778d4a9056b190086a8c6c115828eaccea6cf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
+  "jason": {:hex, :jason, "1.1.2", "b03dedea67a99223a2eaf9f1264ce37154564de899fd3d8b9a21b1a6fd64afe7", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"},
   "makeup": {:hex, :makeup, "0.5.5", "9e08dfc45280c5684d771ad58159f718a7b5788596099bdfb0284597d368a882", [:mix], [{:nimble_parsec, "~> 0.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.10.0", "0f09c2ddf352887a956d84f8f7e702111122ca32fbbc84c2f0569b8b65cbf7fa", [:mix], [{:makeup, "~> 0.5.5", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"},
   "mime": {:hex, :mime, "1.3.0", "5e8d45a39e95c650900d03f897fbf99ae04f60ab1daa4a34c7a20a5151b7a5fe", [:mix], [], "hexpm"},
   "nimble_parsec": {:hex, :nimble_parsec, "0.4.0", "ee261bb53214943679422be70f1658fff573c5d0b0a1ecd0f18738944f818efe", [:mix], [], "hexpm"},
-  "phoenix": {:hex, :phoenix, "1.3.4", "aaa1b55e5523083a877bcbe9886d9ee180bf2c8754905323493c2ac325903dc5", [:mix], [{:cowboy, "~> 1.0", [hex: :cowboy, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.3.3 or ~> 1.4", [hex: :plug, repo: "hexpm", optional: false]}, {:poison, "~> 2.2 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
+  "phoenix": {:hex, :phoenix, "1.4.0", "56fe9a809e0e735f3e3b9b31c1b749d4b436e466d8da627b8d82f90eaae714d2", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}], "hexpm"},
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.0.0", "c43117a136e7399ea04ecaac73f8f23ee0ffe3e07acfcb8062fe5f4c9f0f6531", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.9", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
   "phoenix_html": {:hex, :phoenix_html, "2.12.0", "1fb3c2e48b4b66d75564d8d63df6d53655469216d6b553e7e14ced2b46f97622", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "1.1.1", "6668d787e602981f24f17a5fbb69cc98f8ab085114ebfac6cc36e10a90c8e93c", [:mix], [], "hexpm"},
   "plug": {:hex, :plug, "1.7.1", "8516d565fb84a6a8b2ca722e74e2cd25ca0fc9d64f364ec9dbec09d33eb78ccd", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}], "hexpm"},
+  "plug_cowboy": {:hex, :plug_cowboy, "2.0.0", "ab0c92728f2ba43c544cce85f0f220d8d30fc0c90eaa1e6203683ab039655062", [:mix], [{:cowboy, "~> 2.5", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
   "plug_crypto": {:hex, :plug_crypto, "1.0.0", "18e49317d3fa343f24620ed22795ec29d4a5e602d52d1513ccea0b07d8ea7d4d", [:mix], [], "hexpm"},
   "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"},
   "postgrex": {:hex, :postgrex, "0.14.0", "f3d6ffea1ca8a156e0633900a5338a3d17b00435227726baed8982718232b694", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.0", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"},
+  "ranch": {:hex, :ranch, "1.6.2", "6db93c78f411ee033dbb18ba8234c5574883acb9a75af0fb90a9b82ea46afa00", [:rebar3], [], "hexpm"},
   "telemetry": {:hex, :telemetry, "0.2.0", "5b40caa3efe4deb30fb12d7cd8ed4f556f6d6bd15c374c2366772161311ce377", [:mix], [], "hexpm"},
 }

test/extensions/reset_password/phoenix/controllers/reset_password_controller_test.exs

@@ -12,8 +12,8 @@ defmodule PowResetPassword.Phoenix.ResetPasswordControllerTest do
       conn = get(conn, Routes.pow_reset_password_reset_password_path(conn, :new))
 
       assert html = html_response(conn, 200)
-      assert html =~ "<label class=\"control-label\" for=\"user_email\">Email</label>"
-      assert html =~ "<input class=\"form-control\" id=\"user_email\" name=\"user[email]\" type=\"text\">"
+      assert html =~ "<label for=\"user_email\">Email</label>"
+      assert html =~ "<input id=\"user_email\" name=\"user[email]\" type=\"text\">"
     end
 
     test "already signed in", %{conn: conn} do
@@ -90,10 +90,10 @@ defmodule PowResetPassword.Phoenix.ResetPasswordControllerTest do
       conn = get conn, Routes.pow_reset_password_reset_password_path(conn, :edit, @valid_token)
 
       assert html = html_response(conn, 200)
-      assert html =~ "<label class=\"control-label\" for=\"user_password\">Password</label>"
-      assert html =~ "<input class=\"form-control\" id=\"user_password\" name=\"user[password]\" type=\"password\">"
-      assert html =~ "<label class=\"control-label\" for=\"user_confirm_password\">Confirm password</label>"
-      assert html =~ "<input class=\"form-control\" id=\"user_confirm_password\" name=\"user[confirm_password]\" type=\"password\">"
+      assert html =~ "<label for=\"user_password\">Password</label>"
+      assert html =~ "<input id=\"user_password\" name=\"user[password]\" type=\"password\">"
+      assert html =~ "<label for=\"user_confirm_password\">Confirm password</label>"
+      assert html =~ "<input id=\"user_confirm_password\" name=\"user[confirm_password]\" type=\"password\">"
       assert html =~ "<a href=\"/session/new\">Sign in</a>"
     end
   end
@@ -140,8 +140,8 @@ defmodule PowResetPassword.Phoenix.ResetPasswordControllerTest do
       conn = put conn, Routes.pow_reset_password_reset_password_path(conn, :update, @valid_token, @invalid_params)
 
       assert html = html_response(conn, 200)
-      assert html =~ "<label class=\"control-label\" for=\"user_password\">Password</label>"
-      assert html =~ "<input class=\"form-control\" id=\"user_password\" name=\"user[password]\" type=\"password\">"
+      assert html =~ "<label for=\"user_password\">Password</label>"
+      assert html =~ "<input id=\"user_password\" name=\"user[password]\" type=\"password\">"
       assert html =~ "<span class=\"help-block\">not same as password</span>"
 
       changeset = conn.assigns[:changeset]

test/pow/phoenix/controllers/registration_controller_test.exs

@@ -8,12 +8,12 @@ defmodule Pow.Phoenix.RegistrationControllerTest do
 
       assert html = html_response(conn, 200)
       assert html =~ Routes.pow_registration_path(conn, :create)
-      assert html =~ "<label class=\"control-label\" for=\"user_email\">Email</label>"
-      assert html =~ "<input class=\"form-control\" id=\"user_email\" name=\"user[email]\" type=\"text\">"
-      assert html =~ "<label class=\"control-label\" for=\"user_password\">Password</label>"
-      assert html =~ "<input class=\"form-control\" id=\"user_password\" name=\"user[password]\" type=\"password\">"
-      assert html =~ "<label class=\"control-label\" for=\"user_confirm_password\">Confirm password</label>"
-      assert html =~ "<input class=\"form-control\" id=\"user_confirm_password\" name=\"user[confirm_password]\" type=\"password\">"
+      assert html =~ "<label for=\"user_email\">Email</label>"
+      assert html =~ "<input id=\"user_email\" name=\"user[email]\" type=\"text\">"
+      assert html =~ "<label for=\"user_password\">Password</label>"
+      assert html =~ "<input id=\"user_password\" name=\"user[password]\" type=\"password\">"
+      assert html =~ "<label for=\"user_confirm_password\">Confirm password</label>"
+      assert html =~ "<input id=\"user_confirm_password\" name=\"user[confirm_password]\" type=\"password\">"
       assert html =~ "<a href=\"/session/new\">Sign in</a>"
     end
 
@@ -51,9 +51,9 @@ defmodule Pow.Phoenix.RegistrationControllerTest do
     test "with invalid params", %{conn: conn} do
       conn = post conn, Routes.pow_registration_path(conn, :create, @invalid_params)
       assert html = html_response(conn, 200)
-      assert html =~ "<input class=\"form-control\" id=\"user_email\" name=\"user[email]\" type=\"text\" value=\"[email protected]\">"
-      assert html =~ "<label class=\"control-label\" for=\"user_password\">Password</label>"
-      assert html =~ "<input class=\"form-control\" id=\"user_password\" name=\"user[password]\" type=\"password\">"
+      assert html =~ "<input id=\"user_email\" name=\"user[email]\" type=\"text\" value=\"[email protected]\">"
+      assert html =~ "<label for=\"user_password\">Password</label>"
+      assert html =~ "<input id=\"user_password\" name=\"user[password]\" type=\"password\">"
       assert html =~ "<span class=\"help-block\">should be at least 10 character(s)</span>"
       assert errors = conn.assigns[:changeset].errors
       assert errors[:password]
@@ -70,10 +70,10 @@ defmodule Pow.Phoenix.RegistrationControllerTest do
         |> get(Routes.pow_registration_path(conn, :edit))
 
       assert html = html_response(conn, 200)
-      assert html =~ "<label class=\"control-label\" for=\"user_email\">Email</label>"
-      assert html =~ "<input class=\"form-control\" id=\"user_email\" name=\"user[email]\" type=\"text\" value=\"[email protected]\">"
-      assert html =~ "<label class=\"control-label\" for=\"user_current_password\">Current password</label>"
-      assert html =~ "<input class=\"form-control\" id=\"user_current_password\" name=\"user[current_password]\" type=\"password\">"
+      assert html =~ "<label for=\"user_email\">Email</label>"
+      assert html =~ "<input id=\"user_email\" name=\"user[email]\" type=\"text\" value=\"[email protected]\">"
+      assert html =~ "<label for=\"user_current_password\">Current password</label>"
+      assert html =~ "<input id=\"user_current_password\" name=\"user[current_password]\" type=\"password\">"
     end
 
     test "not signed in", %{conn: conn} do
@@ -113,10 +113,10 @@ defmodule Pow.Phoenix.RegistrationControllerTest do
       conn = put(conn, Routes.pow_registration_path(conn, :update, @invalid_params))
 
       assert html = html_response(conn, 200)
-      assert html =~ "<label class=\"control-label\" for=\"user_email\">Email</label>"
-      assert html =~ "<input class=\"form-control\" id=\"user_email\" name=\"user[email]\" type=\"text\" value=\"[email protected]\">"
-      assert html =~ "<label class=\"control-label\" for=\"user_current_password\">Current password</label>"
-      assert html =~ "<input class=\"form-control\" id=\"user_current_password\" name=\"user[current_password]\" type=\"password\">"
+      assert html =~ "<label for=\"user_email\">Email</label>"
+      assert html =~ "<input id=\"user_email\" name=\"user[email]\" type=\"text\" value=\"[email protected]\">"
+      assert html =~ "<label for=\"user_current_password\">Current password</label>"
+      assert html =~ "<input id=\"user_current_password\" name=\"user[current_password]\" type=\"password\">"
       assert html =~ "<span class=\"help-block\">can&#39;t be blank</span>"
       assert errors = conn.assigns[:changeset].errors
       assert errors[:current_password]

test/pow/phoenix/controllers/session_controller_test.exs

@@ -18,10 +18,10 @@ defmodule Pow.Phoenix.SessionControllerTest do
       assert html = html_response(conn, 200)
       assert html =~ Routes.pow_session_path(conn, :create)
       refute html =~ "request_path="
-      assert html =~ "<label class=\"control-label\" for=\"user_email\">Email</label>"
-      assert html =~ "<input class=\"form-control\" id=\"user_email\" name=\"user[email]\" type=\"text\">"
-      assert html =~ "<label class=\"control-label\" for=\"user_password\">Password</label>"
-      assert html =~ "<input class=\"form-control\" id=\"user_password\" name=\"user[password]\" type=\"password\">"
+      assert html =~ "<label for=\"user_email\">Email</label>"
+      assert html =~ "<input id=\"user_email\" name=\"user[email]\" type=\"text\">"
+      assert html =~ "<label for=\"user_password\">Password</label>"
+      assert html =~ "<input id=\"user_password\" name=\"user[password]\" type=\"password\">"
       assert html =~ "<a href=\"/registration/new\">Register</a>"
     end
 
@@ -58,8 +58,8 @@ defmodule Pow.Phoenix.SessionControllerTest do
       conn = post conn, Routes.pow_session_path(conn, :create, @invalid_params)
       assert html = html_response(conn, 200)
       assert get_flash(conn, :error) == "The provided login details did not work. Please verify your credentials, and try again."
-      assert html =~ "<input class=\"form-control\" id=\"user_email\" name=\"user[email]\" type=\"text\" value=\"[email protected]\">"
-      assert html =~ "<input class=\"form-control\" id=\"user_password\" name=\"user[password]\" type=\"password\">"
+      assert html =~ "<input id=\"user_email\" name=\"user[email]\" type=\"text\" value=\"[email protected]\">"
+      assert html =~ "<input id=\"user_password\" name=\"user[password]\" type=\"password\">"
       refute Plug.current_user(conn)
       refute conn.private[:plug_session]["auth"]
       refute html =~ "request_path"

test/pow/phoenix/html/form_template_test.exs

@@ -4,29 +4,29 @@ defmodule Pow.Phoenix.HTML.FormTemplateTest do
 
   alias Pow.Phoenix.HTML.FormTemplate
 
-  test "render/2 with bootstrap" do
+  test "render/2 with minimalist" do
     html = FormTemplate.render([
       {:text, {:changeset, :pow_user_id_field}},
       {:password, :password},
       {:password, :confirm_password}
-    ], bootstrap: true)
+    ])
 
-    assert html =~ "<div class=\"form-group\">"
-    assert html =~ "<%= label f, :password, class: \"control-label\" %>"
-    assert html =~ "<%= password_input f, :password, class: \"form-control\" %>"
+    refute html =~ "<div class=\"form-group\">"
+    assert html =~ "<%= label f, :password %>"
+    assert html =~ "<%= password_input f, :password %>"
     assert html =~ "<%= error_tag f, :password %>"
   end
 
-  test "render/2 with minimalist" do
+  test "render/2 with bootstrap" do
     html = FormTemplate.render([
       {:text, {:changeset, :pow_user_id_field}},
       {:password, :password},
       {:password, :confirm_password}
-    ], bootstrap: false)
+    ], bootstrap: true)
 
-    refute html =~ "<div class=\"form-group\">"
-    assert html =~ "<%= label f, :password %>"
-    assert html =~ "<%= password_input f, :password %>"
+    assert html =~ "<div class=\"form-group\">"
+    assert html =~ "<%= label f, :password, class: \"control-label\" %>"
+    assert html =~ "<%= password_input f, :password, class: \"form-control\" %>"
     assert html =~ "<%= error_tag f, :password %>"
   end
 end

test/support/extensions/mock.ex

@@ -59,7 +59,7 @@ defmodule Pow.Test.ExtensionMocks do
       plug Plug.Parsers,
         parsers: [:urlencoded, :multipart, :json],
         pass: ["*/*"],
-        json_decoder: Poison
+        json_decoder: Phoenix.json_library()
 
       plug Plug.MethodOverride
       plug Plug.Head