From: Siraaj Khandkar <siraaj@khandkar.net>
Date: Wed, 22 Apr 2015 14:56:18 +0000 (-0400)
Subject: Expose hope_kv_list:presence_violations_to_list/1
X-Git-Tag: 2.5.0^0
X-Git-Url: https://git.xandkar.net/?a=commitdiff_plain;h=dfcd229cc57d908ee6f5c3d6d7b57e0f5364e2b2;p=hope.git

Expose hope_kv_list:presence_violations_to_list/1
---

diff --git a/src/hope.app.src b/src/hope.app.src
index fee89b3..b16a643 100644
--- a/src/hope.app.src
+++ b/src/hope.app.src
@@ -1,7 +1,7 @@
 {application, hope,
  [
   {description, "Higher Order Programming in Erlang"},
-  {vsn, "2.4.1"},
+  {vsn, "2.5.0"},
   {registered, []},
   {applications, [
                   kernel,
diff --git a/src/hope_kv_list.erl b/src/hope_kv_list.erl
index 394e53d..2000098 100644
--- a/src/hope_kv_list.erl
+++ b/src/hope_kv_list.erl
@@ -28,6 +28,7 @@
     , find_unique_presence_violations/3  % Specify optional keys
     , validate_unique_presence/2  % No optional keys
     , validate_unique_presence/3  % Specify optional keys
+    , presence_violations_to_list/1
     ]).
 
 
@@ -146,28 +147,8 @@ validate_unique_presence(T, KeysRequired, KeysOptional) ->
         , keys_unsupported = []
         } ->
             {ok, ok}
-    ;   #hope_kv_list_presence_violations
-        { keys_missing     = KeysMissing
-        , keys_duplicated  = KeysDuplicated
-        , keys_unsupported = KeysUnsupported
-        } ->
-            ErrorMissing =
-                case KeysMissing
-                of  []    -> []
-                ;   [_|_] -> [{keys_missing, KeysMissing}]
-                end,
-            ErrorDups =
-                case KeysDuplicated
-                of  []    -> []
-                ;   [_|_] -> [{keys_duplicated, KeysDuplicated}]
-                end,
-            ErrorUnsupported =
-                case KeysUnsupported
-                of  []    -> []
-                ;   [_|_] -> [{keys_unsupported, KeysUnsupported}]
-                end,
-            Errors = ErrorDups ++ ErrorMissing ++ ErrorUnsupported,
-            {error, Errors}
+    ;   #hope_kv_list_presence_violations{}=Violations ->
+            {error, presence_violations_to_list(Violations)}
     end.
 
 -spec find_unique_presence_violations(t(K, _V), [K]) ->
@@ -191,6 +172,30 @@ find_unique_presence_violations(T, KeysRequired, KeysOptional) ->
     , keys_unsupported = KeysUnsupported
     }.
 
+-spec presence_violations_to_list(presence_violations(K)) ->
+    [presence_error(K)].
+presence_violations_to_list(#hope_kv_list_presence_violations
+{ keys_missing     = KeysMissing
+, keys_duplicated  = KeysDuplicated
+, keys_unsupported = KeysUnsupported
+}) ->
+    ErrorMissing =
+        case KeysMissing
+        of  []    -> []
+        ;   [_|_] -> [{keys_missing, KeysMissing}]
+        end,
+    ErrorDups =
+        case KeysDuplicated
+        of  []    -> []
+        ;   [_|_] -> [{keys_duplicated, KeysDuplicated}]
+        end,
+    ErrorUnsupported =
+        case KeysUnsupported
+        of  []    -> []
+        ;   [_|_] -> [{keys_unsupported, KeysUnsupported}]
+        end,
+    ErrorDups ++ ErrorMissing ++ ErrorUnsupported.
+
 
 %% ============================================================================
 %% Helpers