Merge pull request #152 from mojotech/cpj/phx1_5_support

Official support for Phoenix 1.5
mojotech · Apr 24, 2020 · e6c5e87 · e6c5e87
2 parents 9b6babc + 5f399a5
commit e6c5e87
Show file tree

Hide file tree

Showing 157 changed files with 23,938 additions and 42 deletions.
diff --git a/.credo.exs b/.credo.exs
@@ -21,7 +21,7 @@
         # You can give explicit globs or simply directories.
         # In the latter case `**/*.{ex,exs}` will be used.
         #
-        included: ["lib/", "src/", "test/", "web/", "apps/"],
+        included: ["lib/", "src/", "test/mix/", "test/torch", "web/", "apps/"],
         excluded: [~r"/_build/", ~r"/deps/", ~r"/node_modules/"]
       },
       #

diff --git a/bin/test b/bin/test
@@ -5,6 +5,8 @@ MIX_ENV=test mix credo --strict --ignore design,consistency || { echo 'Elixir co
 MIX_ENV=test mix docs || { echo 'Elixir HTML docs were not generated!'; exit 1; }
 MIX_ENV=test mix test || { echo 'Elixir tests on Torch failed!'; exit 1; }
 
+TEST_ROOT="$(pwd)/test"
+
 if [ $CI ]; then
   if [ $TRAVIS ]; then
     echo "----------------------------------------------------------"
@@ -20,6 +22,14 @@ if [ $CI ]; then
 fi
 
 # Run integration tests
-cd test/support/apps/example && {
-  bin/test || { echo 'Integration tests on regular Phoenix project failed!'; exit 1; }
+cd "$TEST_ROOT/support/apps/phx1_3" && {
+  bin/test || { echo 'Integration tests on regular Phoenix 1.3 project failed!'; exit 1; }
+}
+
+cd "$TEST_ROOT/support/apps/phx1_4" && {
+  bin/test || { echo 'Integration tests on regular Phoenix 1.4 project failed!'; exit 1; }
+}
+
+cd "$TEST_ROOT/support/apps/phx1_5" && {
+  bin/test || { echo 'Integration tests on regular Phoenix 1.5 project failed!'; exit 1; }
 }
diff --git a/lib/mix/tasks/torch.install.ex b/lib/mix/tasks/torch.install.ex
@@ -27,8 +27,35 @@ defmodule Mix.Tasks.Torch.Install do
 
     %{format: format, otp_app: otp_app} = Mix.Torch.parse_config!("torch.install", args)
 
+    case Application.load(:phoenix) do
+      :ok ->
+        :ok
+
+      {:error, {:already_loaded, :phoenix}} ->
+        :ok
+
+      {:error, reason} ->
+        Mix.raise(
+          "mix torch.install could not complete due to Phoenix not being loaded: #{reason}"
+        )
+    end
+
+    phoenix_version = Application.spec(:phoenix, :vsn)
+
     Mix.Torch.copy_from("priv/templates/#{format}", [
-      {"layout.html.#{format}", "lib/#{otp_app}_web/templates/layout/torch.html.#{format}"}
+      {template_file(phoenix_version, format),
+       "lib/#{otp_app}_web/templates/layout/torch.html.#{format}"}
     ])
   end
+
+  defp template_file(phoenix_version, format) when is_list(phoenix_version),
+    do: phoenix_version |> to_string() |> template_file(format)
+
+  defp template_file(phoenix_version, format) when is_binary(phoenix_version) do
+    if Version.match?(phoenix_version, ">= 1.5.0") do
+      "layout.phx1_5.html.#{format}"
+    else
+      "layout.html.#{format}"
+    end
+  end
 end
diff --git a/mix.exs b/mix.exs
@@ -40,7 +40,7 @@ defmodule Torch.MixProject do
   # Run "mix help deps" to learn about dependencies.
   defp deps do
     [
-      {:phoenix, ">= 1.3.0 and < 1.5.0"},
+      {:phoenix, ">= 1.3.0 and < 1.6.0"},
       {:phoenix_html, "~> 2.10"},
       {:gettext, "~> 0.16"},
       {:scrivener_ecto, ">= 1.2.1"},

diff --git a/priv/templates/eex/layout.phx1_5.html.eex b/priv/templates/eex/layout.phx1_5.html.eex
@@ -0,0 +1,37 @@
+<html>
+  <head>
+    <title>Admin</title>
+    <!-- Uncomment to just use the bare bones torch styles rather than the theme -->
+    <!--<link rel="stylesheet" href="<%= Routes.static_path(@conn, "/torch/base.css") %>">-->
+    <link rel="stylesheet" href="<%= Routes.static_path(@conn, "/torch/theme.css") %>">
+  </head>
+
+  <body class="<%= Torch.PageView.body_classes(@conn) %>">
+    <header>
+      <section id="torch-account-info">
+        <div class="torch-container">
+          <a href="/">[email protected]</a>
+          <a href="/">Logout</a>
+        </div>
+      </section>
+
+      <section id="torch-nav">
+        <div class="torch-container">
+          <div class="torch-logo">
+            <a href="/">
+              <h3>Torch</h3>
+            </a>
+          </div>
+          <nav class="torch-nav">
+            <!-- nav links here -->
+          </nav>
+        </div>
+      </section>
+    </header>
+
+    <%= Torch.FlashView.render("_flash_messages.html", assigns) %>
+    <%= @inner_content %>
+    <script src="<%= Routes.static_path(@conn, "/torch/torch.js") %>"></script>
+  </body>
+</html>
+
diff --git a/test/support/apps/example/.formatter.exs → test/support/apps/phx1_3/.formatter.exs b/test/support/apps/example/.formatter.exs → test/support/apps/phx1_3/.formatter.exs
diff --git a/test/support/apps/example/.gitignore → test/support/apps/phx1_3/.gitignore b/test/support/apps/example/.gitignore → test/support/apps/phx1_3/.gitignore
diff --git a/test/support/apps/example/README.md → test/support/apps/phx1_3/README.md b/test/support/apps/example/README.md → test/support/apps/phx1_3/README.md
diff --git a/test/support/apps/example/assets/.babelrc → test/support/apps/phx1_3/assets/.babelrc b/test/support/apps/example/assets/.babelrc → test/support/apps/phx1_3/assets/.babelrc
diff --git a/...port/apps/example/assets/brunch-config.js → ...pport/apps/phx1_3/assets/brunch-config.js b/...port/apps/example/assets/brunch-config.js → ...pport/apps/phx1_3/assets/brunch-config.js
diff --git a/test/support/apps/example/assets/css/app.css → test/support/apps/phx1_3/assets/css/app.css b/test/support/apps/example/assets/css/app.css → test/support/apps/phx1_3/assets/css/app.css
diff --git a/...pport/apps/example/assets/css/phoenix.css → ...upport/apps/phx1_3/assets/css/phoenix.css b/...pport/apps/example/assets/css/phoenix.css → ...upport/apps/phx1_3/assets/css/phoenix.css
diff --git a/test/support/apps/example/assets/js/app.js → test/support/apps/phx1_3/assets/js/app.js b/test/support/apps/example/assets/js/app.js → test/support/apps/phx1_3/assets/js/app.js
diff --git a/.../support/apps/example/assets/js/socket.js → test/support/apps/phx1_3/assets/js/socket.js b/.../support/apps/example/assets/js/socket.js → test/support/apps/phx1_3/assets/js/socket.js
diff --git a/...ort/apps/example/assets/package-lock.json → ...port/apps/phx1_3/assets/package-lock.json b/...ort/apps/example/assets/package-lock.json → ...port/apps/phx1_3/assets/package-lock.json
diff --git a/.../support/apps/example/assets/package.json → test/support/apps/phx1_3/assets/package.json b/.../support/apps/example/assets/package.json → test/support/apps/phx1_3/assets/package.json
diff --git a/...rt/apps/example/assets/static/favicon.ico → ...ort/apps/phx1_3/assets/static/favicon.ico b/...rt/apps/example/assets/static/favicon.ico → ...ort/apps/phx1_3/assets/static/favicon.ico
diff --git a/.../example/assets/static/images/phoenix.png → ...s/phx1_3/assets/static/images/phoenix.png b/.../example/assets/static/images/phoenix.png → ...s/phx1_3/assets/static/images/phoenix.png
diff --git a/...ort/apps/example/assets/static/robots.txt → ...port/apps/phx1_3/assets/static/robots.txt b/...ort/apps/example/assets/static/robots.txt → ...port/apps/phx1_3/assets/static/robots.txt
diff --git a/test/support/apps/example/bin/test → test/support/apps/phx1_3/bin/test b/test/support/apps/example/bin/test → test/support/apps/phx1_3/bin/test
@@ -4,7 +4,7 @@ mix deps.get || { echo 'Dependencies could not be fetched!'; exit 1; }
 MIX_ENV=test mix ecto.drop || { echo 'Database could not be dropped'; exit 1; }
 MIX_ENV=test mix torch.install || { echo 'Torch could not be installed!'; exit 1; }
 MIX_ENV=test mix torch.gen.html Blog Post posts title:string published:boolean published_at:datetime views:integer || { echo 'Torch files not generated!'; exit 1; }
-cp ../../routers/modified.ex lib/example_web/router.ex
+cp ../../routers/phx1_3_modified.ex lib/example_web/router.ex
 mix test || { echo 'Tests failed!'; exit 1; }
 
 # Clean up generated files
@@ -17,7 +17,7 @@ rm -rf lib/example_web/templates/layout/torch.html.eex
 rm -rf lib/example_web/templates/post/
 rm -rf lib/example_web/views/post_view.ex
 rm -rf test/example_web/controllers/post_controller_test.exs
-cp ../../routers/original.ex lib/example_web/router.ex
+cp ../../routers/phx1_3_original.ex lib/example_web/router.ex
 
 echo 'Tests succeeded!'
-exit 0
+exit 0
diff --git a/test/support/apps/example/config/config.exs → test/support/apps/phx1_3/config/config.exs b/test/support/apps/example/config/config.exs → test/support/apps/phx1_3/config/config.exs
diff --git a/test/support/apps/example/config/dev.exs → test/support/apps/phx1_3/config/dev.exs b/test/support/apps/example/config/dev.exs → test/support/apps/phx1_3/config/dev.exs
diff --git a/test/support/apps/example/config/prod.exs → test/support/apps/phx1_3/config/prod.exs b/test/support/apps/example/config/prod.exs → test/support/apps/phx1_3/config/prod.exs
diff --git a/test/support/apps/example/config/test.exs → test/support/apps/phx1_3/config/test.exs b/test/support/apps/example/config/test.exs → test/support/apps/phx1_3/config/test.exs
@@ -13,7 +13,6 @@ config :logger, level: :warn
 {whoami, _} = System.cmd("whoami", [])
 whoami = String.replace(whoami, "\n", "")
 
-# Configure your database
 config :example, Example.Repo,
   adapter: Ecto.Adapters.Postgres,
   username: System.get_env("DATABASE_POSTGRESQL_USERNAME") || whoami,

diff --git a/test/support/apps/example/lib/example.ex → test/support/apps/phx1_3/lib/example.ex b/test/support/apps/example/lib/example.ex → test/support/apps/phx1_3/lib/example.ex
diff --git a/...t/apps/example/lib/example/application.ex → ...rt/apps/phx1_3/lib/example/application.ex b/...t/apps/example/lib/example/application.ex → ...rt/apps/phx1_3/lib/example/application.ex
diff --git a/.../support/apps/example/lib/example/repo.ex → test/support/apps/phx1_3/lib/example/repo.ex b/.../support/apps/example/lib/example/repo.ex → test/support/apps/phx1_3/lib/example/repo.ex
diff --git a/test/support/apps/example/lib/example_web.ex → test/support/apps/phx1_3/lib/example_web.ex b/test/support/apps/example/lib/example_web.ex → test/support/apps/phx1_3/lib/example_web.ex
diff --git a/...e/lib/example_web/channels/user_socket.ex → ...3/lib/example_web/channels/user_socket.ex b/...e/lib/example_web/channels/user_socket.ex → ...3/lib/example_web/channels/user_socket.ex
diff --git a/...xample_web/controllers/page_controller.ex → ...xample_web/controllers/page_controller.ex b/...xample_web/controllers/page_controller.ex → ...xample_web/controllers/page_controller.ex
diff --git a/.../apps/example/lib/example_web/endpoint.ex → ...t/apps/phx1_3/lib/example_web/endpoint.ex b/.../apps/example/lib/example_web/endpoint.ex → ...t/apps/phx1_3/lib/example_web/endpoint.ex
diff --git a/...t/apps/example/lib/example_web/gettext.ex → ...rt/apps/phx1_3/lib/example_web/gettext.ex b/...t/apps/example/lib/example_web/gettext.ex → ...rt/apps/phx1_3/lib/example_web/gettext.ex
diff --git a/...rt/apps/example/lib/example_web/router.ex → ...ort/apps/phx1_3/lib/example_web/router.ex b/...rt/apps/example/lib/example_web/router.ex → ...ort/apps/phx1_3/lib/example_web/router.ex
diff --git a/...example_web/templates/layout/app.html.eex → ...example_web/templates/layout/app.html.eex b/...example_web/templates/layout/app.html.eex → ...example_web/templates/layout/app.html.eex
diff --git a/...example_web/templates/page/index.html.eex → ...example_web/templates/page/index.html.eex b/...example_web/templates/page/index.html.eex → ...example_web/templates/page/index.html.eex
diff --git a/...le/lib/example_web/views/error_helpers.ex → ..._3/lib/example_web/views/error_helpers.ex b/...le/lib/example_web/views/error_helpers.ex → ..._3/lib/example_web/views/error_helpers.ex
diff --git a/...ample/lib/example_web/views/error_view.ex → ...hx1_3/lib/example_web/views/error_view.ex b/...ample/lib/example_web/views/error_view.ex → ...hx1_3/lib/example_web/views/error_view.ex
diff --git a/...mple/lib/example_web/views/layout_view.ex → ...x1_3/lib/example_web/views/layout_view.ex b/...mple/lib/example_web/views/layout_view.ex → ...x1_3/lib/example_web/views/layout_view.ex
diff --git a/...xample/lib/example_web/views/page_view.ex → ...phx1_3/lib/example_web/views/page_view.ex b/...xample/lib/example_web/views/page_view.ex → ...phx1_3/lib/example_web/views/page_view.ex
diff --git a/test/support/apps/example/mix.exs → test/support/apps/phx1_3/mix.exs b/test/support/apps/example/mix.exs → test/support/apps/phx1_3/mix.exs