default #52

andreineculau · 2017-05-20T20:31:54Z

This change is

gadgetci · 2017-05-20T20:31:58Z

src/jesse_validator_draft4.erl

+                           ?not_found ->
+                               case get_value(?DEFAULT, PropertySchema) of
+                                   ?not_found -> CurrentState;
+                                   Default -> check_default(PropertyName, PropertySchema, Default, CurrentState)


According to Elvis:

Line 382 is too long: Default -> check_default(PropertyName, PropertySchema, Default, CurrentState).

gadgetci · 2017-05-20T20:31:59Z

src/jesse_validator_draft3.erl

+is_valid_default(Types, Default, State)
+  when is_list(Types) ->
+    check_default_for_type(Default, State)
+        andalso lists:any(fun(Type) -> is_type_valid(Default, Type, State) end, Types);


According to Elvis:

Line 1078 is too long: andalso lists:any(fun(Type) -> is_type_valid(Default, Type, State) end, Types);.

gadgetci · 2017-05-20T20:32:00Z

test/jesse_schema_validator_tests.erl

+            ],
+
+  [ ?assertEqual({ok, Value}
+                ,jesse_schema_validator:validate(Schema, Value, [])


According to Elvis:

Missing space right "," on line 46

gadgetci · 2017-05-20T20:32:01Z

src/jesse_lib.erl

+
+%% @doc check if json object is_empty.
+-spec is_json_object_empty(Value :: any()) -> boolean().
+is_json_object_empty({struct, Value}) when is_list(Value) andalso Value =:= [] -> true;


According to Elvis:

Line 74 is too long: is_json_object_empty({struct, Value}) when is_list(Value) andalso Value =:= [] -> true;.

gadgetci · 2017-05-20T20:32:02Z

src/jesse_validator_draft3.erl

+check_default_for_type(Default, State) ->
+    jesse_state:validator_option('use_defaults', State, false)
+      andalso (not jesse_lib:is_json_object(Default)
+      orelse jesse_state:validator_option('apply_defaults_to_empty_objects', State, false)


According to Elvis:

Line 1059 is too long: orelse jesse_state:validator_option('apply_defaults_to_empty_objects', State, false).

gadgetci · 2017-05-20T20:32:03Z

src/jesse_lib.erl

+is_json_object_empty({Value}) when is_list(Value)  andalso Value =:= [] -> true;
+%% handle `jsx' empty objects
+is_json_object_empty([{}])                                -> true;
+?IF_MAPS(is_json_object_empty(Map) when erlang:is_map(Map) -> maps:size(Map) =:= 0;)


According to Elvis:

Line 78 is too long: ?IF_MAPS(is_json_object_empty(Map) when erlang:is_map(Map) -> maps:size(Map) =:= 0;).

gadgetci · 2017-05-20T20:32:04Z

src/jesse_validator_draft3.erl

+                                                             , Value
+                                                             , CurrentState
+                                                             );
+                                 Default -> check_default(PropertyName, PropertySchema, Default, CurrentState)


According to Elvis:

Line 357 is too long: Default -> check_default(PropertyName, PropertySchema, Default, CurrentState).

gadgetci · 2017-05-20T20:32:05Z

src/jesse_validator_draft4.erl

+check_default_for_type(Default, State) ->
+    jesse_state:validator_option('use_defaults', State, false)
+      andalso (not jesse_lib:is_json_object(Default)
+      orelse jesse_state:validator_option('apply_defaults_to_empty_objects', State, false)


According to Elvis:

Line 1381 is too long: orelse jesse_state:validator_option('apply_defaults_to_empty_objects', State, false).

gadgetci · 2017-05-20T20:32:06Z

test/jesse_schema_validator_tests.erl

+                ,jesse_schema_validator:validate(Schema, Value, [])
+                )
+  , ?assertEqual({ok, Default}
+                ,jesse_schema_validator:validate(Schema, Value, Options)


According to Elvis:

Missing space right "," on line 49

gadgetci · 2017-05-20T20:32:07Z

src/jesse_state.erl

+validator_option(Option, #state{validator_options=Options}) ->
+    proplists:get_value(Option, Options).
+
+-spec validator_option(Option :: atom(), State :: state(), Default :: any()) -> any().


According to Elvis:

Line 409 is too long: -spec validator_option(Option :: atom(), State :: state(), Default :: any()) -> any()..

gadgetci · 2017-05-20T20:32:08Z

src/jesse_validator_draft4.erl

@@ -1362,3 +1369,42 @@ valid_datetime(DateTimeBin) ->
    _ ->
      false
  end.
+
+%% @private
+set_value(PropertyName, Value, State) ->


According to Xref:

jesse_validator_draft4:set_value/3 calls undefined function jesse_state:set_value/3

gadgetci · 2017-05-20T20:32:09Z

src/jesse_validator_draft3.erl

@@ -1031,3 +1047,62 @@ add_to_path(State, Property) ->
 %% @private
 remove_last_from_path(State) ->
  jesse_state:remove_last_from_path(State).
+
+%% @private
+set_value(PropertyName, Value, State) ->


According to Xref:

jesse_validator_draft3:set_value/3 calls undefined function jesse_state:set_value/3

gadgetci · 2017-05-20T21:02:27Z

src/jesse_validator_draft3.erl

+  jesse_state:validator_option(Option, State, Default).
+
+%% @private
+set_value(PropertyName, Value, State) ->


According to Xref:

jesse_validator_draft3:set_value/3 calls undefined function jesse_state:set_value/3

gadgetci · 2017-05-20T21:29:16Z

src/jesse_state.erl

             ]).

 %% Includes
 -include("jesse_schema_validator.hrl").

+-type extra_validator() :: fun((jesse:json_term(), state()) -> state()) | undefined.


According to Elvis:

Line 62 is too long: -type extra_validator() :: fun((jesse:json_term(), state()) -> state()) | undefined..

gadgetci · 2017-05-20T21:29:17Z

src/jesse_state.erl

             ]).

 %% Includes
 -include("jesse_schema_validator.hrl").

+-type extra_validator() :: fun((jesse:json_term(), state()) -> state()) | undefined.
+-type setter_fun() :: fun((jesse:json_path(), jesse:json_term(), jesse:json_term()) -> jesse:json_term()) | undefined.


According to Elvis:

Line 63 is too long: -type setter_fun() :: fun((jesse:json_path(), jesse:json_term(), jesse:json_term()) -> jesse:json_term()) | undefined..

gadgetci · 2017-05-20T21:29:18Z

src/jesse_state.erl

+set_value(#state{setter_fun=undefined}=State, _Path, _Value) -> State;
+set_value(#state{current_value=undefined}=State, _Path, _Value) -> State;
+set_value(#state{setter_fun=Setter
+                ,current_value=Value


According to Elvis:

Missing space right "," on line 443

gadgetci · 2017-05-21T22:33:29Z

src/jesse_schema_validator.hrl

+
+-type error_list() :: list().
+
+-type external_validator() :: fun((jesse:json_term(), state()) -> state())


According to Compiler:

type state() undefined

gadgetci · 2017-05-21T22:33:30Z

src/jesse_schema_validator.hrl

+         }
+       ).
+
+-opaque options() :: #options{}.


According to Compiler:

opaque type options() is not exported

gadgetci · 2017-05-21T22:33:31Z

xref failed with exit status: 1

gadgetci · 2017-05-21T22:33:32Z

src/jesse_schema_validator.hrl

+         }
+       ).
+
+-opaque options() :: #options{}.


According to Xref:

opaque type options() is not exported

gadgetci · 2017-05-21T22:33:33Z

compiler failed with exit status: 1

gadgetci · 2017-05-21T22:39:46Z

src/jesse_state.erl

+
+-spec set_value(State :: state(), jesse:path(), jesse:json_term()) -> state().
+set_value(#state{setter_fun = undefined} = State, _Path, _Value) -> State;
+set_value(#state{current_value = undefined} = State, _Path, _Value) -> State;


According to Compiler:

field current_value undefined in record state

gadgetci · 2017-05-21T22:39:46Z

src/jesse_state.erl

+         , Path
+         , NewValue
+         ) ->
+    State#state{current_value = Setter(Path, NewValue, Value)}.


According to Xref:

field current_value undefined in record state

gadgetci · 2017-05-21T22:39:47Z

src/jesse_state.erl

+set_value(#state{setter_fun = undefined} = State, _Path, _Value) -> State;
+set_value(#state{current_value = undefined} = State, _Path, _Value) -> State;
+set_value( #state{setter_fun = Setter
+                 , current_value = Value


According to Compiler:

field current_value undefined in record state

gadgetci · 2017-05-21T22:39:48Z

src/jesse_state.erl

@@ -164,6 +175,9 @@ new(JsonSchema, Options) ->
                   , default_schema_ver = DefaultSchemaVer
                   , schema_loader_fun  = LoaderFun
                   , external_validator = ExternalValidator
+                   , setter_fun         = SetterFun
+                   , current_value      = Value


According to Compiler:

field current_value undefined in record state

gadgetci · 2017-05-21T22:39:49Z

src/jesse_state.erl

+
+-spec set_value(State :: state(), jesse:path(), jesse:json_term()) -> state().
+set_value(#state{setter_fun = undefined} = State, _Path, _Value) -> State;
+set_value(#state{current_value = undefined} = State, _Path, _Value) -> State;


According to Xref:

field current_value undefined in record state

gadgetci · 2017-05-21T22:39:50Z

src/jesse_state.erl

+  SetterFun = proplists:get_value( setter_fun
+                                 , Options
+                                 ),
+  Value = proplists:get_value( with_value


According to Xref:

variable 'Value' is unused

gadgetci · 2017-05-21T22:39:51Z

src/jesse_state.erl

+                 , current_value = Value
+                 } = State
+         , Path
+         , NewValue


According to Compiler:

variable 'NewValue' is unused

andreineculau · 2017-05-21T22:41:40Z

FWIW it's late and this PR needs more care and attention, but I have pushed anyway in case someone else has the time and will to move this forward

gadgetci · 2017-05-21T23:07:28Z

src/jesse_state.erl

+         , Path
+         , NewValue
+         ) ->
+    State#state{current_value = Setter(Path, NewValue, Value)}.


According to Xref:

field current_value undefined in record state

gadgetci · 2017-05-21T23:07:29Z

src/jesse_state.erl

+                 , current_value = Value
+                 } = State
+         , Path
+         , NewValue


According to Compiler:

variable 'NewValue' is unused

gadgetci · 2017-05-21T23:07:30Z

src/jesse_state.erl

+
+%% @doc Getter for `current_value'.
+-spec get_current_value(State :: state()) -> jesse:json_term().
+get_current_value(#state{current_value = Value}) -> Value.


According to Compiler:

variable 'Value' is unbound

gadgetci · 2017-05-21T23:07:31Z

src/jesse_state.erl

@@ -164,6 +172,9 @@ new(JsonSchema, Options) ->
                   , default_schema_ver = DefaultSchemaVer
                   , schema_loader_fun  = LoaderFun
                   , external_validator = ExternalValidator
+                   , setter_fun         = SetterFun
+                   , current_value      = Value


According to Compiler:

field current_value undefined in record state

gadgetci · 2017-05-21T23:07:31Z

src/jesse_state.erl

+set_value(#state{setter_fun = undefined} = State, _Path, _Value) -> State;
+set_value(#state{current_value = undefined} = State, _Path, _Value) -> State;
+set_value( #state{setter_fun = Setter
+                 , current_value = Value


According to Compiler:

field current_value undefined in record state

gadgetci · 2017-05-21T23:07:32Z

src/jesse_state.erl

+  SetterFun = proplists:get_value( setter_fun
+                                 , Options
+                                 ),
+  Value = proplists:get_value( with_value


According to Xref:

variable 'Value' is unused

gadgetci · 2017-05-21T23:07:34Z

src/jesse_state.erl

+
+-spec set_value(State :: state(), jesse:path(), jesse:json_term()) -> state().
+set_value(#state{setter_fun = undefined} = State, _Path, _Value) -> State;
+set_value(#state{current_value = undefined} = State, _Path, _Value) -> State;


According to Xref:

field current_value undefined in record state

gadgetci · 2017-05-21T23:07:35Z

src/jesse_state.erl

+
+-spec set_value(State :: state(), jesse:path(), jesse:json_term()) -> state().
+set_value(#state{setter_fun = undefined} = State, _Path, _Value) -> State;
+set_value(#state{current_value = undefined} = State, _Path, _Value) -> State;


According to Compiler:

field current_value undefined in record state

allows to set values during validation

persistence depends on setter_fun option

lazedo · 2017-05-30T22:53:06Z

@andreineculau what was wrong with the original pull request and why is it failing this part?

velimir · 2018-04-20T15:12:44Z

hey @andreineculau could you please let us know what the current status of this PR is?

andreineculau · 2018-04-20T15:30:49Z

Status is that i have just started parental leave today so "if the gods allow" i will start closing down issues/PR soon one way or the other 🎉

velimir · 2018-04-20T15:31:47Z

@andreineculau congrats! :)

gadgetci reviewed May 20, 2017

View reviewed changes

andreineculau force-pushed the pr-42-default branch 2 times, most recently from 3a0f529 to d29dd1c Compare May 20, 2017 21:29

gadgetci reviewed May 20, 2017

View reviewed changes

andreineculau changed the base branch from master to pr-42-validator May 20, 2017 21:47

andreineculau force-pushed the pr-42-default branch from d29dd1c to f9b0e7d Compare May 20, 2017 22:37

andreineculau mentioned this pull request May 20, 2017

2600hz changes #42

Closed

andreineculau force-pushed the pr-42-validator branch from fb87e9f to e7cabcd Compare May 20, 2017 22:50

andreineculau force-pushed the pr-42-default branch from f9b0e7d to 62abe42 Compare May 20, 2017 22:51

andreineculau force-pushed the pr-42-validator branch from e7cabcd to 07bafff Compare May 21, 2017 22:00

andreineculau force-pushed the pr-42-default branch from 62abe42 to 628d5d0 Compare May 21, 2017 22:33

gadgetci reviewed May 21, 2017

View reviewed changes

src/jesse_schema_validator.hrl Outdated

}

).

-opaque options() :: #options{}.

Copy link

gadgetci May 21, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to Xref:

opaque type options() is not exported

gadgetci reviewed May 21, 2017

View reviewed changes

src/jesse_state.erl

, current_value = Value

} = State

, Path

, NewValue

Copy link

gadgetci May 21, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to Compiler:

variable 'NewValue' is unused

andreineculau force-pushed the pr-42-default branch from 0ede0af to 4a1e1be Compare May 21, 2017 23:07

gadgetci reviewed May 21, 2017

View reviewed changes

src/jesse_state.erl

, current_value = Value

} = State

, Path

, NewValue

Copy link

gadgetci May 21, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to Compiler:

variable 'NewValue' is unused

gadgetci reviewed May 21, 2017

View reviewed changes

andreineculau changed the base branch from pr-42-validator to master May 21, 2017 23:07

lazedo added 2 commits May 22, 2017 10:31

allow a setter_fun in schema validator

79b87b9

allows to set values during validation

set default values for properties

d842928

persistence depends on setter_fun option

andreineculau force-pushed the pr-42-default branch from 4a1e1be to d842928 Compare May 22, 2017 11:11

andreineculau modified the milestones: 1.5.0, next major May 17, 2018

andreineculau added enhancement help wanted labels May 7, 2022


		-type error_list() :: list().

		-type external_validator() :: fun((jesse:json_term(), state()) -> state())

default #52

Are you sure you want to change the base?

default #52

Conversation

andreineculau commented May 20, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gadgetci commented May 21, 2017

Choose a reason for hiding this comment

gadgetci commented May 21, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andreineculau commented May 21, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lazedo commented May 30, 2017

velimir commented Apr 20, 2018

andreineculau commented Apr 20, 2018

velimir commented Apr 20, 2018

andreineculau commented May 20, 2017 •

edited

Loading