fix enum validation

Author: fenollp

lib/open_api_spex/schema.ex

@@ -459,6 +459,13 @@ defmodule OpenApiSpex.Schema do
   def validate(%Schema{nullable: _}, nil, path, _schemas) do
     {:error, "#{path}: unexpected null value"}
   end
+  def validate(%Schema{enum: options = [_ | _]}, value, path, _schemas) do
+    case Enum.member?(options, value) do
+      true -> :ok
+      _ ->
+        {:error, "#{path}: Value not in enum: #{inspect(value)}"}
+    end
+  end
   def validate(%Schema{type: type}, value, path, _schemas) when type in [:integer, :number] and not is_number(value) do
     {:error, "#{path}: expected value of type #{type}"}
   end
@@ -472,8 +479,7 @@ defmodule OpenApiSpex.Schema do
   def validate(schema = %Schema{type: :string}, value, path, _schemas) do
     with :ok <- validate_max_length(schema, value, path),
          :ok <- validate_min_length(schema, value, path),
-         :ok <- validate_pattern(schema, value, path),
-         :ok <- validate_enum(schema, value, path) do
+         :ok <- validate_pattern(schema, value, path) do
       :ok
     end
   end
@@ -553,16 +559,6 @@ defmodule OpenApiSpex.Schema do
     end
   end
 
-  @spec validate_enum(Schema.t, String.t, String.t) :: :ok | {:error, String.t}
-  def validate_enum(%{enum: nil}, _val, _path), do: :ok
-  def validate_enum(%{enum: options}, value, path) do
-    case Enum.member?(options, value) do
-      true -> :ok
-      _ ->
-        {:error, "#{path}: Value not in enum: #{Enum.join(options, ", ")}"}
-    end
-  end
-
   @spec validate_max_items(Schema.t, list, String.t) :: :ok | {:error, String.t}
   defp validate_max_items(%Schema{maxItems: nil}, _val, _path), do: :ok
   defp validate_max_items(%Schema{maxItems: n}, value, _path) when length(value) <= n, do: :ok

test/schema_test.exs

@@ -138,6 +138,20 @@ defmodule OpenApiSpex.SchemaTest do
     assert :ok = Schema.validate(schema, "bar", %{})
   end
 
+  test "Validate enum with expected value" do
+    schema = %Schema{
+      enum: ["foo", %{id: 42}]
+    }
+    assert :ok = Schema.validate(schema, %{id: 42}, %{})
+  end
+
+  test "Validate enum with unexpected value" do
+    schema = %Schema{
+      enum: ["foo", %{id: 42}]
+    }
+    assert {:error, _} = Schema.validate(schema, "baz", %{})
+  end
+
   test "Validate nullable with expected value" do
     schema = %Schema{nullable: true}
     assert :ok = Schema.validate(schema, nil, %{})