Fix inclusion/exclusion validation

Author: undr

lib/jsonrpc2_plug/validator/exclusion.ex

@@ -7,12 +7,16 @@ defmodule JSONRPC2Plug.Validator.Exclusion do
   def check(nil, _opts),
     do: :ok
   def check(value, [{:in, enum}]) do
-    if Enumerable.impl_for(enum) && !Enum.member?(enum, value) do
-      :ok
+    if Enumerable.impl_for(enum) do
+      if Enum.member?(enum, value) do
+        error("is in the black list: %{list}", [list: Enum.join(enum, ", ")])
+      else
+        :ok
+      end
     else
       error("is in the black list: %{list}", [list: enum])
     end
   end
   def check(_value, _opts),
-    do: error("is in the black list: %{list}", [list: []])
+    do: error("is in the black list: %{list}", [list: ""])
 end

lib/jsonrpc2_plug/validator/inclusion.ex

@@ -7,12 +7,16 @@ defmodule JSONRPC2Plug.Validator.Inclusion do
   def check(nil, _opts),
     do: :ok
   def check(value, [{:in, enum}]) do
-    if Enumerable.impl_for(enum) && Enum.member?(enum, value) do
-      :ok
+    if Enumerable.impl_for(enum) do
+      if Enum.member?(enum, value) do
+        :ok
+      else
+        error("is not in the inclusion list: %{list}", [list: Enum.join(enum, ", ")])
+      end
     else
       error("is not in the inclusion list: %{list}", [list: enum])
     end
   end
   def check(_value, _opts),
-    do: error("is not in the inclusion list: %{list}", [list: []])
+    do: error("is not in the inclusion list: %{list}", [list: ""])
 end

test/jsonrpc2_plug/validator_test.exs

@@ -32,15 +32,15 @@ defmodule JSONRPC2Plug.ValidatorTest do
   end
 
   test ".exclude" do
-    assert {:error, "is in the black list: %{list}", [list: [1, 2, 3]]} = Validator.exclude([1, 2, 3]).(2)
+    assert {:error, "is in the black list: %{list}", [list: "1, 2, 3"]} = Validator.exclude([1, 2, 3]).(2)
     assert {:error, "is in the black list: %{list}", [list: "123"]} = Validator.exclude("123").("4")
     assert {:error, "is in the black list: %{list}", [list: 12345]} = Validator.exclude(12345).(2)
     assert :ok = Validator.exclude([1, 2, 3]).(4)
     assert :ok = Validator.exclude([1, 2, 3]).(nil)
   end
 
   test ".include" do
-    assert {:error, "is not in the inclusion list: %{list}", [list: [1, 2, 3]]} = Validator.include([1, 2, 3]).(4)
+    assert {:error, "is not in the inclusion list: %{list}", [list: "1, 2, 3"]} = Validator.include([1, 2, 3]).(4)
     assert {:error, "is not in the inclusion list: %{list}", [list: "123"]} = Validator.include("123").("3")
     assert {:error, "is not in the inclusion list: %{list}", [list: 12345]} = Validator.include(12345).(2)
     assert :ok = Validator.include([1, 2, 3]).(3)