Revert "Merge pull request #51 from for-GET/pr-42-validator"

This reverts commit 7865bfc, reversing
changes made to ef226b2.

Author: andreineculau

src/jesse.erl

@@ -40,7 +40,6 @@
 -export_type([ allowed_errors/0
              , error_handler/0
              , error_list/0
-             , external_validator/0
              , json_term/0
              , schema/0
              , schema_id/0
@@ -67,10 +66,6 @@
 
 -type error_list() :: list().
 
-%% -type external_validator() :: fun((json_term(), state()) -> state())
--type external_validator() :: fun((json_term(), any()) -> any())
-                           | undefined.
-
 -type json_term() :: term().
 
 -type parser_fun() :: fun((json_term() | binary()) -> json_term()).
@@ -91,7 +86,6 @@
 -type option() :: {allowed_errors, allowed_errors()}
                 | {default_schema_ver, schema_ver()}
                 | {error_handler, error_handler()}
-                | {external_validator, external_validator()}
                 | {meta_schema_ver, schema_ver()}
                 | {parser_fun, parser_fun()}
                 | {schema_loader_fun, schema_loader_fun()}.

src/jesse_schema_validator.hrl

@@ -121,7 +121,6 @@
 -define(not_one_schema_valid,        'not_one_schema_valid').
 -define(not_schema_valid,            'not_schema_valid').
 -define(wrong_not_schema,            'wrong_not_schema').
--define(external,                    'external').
 
 %%
 -define(not_found,                   'not_found').

src/jesse_state.erl

@@ -26,7 +26,6 @@
 %% API
 -export([ add_to_path/2
         , get_allowed_errors/1
-        , get_external_validator/1
         , get_current_path/1
         , get_current_schema/1
         , get_current_schema_id/1
@@ -58,7 +57,7 @@
          , default_schema_ver :: jesse:schema_ver()
          , error_handler :: jesse:error_handler()
          , error_list :: jesse:error_list()
-         , external_validator :: jesse:external_validator()
+
          , id :: jesse:schema_id()
          , root_schema :: jesse:schema()
          , schema_loader_fun :: jesse:schema_loader_fun()
@@ -139,9 +138,6 @@ new(JsonSchema, Options) ->
                                     , Options
                                     , ?default_error_handler_fun
                                     ),
-  ExternalValidator = proplists:get_value( external_validator
-                                         , Options
-                                         ),
   LoaderFun = proplists:get_value( schema_loader_fun
                                  , Options
                                  , ?default_schema_loader_fun
@@ -153,7 +149,6 @@ new(JsonSchema, Options) ->
                    , error_handler      = ErrorHandler
                    , default_schema_ver = DefaultSchemaVer
                    , schema_loader_fun  = LoaderFun
-                   , external_validator = ExternalValidator
                    },
   set_current_schema(NewState, JsonSchema).
 
@@ -388,7 +383,3 @@ load_schema(#state{schema_loader_fun = LoaderFun}, SchemaURI) ->
       %% io:format("load_schema: ~p\n", [{_C, _E, erlang:get_stacktrace()}]),
       ?not_found
   end.
-
-%% @private
-get_external_validator(#state{external_validator = Fun}) ->
-  Fun.

src/jesse_validator_draft3.erl

@@ -48,8 +48,7 @@
                     | ?not_in_range
                     | ?wrong_length
                     | ?wrong_size
-                    | ?wrong_type
-                    | ?external.
+                    | ?wrong_type.
 
 -type data_error_type() :: data_error()
                          | {data_error(), binary()}.
@@ -210,11 +209,11 @@ check_value(Value, [{?DISALLOW, Disallow} | Attrs], State) ->
 check_value(Value, [{?EXTENDS, Extends} | Attrs], State) ->
   NewState = check_extends(Value, Extends, State),
   check_value(Value, Attrs, NewState);
+check_value(_Value, [], State) ->
+  State;
 check_value(Value, [{?REF, RefSchemaURI} | Attrs], State) ->
   NewState = validate_ref(Value, RefSchemaURI, State),
   check_value(Value, Attrs, NewState);
-check_value(Value, [], State) ->
-  maybe_external_check_value(Value, State);
 check_value(Value, [_Attr | Attrs], State) ->
   check_value(Value, Attrs, State).
 
@@ -1032,12 +1031,3 @@ add_to_path(State, Property) ->
 %% @private
 remove_last_from_path(State) ->
   jesse_state:remove_last_from_path(State).
-
-%% @private
-maybe_external_check_value(Value, State) ->
-  case jesse_state:get_external_validator(State) of
-    undefined ->
-      State;
-    Fun ->
-      Fun(Value, State)
-  end.

src/jesse_validator_draft4.erl

@@ -65,8 +65,7 @@
                     | ?too_many_properties
                     | ?wrong_length
                     | ?wrong_size
-                    | ?wrong_type
-                    | ?external.
+                    | ?wrong_type.
 
 -type data_error_type() :: data_error()
                          | {data_error(), binary()}.
@@ -247,11 +246,11 @@ check_value(Value, [{?ONEOF, Schemas} | Attrs], State) ->
 check_value(Value, [{?NOT, Schema} | Attrs], State) ->
   NewState = check_not(Value, Schema, State),
   check_value(Value, Attrs, NewState);
+check_value(_Value, [], State) ->
+  State;
 check_value(Value, [{?REF, RefSchemaURI} | Attrs], State) ->
   NewState = validate_ref(Value, RefSchemaURI, State),
   check_value(Value, Attrs, NewState);
-check_value(Value, [], State) ->
-  maybe_external_check_value(Value, State);
 check_value(Value, [_Attr | Attrs], State) ->
   check_value(Value, Attrs, State).
 
@@ -1363,11 +1362,3 @@ valid_datetime(DateTimeBin) ->
     _ ->
       false
   end.
-
-maybe_external_check_value(Value, State) ->
-  case jesse_state:get_external_validator(State) of
-    undefined ->
-      State;
-    Fun ->
-      Fun(Value, State)
-  end.