Skip to content

Commit 409b807

Browse files
committed
Remove deprecations and up requirements
New minimum: - Elixir 1.7 - Ecto 3.0 - Phoenix 1.4
1 parent 6823b97 commit 409b807

File tree

18 files changed

+32
-350
lines changed

18 files changed

+32
-350
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ otp_release: 21.0
44
jobs:
55
include:
66
- stage: test
7-
elixir: 1.6
7+
elixir: 1.7
88
otp_release: 20.0
99
script: &test_scripts
1010
- mix test

CHANGELOG.md

Lines changed: 15 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,23 @@
11
# Changelog
22

3-
## v1.0.8 (2019-05-24)
3+
## v1.1.0 (TBA)
44

55
### Changes
66

7-
* Added support for layout in mails with `Pow.Phoenix.Mailer.Mail` by setting `conn.private[:pow_mailer_layout]` same way as the Phoenix layout with `conn.private[:phoenix_layout]`
8-
* Added `:prefix` repo opts support to use in multitenant apps
9-
* Removed `@changeset.data.__struct__.pow_user_id_field()` in template in favor of using `Pow.Ecto.Schema.user_id_field/1`
10-
11-
### Bug fixes
12-
13-
* Fixed bug in `Pow.Ecto.Schema.Changeset.current_password_changeset/3` where an exception would be thrown if the virtual `:current_password` field of the user struct was set and either the `:current_password` change was blank or identical
7+
- Requires Elixir 1.7 or higher
8+
- Requires Ecto 3.0 or higher
9+
- Requires Phoenix 1.4 or higher
1410

1511
### Deprecations
1612

17-
* Deprecated `Mix.Pow.Ecto.Migration.create_migration_files/3` and moved it to `Mix.Pow.Ecto.Migration.create_migration_file/3`
18-
* Deprecated `Pow.Ecto.Context.repo/1` and moved it to `Pow.Config.repo!/1`
19-
* Deprecated `Pow.Ecto.Context.user_schema_mod/1` and moved it to `Pow.Config.user!/1`
20-
21-
## v1.0.7 (2019-05-01)
22-
23-
* Fixed bug with Phoenix 1.4.4 scoped routes
24-
25-
## v1.0.6 (2019-04-19)
26-
27-
* Fixed bug where custom layout setting raised exception in `Pow.Phoenix.ViewHelpers.layout/1`
28-
* Prevent users from changing their email to one already taken when the PowEmailConfirmation extension has been enabled
29-
30-
## v1.0.5 (2019-04-09)
31-
32-
* Added `extension_messages/1` to extension controllers and callbacks
33-
* Improved feedback for when no templates are generated for an extension with `mix pow.extension.phoenix.gen.templates` and `mix pow.extension.phoenix.mailer.gen.templates` tasks
34-
* Error flash is no longer overridden in `Pow.Phoenix.PlugErrorHandler` if the error message is nil
35-
* Fixed bug in the migration generator where `references/2` wasn't called with options
36-
* Support any `:plug` version below `2.0.0`
37-
* Deprecated `Pow.Extension.Ecto.Context.Base`
38-
39-
## v1.0.4 (2019-03-13)
40-
41-
* Added `PowInvitation` to the `mix pow.extension.phoenix.gen.templates` and `mix pow.extension.phoenix.mailer.gen.templates` tasks
42-
* Fixed issue in umbrella projects where extensions wasn't found in environment configuration
43-
* Fixed so `:namespace` environment config can be used as web app module name
44-
* Shell instructions will only be printed if the configuration is missing
45-
* Now requires that `:ecto` or `:phoenix` are included in the dependency list for the app to run respective mix tasks
46-
* Deprecated `Mix.Pow.context_app/0`
47-
* Deprecated `Mix.Pow.ensure_dep!/3`
48-
* Deprecated `Mix.Pow.context_base/1`
49-
50-
## v1.0.3 (2019-03-09)
51-
52-
### Changes
53-
54-
* Added `PowInvitation` extension
55-
* Added support in `Pow.Ecto.Schema` for Ecto associations fields
56-
* Added support for adding custom methods with `Pow.Extension.Ecto.Schema` through `__using__/1` macro in extension ecto schema module
57-
* Help information raised with invalid schema arguments for `pow.install`, `pow.ecto.install`, `pow.ecto.gen.migration`, and `pow.ecto.gen.schema` mix tasks
58-
* `PowEmailConfirmation` now redirects unconfirmed users to `after_registration_path/1` or `after_sign_in_path/1` rather than `pow_session_path(conn, :new)`
59-
60-
### Bug fixes
61-
62-
* Correct shell instructions for `mix pow.install` task with custom schema
63-
* Fixed bug in `Pow.Extension.Phoenix.Router.Base` and `Pow.Extension.Phoenix.Messages` where the full extension name wasn't used to namespace methods
64-
65-
### Deprecations
66-
67-
* Deprecated `Pow.Extension.Config.underscore_extension/1`
68-
* Deprecated `PowResetPassword.Ecto.Context.password_changeset/2`
69-
* Deprecated `Pow.Ecto.Schema.filter_new_fields/2`
70-
* Deprecated `:messages_backend_fallback` setting for extension controllers
71-
* Removed deprecated macro `router_helpers/1` in `Pow.Phoenix.Controller`
72-
73-
## v1.0.2 (2019-02-28)
74-
75-
* Added flash error message about e-mail confirmation for when user changes e-mail with PowEmailConfirmation enabled
76-
* Added `new_password_changeset/3` and `confirm_password_changeset/3` to `Pow.Ecto.Schema.Changeset`
77-
* Redis cache store backend guide
78-
* Correct shell instructions for `mix pow.phoenix.gen.templates` task
79-
* Only load environment config in `Pow.Config.get/3` when no key is set in the provided config
80-
* Fixed issue in `Pow.Store.Backend.MnesiaCache.keys/1` and `Pow.Store.Backend.EtsCache.keys/1` so they now return keys without namespace
81-
* `Pow.Store.Backend.MnesiaCache.put/3` now raises an error if TTL is not provided
82-
83-
### Breaking changes
84-
85-
* `PowResetPassword.Plug.reset_password_token/1` has been removed
86-
87-
## v1.0.1 (2019-01-27)
88-
89-
* `pow.extension.ecto.gen.migrations` mix task will output warning when a migration file won't be generated for any particular extension
90-
* Leading and trailing whitespace is removed from the user id field value (in addition to forced lower case)
91-
* An exception is raised when `pow_routes/0` or `pow_extension_routes/0` are used inside router scopes with aliases
92-
* Mail view templates assigns now has `[user: user, conn: conn]` along with the template specific assigns
93-
* Mail view subject methods now gets the same assigns passed as mail view template assigns instead of only `[conn: conn]`
94-
* Added `pow_registration_routes/0`, `pow_session_routes/0` and `pow_scope/1` macros to the router module
95-
* Added guide on how to disable registration
96-
97-
## v1.0.0 (2018-11-18)
98-
99-
* Phoenix 1.4 support
100-
* Ecto 3.0 support
13+
- Removed deprecated method `PowResetPassword.Ecto.Context.password_changeset/2`
14+
- Removed deprecated method `Pow.Extension.Config.underscore_extension/1`
15+
- Removed deprecated method `Mix.Pow.context_app/0`
16+
- Removed deprecated method `Mix.Pow.ensure_dep!/3`
17+
- Removed deprecated method `Mix.Pow.context_base/1`
18+
- Removed deprecated method `Mix.Pow.Ecto.Migration.create_migration_files/3`
19+
- Removed deprecated method `Pow.Ecto.Context.repo/1`
20+
- Removed deprecated method `Pow.Ecto.Context.user_schema_mod/1`
21+
- Config fallback set with `:messages_backend_fallback` configuration option removed in `Pow.Extension.Phoenix.Controller.Base`
22+
- Removed deprecated Bootstrap support in `Pow.Phoenix.HTML.FormTemplate`
23+
- Removed deprecated module `Pow.Extension.Ecto.Context.Base`

lib/extensions/reset_password/ecto/context.ex

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,4 @@ defmodule PowResetPassword.Ecto.Context do
1212
|> Schema.reset_password_changeset(params)
1313
|> Context.do_update(config)
1414
end
15-
16-
# TODO: Remove by 1.1.0
17-
@deprecated "Use `PowResetPassword.Ecto.Schema.reset_password_changeset/2` instead"
18-
def password_changeset(user, params), do: Schema.reset_password_changeset(user, params)
1915
end

lib/mix/pow.ex

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,6 @@ defmodule Mix.Pow do
1616
:ok
1717
end
1818

19-
# TODO: Remove by 1.1.0
20-
@doc false
21-
@deprecated "Use `ensure_ecto!` or `ensure_phoenix!` instead"
22-
@spec ensure_dep!(binary(), atom(), OptionParser.argv()) :: :ok | no_return
23-
def ensure_dep!(task, dep, _args) do
24-
fetch_deps()
25-
|> top_level_dep_in_deps?(dep)
26-
|> case do
27-
true ->
28-
:ok
29-
30-
false ->
31-
Mix.raise("mix #{task} can only be run inside an application directory that has #{inspect dep} as dependency")
32-
end
33-
end
34-
3519
@doc """
3620
Raises an exception if application doesn't have Ecto as dependency.
3721
"""
@@ -53,15 +37,7 @@ defmodule Mix.Pow do
5337
end)
5438
end
5539

56-
# TODO: Remove by 1.1.0 and only support Elixir 1.7
57-
defp fetch_deps do
58-
System.version()
59-
|> Version.match?("~> 1.6.0")
60-
|> case do
61-
true -> apply(Dep, :loaded, [[]])
62-
false -> apply(Dep, :load_on_environment, [[]])
63-
end
64-
end
40+
defp fetch_deps, do: Dep.load_on_environment([])
6541

6642
@doc """
6743
Raises an exception if application doesn't have Phoenix as dependency.
@@ -147,36 +123,12 @@ defmodule Mix.Pow do
147123
""")
148124
end
149125

150-
# TODO: Remove by 1.1.0
151-
@doc false
152-
@deprecated "Please use `Pow.Phoenix.parse_structure/1` instead"
153-
@spec context_app :: atom() | no_return
154-
def context_app do
155-
this_app = otp_app()
156-
157-
this_app
158-
|> Application.get_env(:generators, [])
159-
|> Keyword.get(:context_app)
160-
|> case do
161-
nil -> this_app
162-
false -> Mix.raise("No context_app configured for current application")
163-
{app, _path} -> app
164-
app -> app
165-
end
166-
end
167-
168126
@doc false
169127
@spec otp_app :: atom() | no_return
170128
def otp_app do
171129
Keyword.fetch!(Mix.Project.config(), :app)
172130
end
173131

174-
# TODO: Remove by 1.1.0
175-
@doc false
176-
@deprecated "Use `app_base/1` instead"
177-
@spec context_base(atom()) :: atom()
178-
def context_base(app), do: app_base(app)
179-
180132
@doc """
181133
Fetches the context base module for the app.
182134
"""

lib/mix/pow/ecto/migration.ex

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@ defmodule Mix.Pow.Ecto.Migration do
22
@moduledoc """
33
Utilities module for ecto migrations in mix tasks.
44
"""
5-
alias Mix.Generator
6-
7-
# TODO: Remove by 1.1.0
8-
@doc false
9-
@deprecated "Use `create_migration_file/3`"
10-
defdelegate create_migration_files(repo, name, content), to: __MODULE__, as: :create_migration_file
5+
alias Mix.{EctoSQL, Generator}
116

127
@doc """
138
Creates a migration file for a repo.
@@ -17,7 +12,7 @@ defmodule Mix.Pow.Ecto.Migration do
1712
base_name = "#{Macro.underscore(name)}.exs"
1813
path =
1914
repo
20-
|> source_repo_priv()
15+
|> EctoSQL.source_repo_priv()
2116
|> Path.join("migrations")
2217
|> maybe_create_directory()
2318
timestamp = timestamp(path)
@@ -68,14 +63,4 @@ defmodule Mix.Pow.Ecto.Migration do
6863

6964
defp pad(i) when i < 10, do: <<?0, ?0 + i>>
7065
defp pad(i), do: to_string(i)
71-
72-
# TODO: Remove by 1.1.0 and only use Ecto 3.0
73-
defp source_repo_priv(repo) do
74-
mod =
75-
if Pow.dependency_vsn_match?(:ecto, "< 3.0.0"),
76-
do: Mix.Ecto,
77-
else: Mix.EctoSQL
78-
79-
mod.source_repo_priv(repo)
80-
end
8166
end

lib/pow.ex

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
11
defmodule Pow do
22
@moduledoc false
3-
4-
@doc """
5-
Checks for version requirement in dependencies.
6-
"""
7-
@spec dependency_vsn_match?(atom(), binary()) :: boolean()
8-
def dependency_vsn_match?(dep, req) do
9-
case :application.get_key(dep, :vsn) do
10-
{:ok, actual} ->
11-
actual
12-
|> List.to_string()
13-
|> Version.match?(req)
14-
15-
_any ->
16-
false
17-
end
18-
end
193
end

lib/pow/ecto/context.ex

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ defmodule Pow.Ecto.Context do
162162
clauses = normalize_user_id_field_value(user_mod, clauses)
163163
opts = prefix_opts(config)
164164

165-
repo(config).get_by(user_mod, clauses, opts)
165+
Config.repo!(config).get_by(user_mod, clauses, opts)
166166
end
167167

168168
defp normalize_user_id_field_value(user_mod, clauses) do
@@ -212,10 +212,6 @@ defmodule Pow.Ecto.Context do
212212
{:ok, user}
213213
end
214214

215-
# TODO: Remove by 1.1.0
216-
@deprecated "Use `Pow.Config.repo!/1` instead"
217-
defdelegate repo(config), to: Config, as: :repo!
218-
219215
defp prefix_opts(config) do
220216
config
221217
|> Config.get(:repo_opts, [])
@@ -225,8 +221,4 @@ defmodule Pow.Ecto.Context do
225221
prefix -> [prefix: prefix]
226222
end
227223
end
228-
229-
# TODO: Remove by 1.1.0
230-
@deprecated "Use `Pow.Config.user!/1` instead"
231-
defdelegate user_schema_mod(config), to: Config, as: :user!
232224
end

lib/pow/ecto/schema.ex

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,6 @@ defmodule Pow.Ecto.Schema do
215215
Enum.filter(fields, &not Enum.member?(existing_fields, {elem(&1, 0), elem(&1, 1)}))
216216
end
217217

218-
# TODO: Remove by 1.1.0
219-
@deprecated "No longer public method"
220-
def filter_new_fields(fields, existing_fields), do: __filter_new_fields__(fields, existing_fields)
221-
222218
@doc false
223219
defmacro __register_fields__ do
224220
quote do

lib/pow/extension/config.ex

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,4 @@ defmodule Pow.Extension.Config do
2525
|> Enum.map(&Module.concat([&1] ++ module_list))
2626
|> Enum.filter(&Code.ensure_compiled?/1)
2727
end
28-
29-
# TODO: Remove by 1.1.0
30-
@doc """
31-
Returns a binary of the extension atom.
32-
33-
This is usually used to create extension namespaces for methods to be used
34-
in shared modules.
35-
"""
36-
@deprecated "Create the namespace directly in your module"
37-
@spec underscore_extension(atom()) :: binary()
38-
def underscore_extension(extension) do
39-
extension
40-
|> Module.split()
41-
|> List.first()
42-
|> Macro.underscore()
43-
end
4428
end

lib/pow/extension/ecto/context/base.ex

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)