Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow empty enums #99

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/ecto_enum/postgres/use.ex
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ defmodule EctoEnum.Postgres.Use do

@behaviour Ecto.Type

@type t :: unquote(typespec)
if typespec do
@type t :: unquote(typespec)
end

enums = input[:enums]
valid_values = enums ++ Enum.map(enums, &Atom.to_string/1)
Expand Down Expand Up @@ -49,6 +51,8 @@ defmodule EctoEnum.Postgres.Use do
def load(unquote(string)), do: {:ok, unquote(atom)}
end

def load(_), do: :error

def valid_value?(value) do
Enum.member?(unquote(valid_values), value)
end
Expand Down
3 changes: 3 additions & 0 deletions lib/ecto_enum/typespec.ex
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
defmodule EctoEnum.Typespec do
@moduledoc "Helper for generating enum typespecs"

def make([]), do: nil
def make(%{} = x) when map_size(x) == 0, do: nil

def make(enums) do
enums
|> Enum.reverse()
Expand Down
6 changes: 5 additions & 1 deletion lib/ecto_enum/use.ex
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ defmodule EctoEnum.Use do

@behaviour Ecto.Type

@type t :: unquote(typespec)
if typespec do
@type t :: unquote(typespec)
end

keys = Keyword.keys(opts)
string_keys = Enum.map(keys, &Atom.to_string/1)
Expand Down Expand Up @@ -52,6 +54,8 @@ defmodule EctoEnum.Use do
def load(unquote(value)), do: {:ok, unquote(key)}
end

def load(_), do: :error

def valid_value?(value) do
Enum.member?(@valid_values, value)
end
Expand Down
12 changes: 12 additions & 0 deletions test/ecto_enum_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,18 @@ defmodule EctoEnumTest do
]}
end

test "allow empty enums" do
require EctoEnum

EctoEnum.defenum(
Void,
:void,
[]
)

assert Void.__enums__() == []
end

def custom_error_msg(value) do
"Value `#{inspect(value)}` is not a valid enum for `EctoEnumTest.StatusEnum`." <>
" Valid enums are `#{inspect(StatusEnum.__valid_values__())}`"
Expand Down