Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/elixir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
uses: actions/checkout@v2

- name: Setup Elixir
uses: actions/setup-elixir@v1.5.0
uses: erlef/setup-beam@v1
with:
elixir-version: 1.9.4
otp-version: 22.1.4
elixir-version: 1.12.0
otp-version: 24.0
install-hex: false
install-rebar: false

Expand All @@ -38,10 +38,10 @@ jobs:
uses: actions/checkout@v2

- name: Setup elixir
uses: actions/setup-elixir@v1.5.0
uses: erlef/setup-beam@v1
with:
elixir-version: 1.9.4
otp-version: 22.1.4
elixir-version: 1.12.0
otp-version: 24.0

- name: Install Dependencies
run: |
Expand Down
23 changes: 13 additions & 10 deletions lib/plug_checkup/options.ex
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,19 @@ defmodule PlugCheckup.Options do
end

defp validate_json_encoder!(encoder) do
unless Code.ensure_compiled?(encoder) do
raise ArgumentError,
"invalid :json_encoder option. The module #{inspect(encoder)} is not " <>
"loaded and could not be found"
end

unless function_exported?(encoder, :encode!, 2) do
raise ArgumentError,
"invalid :json_encoder option. The module #{inspect(encoder)} must " <>
"implement encode!/2"
with {:module, _module} <- Code.ensure_compiled(encoder),
true <- function_exported?(encoder, :encode!, 2) do
:ok
else
{:error, _reason} ->
raise ArgumentError,
"invalid :json_encoder option. The module #{inspect(encoder)} is not " <>
"loaded and could not be found"

false ->
raise ArgumentError,
"invalid :json_encoder option. The module #{inspect(encoder)} must " <>
"implement encode!/2"
end
end
end
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ defmodule PlugCheckup.Mixfile do
[
app: :plug_checkup,
version: "0.6.0",
elixir: "~> 1.5",
elixir: "~> 1.10",
elixirc_paths: elixirc_paths(Mix.env()),
start_permanent: Mix.env() == :prod,
description: description(),
Expand Down