grape 1.1.0 → 1.7.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +370 -44
- data/CONTRIBUTING.md +32 -1
- data/LICENSE +1 -1
- data/README.md +683 -87
- data/UPGRADING.md +481 -17
- data/grape.gemspec +15 -4
- data/lib/grape/api/helpers.rb +2 -0
- data/lib/grape/api/instance.rb +279 -0
- data/lib/grape/api.rb +144 -176
- data/lib/grape/config.rb +34 -0
- data/lib/grape/content_types.rb +34 -0
- data/lib/grape/cookies.rb +4 -0
- data/lib/grape/dry_types.rb +12 -0
- data/lib/grape/dsl/api.rb +1 -1
- data/lib/grape/dsl/callbacks.rb +21 -1
- data/lib/grape/dsl/configuration.rb +1 -1
- data/lib/grape/dsl/desc.rb +41 -23
- data/lib/grape/dsl/headers.rb +7 -2
- data/lib/grape/dsl/helpers.rb +10 -7
- data/lib/grape/dsl/inside_route.rb +118 -62
- data/lib/grape/dsl/logger.rb +2 -0
- data/lib/grape/dsl/middleware.rb +11 -4
- data/lib/grape/dsl/parameters.rb +33 -19
- data/lib/grape/dsl/request_response.rb +12 -9
- data/lib/grape/dsl/routing.rb +22 -13
- data/lib/grape/dsl/settings.rb +10 -6
- data/lib/grape/dsl/validations.rb +19 -14
- data/lib/grape/eager_load.rb +20 -0
- data/lib/grape/endpoint.rb +67 -58
- data/lib/grape/error_formatter/base.rb +2 -0
- data/lib/grape/error_formatter/json.rb +11 -7
- data/lib/grape/error_formatter/txt.rb +2 -0
- data/lib/grape/error_formatter/xml.rb +4 -6
- data/lib/grape/error_formatter.rb +4 -2
- data/lib/grape/exceptions/base.rb +23 -16
- data/lib/grape/exceptions/empty_message_body.rb +11 -0
- data/lib/grape/exceptions/incompatible_option_values.rb +2 -0
- data/lib/grape/exceptions/invalid_accept_header.rb +2 -0
- data/lib/grape/exceptions/invalid_formatter.rb +2 -0
- data/lib/grape/exceptions/invalid_message_body.rb +2 -0
- data/lib/grape/exceptions/invalid_response.rb +11 -0
- data/lib/grape/exceptions/invalid_version_header.rb +2 -0
- data/lib/grape/exceptions/invalid_versioner_option.rb +2 -0
- data/lib/grape/exceptions/invalid_with_option_for_represent.rb +2 -0
- data/lib/grape/exceptions/method_not_allowed.rb +2 -0
- data/lib/grape/exceptions/missing_group_type.rb +10 -1
- data/lib/grape/exceptions/missing_mime_type.rb +2 -0
- data/lib/grape/exceptions/missing_option.rb +2 -0
- data/lib/grape/exceptions/missing_vendor_option.rb +2 -0
- data/lib/grape/exceptions/too_many_multipart_files.rb +11 -0
- data/lib/grape/exceptions/unknown_options.rb +2 -0
- data/lib/grape/exceptions/unknown_parameter.rb +2 -0
- data/lib/grape/exceptions/unknown_validator.rb +2 -0
- data/lib/grape/exceptions/unsupported_group_type.rb +10 -1
- data/lib/grape/exceptions/validation.rb +5 -8
- data/lib/grape/exceptions/validation_array_errors.rb +2 -0
- data/lib/grape/exceptions/validation_errors.rb +16 -13
- data/lib/grape/extensions/active_support/hash_with_indifferent_access.rb +4 -3
- data/lib/grape/extensions/deep_mergeable_hash.rb +2 -0
- data/lib/grape/extensions/deep_symbolize_hash.rb +2 -0
- data/lib/grape/extensions/hash.rb +2 -0
- data/lib/grape/extensions/hashie/mash.rb +2 -0
- data/lib/grape/formatter/json.rb +3 -0
- data/lib/grape/formatter/serializable_hash.rb +4 -1
- data/lib/grape/formatter/txt.rb +2 -0
- data/lib/grape/formatter/xml.rb +3 -0
- data/lib/grape/formatter.rb +5 -3
- data/lib/grape/http/headers.rb +50 -18
- data/lib/grape/locale/en.yml +11 -8
- data/lib/grape/middleware/auth/base.rb +7 -7
- data/lib/grape/middleware/auth/dsl.rb +9 -2
- data/lib/grape/middleware/auth/strategies.rb +2 -0
- data/lib/grape/middleware/auth/strategy_info.rb +2 -0
- data/lib/grape/middleware/base.rb +13 -8
- data/lib/grape/middleware/error.rb +22 -17
- data/lib/grape/middleware/filter.rb +2 -0
- data/lib/grape/middleware/formatter.rb +12 -10
- data/lib/grape/middleware/globals.rb +2 -0
- data/lib/grape/middleware/helpers.rb +12 -0
- data/lib/grape/middleware/stack.rb +16 -6
- data/lib/grape/middleware/versioner/accept_version_header.rb +5 -5
- data/lib/grape/middleware/versioner/header.rb +13 -9
- data/lib/grape/middleware/versioner/param.rb +4 -1
- data/lib/grape/middleware/versioner/parse_media_type_patch.rb +5 -1
- data/lib/grape/middleware/versioner/path.rb +5 -1
- data/lib/grape/middleware/versioner.rb +2 -0
- data/lib/grape/namespace.rb +14 -2
- data/lib/grape/parser/json.rb +3 -1
- data/lib/grape/parser/xml.rb +3 -1
- data/lib/grape/parser.rb +4 -2
- data/lib/grape/path.rb +16 -3
- data/lib/grape/presenters/presenter.rb +2 -0
- data/lib/grape/request.rb +21 -9
- data/lib/grape/router/attribute_translator.rb +41 -8
- data/lib/grape/router/pattern.rb +21 -17
- data/lib/grape/router/route.rb +15 -29
- data/lib/grape/router.rb +36 -29
- data/lib/grape/{serve_file → serve_stream}/file_body.rb +3 -1
- data/lib/grape/{serve_file → serve_stream}/sendfile_response.rb +3 -1
- data/lib/grape/{serve_file/file_response.rb → serve_stream/stream_response.rb} +10 -8
- data/lib/grape/types/invalid_value.rb +8 -0
- data/lib/grape/util/base_inheritable.rb +43 -0
- data/lib/grape/util/cache.rb +20 -0
- data/lib/grape/util/endpoint_configuration.rb +8 -0
- data/lib/grape/util/env.rb +19 -17
- data/lib/grape/util/inheritable_setting.rb +3 -3
- data/lib/grape/util/inheritable_values.rb +7 -25
- data/lib/grape/util/json.rb +4 -0
- data/lib/grape/util/lazy_block.rb +27 -0
- data/lib/grape/util/lazy_object.rb +43 -0
- data/lib/grape/util/lazy_value.rb +99 -0
- data/lib/grape/util/registrable.rb +2 -0
- data/lib/grape/util/reverse_stackable_values.rb +10 -35
- data/lib/grape/util/stackable_values.rb +21 -34
- data/lib/grape/util/strict_hash_configuration.rb +3 -1
- data/lib/grape/util/xml.rb +2 -0
- data/lib/grape/validations/attributes_doc.rb +58 -0
- data/lib/grape/validations/attributes_iterator.rb +16 -6
- data/lib/grape/validations/multiple_attributes_iterator.rb +13 -0
- data/lib/grape/validations/params_scope.rb +174 -94
- data/lib/grape/validations/single_attribute_iterator.rb +24 -0
- data/lib/grape/validations/types/array_coercer.rb +63 -0
- data/lib/grape/validations/types/build_coercer.rb +47 -49
- data/lib/grape/validations/types/custom_type_coercer.rb +30 -51
- data/lib/grape/validations/types/custom_type_collection_coercer.rb +10 -25
- data/lib/grape/validations/types/dry_type_coercer.rb +72 -0
- data/lib/grape/validations/types/file.rb +22 -18
- data/lib/grape/validations/types/invalid_value.rb +17 -0
- data/lib/grape/validations/types/json.rb +47 -39
- data/lib/grape/validations/types/multiple_type_coercer.rb +14 -33
- data/lib/grape/validations/types/primitive_coercer.rb +75 -0
- data/lib/grape/validations/types/set_coercer.rb +38 -0
- data/lib/grape/validations/types/variant_collection_coercer.rb +5 -13
- data/lib/grape/validations/types.rb +106 -63
- data/lib/grape/validations/validator_factory.rb +8 -11
- data/lib/grape/validations/validators/all_or_none_of_validator.rb +16 -0
- data/lib/grape/validations/validators/allow_blank_validator.rb +20 -0
- data/lib/grape/validations/validators/as_validator.rb +14 -0
- data/lib/grape/validations/validators/at_least_one_of_validator.rb +15 -0
- data/lib/grape/validations/validators/base.rb +84 -68
- data/lib/grape/validations/validators/coerce_validator.rb +75 -0
- data/lib/grape/validations/validators/default_validator.rb +51 -0
- data/lib/grape/validations/validators/exactly_one_of_validator.rb +17 -0
- data/lib/grape/validations/validators/except_values_validator.rb +24 -0
- data/lib/grape/validations/validators/multiple_params_base.rb +27 -16
- data/lib/grape/validations/validators/mutual_exclusion_validator.rb +16 -0
- data/lib/grape/validations/validators/presence_validator.rb +15 -0
- data/lib/grape/validations/validators/regexp_validator.rb +16 -0
- data/lib/grape/validations/validators/same_as_validator.rb +29 -0
- data/lib/grape/validations/validators/values_validator.rb +88 -0
- data/lib/grape/validations.rb +18 -6
- data/lib/grape/version.rb +3 -1
- data/lib/grape.rb +175 -94
- data/spec/grape/api/custom_validations_spec.rb +117 -44
- data/spec/grape/api/deeply_included_options_spec.rb +4 -4
- data/spec/grape/api/defines_boolean_in_params_spec.rb +38 -0
- data/spec/grape/api/documentation_spec.rb +59 -0
- data/spec/grape/api/inherited_helpers_spec.rb +1 -1
- data/spec/grape/api/instance_spec.rb +103 -0
- data/spec/grape/api/invalid_format_spec.rb +3 -1
- data/spec/grape/api/namespace_parameters_in_route_spec.rb +1 -1
- data/spec/grape/api/nested_helpers_spec.rb +1 -1
- data/spec/grape/api/optional_parameters_in_route_spec.rb +1 -1
- data/spec/grape/api/parameters_modification_spec.rb +2 -2
- data/spec/grape/api/patch_method_helpers_spec.rb +1 -1
- data/spec/grape/api/recognize_path_spec.rb +2 -2
- data/spec/grape/api/required_parameters_in_route_spec.rb +1 -1
- data/spec/grape/api/required_parameters_with_invalid_method_spec.rb +1 -1
- data/spec/grape/api/routes_with_requirements_spec.rb +59 -0
- data/spec/grape/api/shared_helpers_exactly_one_of_spec.rb +10 -16
- data/spec/grape/api/shared_helpers_spec.rb +1 -1
- data/spec/grape/api_remount_spec.rb +473 -0
- data/spec/grape/api_spec.rb +995 -231
- data/spec/grape/config_spec.rb +17 -0
- data/spec/grape/dsl/callbacks_spec.rb +3 -2
- data/spec/grape/dsl/desc_spec.rb +43 -17
- data/spec/grape/dsl/headers_spec.rb +40 -10
- data/spec/grape/dsl/helpers_spec.rb +6 -5
- data/spec/grape/dsl/inside_route_spec.rb +189 -38
- data/spec/grape/dsl/logger_spec.rb +17 -19
- data/spec/grape/dsl/middleware_spec.rb +11 -2
- data/spec/grape/dsl/parameters_spec.rb +3 -1
- data/spec/grape/dsl/request_response_spec.rb +8 -7
- data/spec/grape/dsl/routing_spec.rb +22 -9
- data/spec/grape/dsl/settings_spec.rb +1 -1
- data/spec/grape/dsl/validations_spec.rb +1 -16
- data/spec/grape/endpoint/declared_spec.rb +846 -0
- data/spec/grape/endpoint_spec.rb +136 -577
- data/spec/grape/entity_spec.rb +31 -24
- data/spec/grape/exceptions/base_spec.rb +81 -0
- data/spec/grape/exceptions/body_parse_errors_spec.rb +4 -1
- data/spec/grape/exceptions/invalid_accept_header_spec.rb +65 -23
- data/spec/grape/exceptions/invalid_formatter_spec.rb +1 -1
- data/spec/grape/exceptions/invalid_response_spec.rb +11 -0
- data/spec/grape/exceptions/invalid_versioner_option_spec.rb +2 -2
- data/spec/grape/exceptions/missing_group_type_spec.rb +21 -0
- data/spec/grape/exceptions/missing_mime_type_spec.rb +1 -1
- data/spec/grape/exceptions/missing_option_spec.rb +2 -2
- data/spec/grape/exceptions/unknown_options_spec.rb +1 -1
- data/spec/grape/exceptions/unknown_validator_spec.rb +1 -1
- data/spec/grape/exceptions/unsupported_group_type_spec.rb +23 -0
- data/spec/grape/exceptions/validation_errors_spec.rb +21 -15
- data/spec/grape/exceptions/validation_spec.rb +6 -4
- data/spec/grape/extensions/param_builders/hash_spec.rb +8 -8
- data/spec/grape/extensions/param_builders/hash_with_indifferent_access_spec.rb +9 -9
- data/spec/grape/extensions/param_builders/hashie/mash_spec.rb +9 -9
- data/spec/grape/integration/global_namespace_function_spec.rb +2 -2
- data/spec/grape/integration/rack_sendfile_spec.rb +14 -10
- data/spec/grape/integration/rack_spec.rb +25 -8
- data/spec/grape/loading_spec.rb +9 -9
- data/spec/grape/middleware/auth/base_spec.rb +2 -1
- data/spec/grape/middleware/auth/dsl_spec.rb +19 -10
- data/spec/grape/middleware/auth/strategies_spec.rb +62 -22
- data/spec/grape/middleware/base_spec.rb +36 -17
- data/spec/grape/middleware/error_spec.rb +11 -4
- data/spec/grape/middleware/exception_spec.rb +112 -162
- data/spec/grape/middleware/formatter_spec.rb +65 -29
- data/spec/grape/middleware/globals_spec.rb +8 -5
- data/spec/grape/middleware/stack_spec.rb +25 -13
- data/spec/grape/middleware/versioner/accept_version_header_spec.rb +3 -2
- data/spec/grape/middleware/versioner/header_spec.rb +37 -14
- data/spec/grape/middleware/versioner/param_spec.rb +8 -2
- data/spec/grape/middleware/versioner/path_spec.rb +6 -2
- data/spec/grape/middleware/versioner_spec.rb +2 -2
- data/spec/grape/named_api_spec.rb +19 -0
- data/spec/grape/parser_spec.rb +10 -6
- data/spec/grape/path_spec.rb +53 -53
- data/spec/grape/presenters/presenter_spec.rb +8 -7
- data/spec/grape/request_spec.rb +29 -3
- data/spec/grape/util/inheritable_setting_spec.rb +9 -8
- data/spec/grape/util/inheritable_values_spec.rb +5 -3
- data/spec/grape/util/reverse_stackable_values_spec.rb +5 -2
- data/spec/grape/util/stackable_values_spec.rb +10 -7
- data/spec/grape/util/strict_hash_configuration_spec.rb +2 -1
- data/spec/grape/validations/attributes_doc_spec.rb +153 -0
- data/spec/grape/validations/instance_behaivour_spec.rb +13 -14
- data/spec/grape/validations/multiple_attributes_iterator_spec.rb +40 -0
- data/spec/grape/validations/params_scope_spec.rb +568 -99
- data/spec/grape/validations/single_attribute_iterator_spec.rb +57 -0
- data/spec/grape/validations/types/array_coercer_spec.rb +33 -0
- data/spec/grape/validations/types/primitive_coercer_spec.rb +150 -0
- data/spec/grape/validations/types/set_coercer_spec.rb +32 -0
- data/spec/grape/validations/types_spec.rb +44 -45
- data/spec/grape/validations/validators/all_or_none_spec.rb +134 -32
- data/spec/grape/validations/validators/allow_blank_spec.rb +137 -141
- data/spec/grape/validations/validators/at_least_one_of_spec.rb +169 -31
- data/spec/grape/validations/validators/coerce_spec.rb +491 -151
- data/spec/grape/validations/validators/default_spec.rb +242 -78
- data/spec/grape/validations/validators/exactly_one_of_spec.rb +198 -40
- data/spec/grape/validations/validators/except_values_spec.rb +6 -5
- data/spec/grape/validations/validators/mutual_exclusion_spec.rb +181 -30
- data/spec/grape/validations/validators/presence_spec.rb +45 -2
- data/spec/grape/validations/validators/regexp_spec.rb +27 -33
- data/spec/grape/validations/validators/same_as_spec.rb +57 -0
- data/spec/grape/validations/validators/values_spec.rb +227 -180
- data/spec/grape/validations_spec.rb +502 -72
- data/spec/integration/eager_load/eager_load_spec.rb +15 -0
- data/spec/integration/multi_json/json_spec.rb +2 -2
- data/spec/integration/multi_xml/xml_spec.rb +2 -2
- data/spec/shared/versioning_examples.rb +34 -29
- data/spec/spec_helper.rb +31 -5
- data/spec/support/basic_auth_encode_helpers.rb +3 -1
- data/spec/support/chunks.rb +14 -0
- data/spec/support/content_type_helpers.rb +2 -0
- data/spec/support/endpoint_faker.rb +2 -0
- data/spec/support/file_streamer.rb +2 -0
- data/spec/support/integer_helpers.rb +2 -0
- data/spec/support/versioned_helpers.rb +8 -8
- metadata +111 -61
- data/Appraisals +0 -32
- data/Dangerfile +0 -2
- data/Gemfile +0 -33
- data/Gemfile.lock +0 -231
- data/Guardfile +0 -10
- data/RELEASING.md +0 -111
- data/Rakefile +0 -25
- data/benchmark/simple.rb +0 -27
- data/benchmark/simple_with_type_coercer.rb +0 -22
- data/gemfiles/multi_json.gemfile +0 -35
- data/gemfiles/multi_xml.gemfile +0 -35
- data/gemfiles/rack_1.5.2.gemfile +0 -35
- data/gemfiles/rack_edge.gemfile +0 -35
- data/gemfiles/rails_3.gemfile +0 -36
- data/gemfiles/rails_4.gemfile +0 -35
- data/gemfiles/rails_5.gemfile +0 -35
- data/gemfiles/rails_edge.gemfile +0 -35
- data/lib/grape/extensions/deep_hash_with_indifferent_access.rb +0 -18
- data/lib/grape/util/content_types.rb +0 -26
- data/lib/grape/validations/types/virtus_collection_patch.rb +0 -16
- data/lib/grape/validations/validators/all_or_none.rb +0 -20
- data/lib/grape/validations/validators/allow_blank.rb +0 -16
- data/lib/grape/validations/validators/as.rb +0 -15
- data/lib/grape/validations/validators/at_least_one_of.rb +0 -20
- data/lib/grape/validations/validators/coerce.rb +0 -74
- data/lib/grape/validations/validators/default.rb +0 -48
- data/lib/grape/validations/validators/exactly_one_of.rb +0 -29
- data/lib/grape/validations/validators/except_values.rb +0 -20
- data/lib/grape/validations/validators/mutual_exclusion.rb +0 -25
- data/lib/grape/validations/validators/presence.rb +0 -10
- data/lib/grape/validations/validators/regexp.rb +0 -11
- data/lib/grape/validations/validators/values.rb +0 -71
- data/pkg/grape-0.17.0.gem +0 -0
- data/pkg/grape-0.19.0.gem +0 -0
- data/spec/grape/dsl/configuration_spec.rb +0 -14
- data/spec/grape/validations/attributes_iterator_spec.rb +0 -4
@@ -1,10 +1,11 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
describe Grape::Validations::Validators::ValuesValidator do
|
4
|
+
let_it_be(:values_model) do
|
5
|
+
Class.new do
|
6
|
+
DEFAULT_VALUES = %w[valid-type1 valid-type2 valid-type3].freeze
|
7
|
+
DEFAULT_EXCEPTS = %w[invalid-type1 invalid-type2 invalid-type3].freeze
|
2
8
|
|
3
|
-
describe Grape::Validations::ValuesValidator do
|
4
|
-
module ValidationsSpec
|
5
|
-
class ValuesModel
|
6
|
-
DEFAULT_VALUES = ['valid-type1', 'valid-type2', 'valid-type3'].freeze
|
7
|
-
DEFAULT_EXCEPTS = ['invalid-type1', 'invalid-type2', 'invalid-type3'].freeze
|
8
9
|
class << self
|
9
10
|
def values
|
10
11
|
@values ||= []
|
@@ -25,209 +26,226 @@ describe Grape::Validations::ValuesValidator do
|
|
25
26
|
@excepts ||= []
|
26
27
|
@excepts << except
|
27
28
|
end
|
29
|
+
|
30
|
+
def include?(value)
|
31
|
+
values.include?(value)
|
32
|
+
end
|
28
33
|
end
|
29
34
|
end
|
35
|
+
end
|
30
36
|
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
get '/' do
|
40
|
-
{ type: params[:type] }
|
41
|
-
end
|
42
|
-
|
43
|
-
params do
|
44
|
-
optional :type, values: { value: -> { ValuesModel.values }, message: 'value does not include in values' }, default: 'valid-type2'
|
45
|
-
end
|
46
|
-
get '/lambda' do
|
47
|
-
{ type: params[:type] }
|
48
|
-
end
|
49
|
-
|
50
|
-
params do
|
51
|
-
requires :type, values: { except: ValuesModel.excepts, except_message: 'value is on exclusions list', message: 'default exclude message' }
|
52
|
-
end
|
53
|
-
get '/exclude/exclude_message'
|
54
|
-
|
55
|
-
params do
|
56
|
-
requires :type, values: { except: -> { ValuesModel.excepts }, except_message: 'value is on exclusions list' }
|
57
|
-
end
|
58
|
-
get '/exclude/lambda/exclude_message'
|
59
|
-
|
60
|
-
params do
|
61
|
-
requires :type, values: { except: ValuesModel.excepts, message: 'default exclude message' }
|
62
|
-
end
|
63
|
-
get '/exclude/fallback_message'
|
64
|
-
end
|
37
|
+
before do
|
38
|
+
stub_const('ValuesModel', values_model)
|
39
|
+
end
|
40
|
+
|
41
|
+
let_it_be(:app) do
|
42
|
+
ValuesModel = values_model
|
43
|
+
Class.new(Grape::API) do
|
44
|
+
default_format :json
|
65
45
|
|
46
|
+
resources :custom_message do
|
66
47
|
params do
|
67
|
-
requires :type, values: ValuesModel.values
|
48
|
+
requires :type, values: { value: ValuesModel.values, message: 'value does not include in values' }
|
68
49
|
end
|
69
50
|
get '/' do
|
70
51
|
{ type: params[:type] }
|
71
52
|
end
|
72
53
|
|
73
54
|
params do
|
74
|
-
|
75
|
-
end
|
76
|
-
get '/empty'
|
77
|
-
|
78
|
-
params do
|
79
|
-
optional :type, values: { value: ValuesModel.values }, default: 'valid-type2'
|
55
|
+
optional :type, values: { value: -> { ValuesModel.values }, message: 'value does not include in values' }, default: 'valid-type2'
|
80
56
|
end
|
81
|
-
get '/
|
57
|
+
get '/lambda' do
|
82
58
|
{ type: params[:type] }
|
83
59
|
end
|
84
60
|
|
85
61
|
params do
|
86
|
-
|
87
|
-
end
|
88
|
-
get '/default/valid' do
|
89
|
-
{ type: params[:type] }
|
62
|
+
requires :type, values: { except: ValuesModel.excepts, except_message: 'value is on exclusions list', message: 'default exclude message' }
|
90
63
|
end
|
64
|
+
get '/exclude/exclude_message'
|
91
65
|
|
92
66
|
params do
|
93
|
-
|
94
|
-
end
|
95
|
-
get '/default/except' do
|
96
|
-
{ type: params[:type] }
|
67
|
+
requires :type, values: { except: -> { ValuesModel.excepts }, except_message: 'value is on exclusions list' }
|
97
68
|
end
|
69
|
+
get '/exclude/lambda/exclude_message'
|
98
70
|
|
99
71
|
params do
|
100
|
-
|
101
|
-
end
|
102
|
-
get '/lambda' do
|
103
|
-
{ type: params[:type] }
|
72
|
+
requires :type, values: { except: ValuesModel.excepts, message: 'default exclude message' }
|
104
73
|
end
|
74
|
+
get '/exclude/fallback_message'
|
75
|
+
end
|
105
76
|
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
77
|
+
params do
|
78
|
+
requires :type, values: ValuesModel.values
|
79
|
+
end
|
80
|
+
get '/' do
|
81
|
+
{ type: params[:type] }
|
82
|
+
end
|
112
83
|
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
{ number: params[:number] }
|
118
|
-
end
|
84
|
+
params do
|
85
|
+
requires :type, values: []
|
86
|
+
end
|
87
|
+
get '/empty'
|
119
88
|
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
89
|
+
params do
|
90
|
+
optional :type, values: { value: ValuesModel.values }, default: 'valid-type2'
|
91
|
+
end
|
92
|
+
get '/default/hash/valid' do
|
93
|
+
{ type: params[:type] }
|
94
|
+
end
|
124
95
|
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
96
|
+
params do
|
97
|
+
optional :type, values: ValuesModel.values, default: 'valid-type2'
|
98
|
+
end
|
99
|
+
get '/default/valid' do
|
100
|
+
{ type: params[:type] }
|
101
|
+
end
|
131
102
|
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
103
|
+
params do
|
104
|
+
optional :type, values: { except: ValuesModel.excepts }, default: 'valid-type2'
|
105
|
+
end
|
106
|
+
get '/default/except' do
|
107
|
+
{ type: params[:type] }
|
108
|
+
end
|
138
109
|
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
110
|
+
params do
|
111
|
+
optional :type, values: -> { ValuesModel.values }, default: 'valid-type2'
|
112
|
+
end
|
113
|
+
get '/lambda' do
|
114
|
+
{ type: params[:type] }
|
115
|
+
end
|
145
116
|
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
117
|
+
params do
|
118
|
+
optional :type, type: Integer, values: 1..
|
119
|
+
end
|
120
|
+
get '/endless' do
|
121
|
+
{ type: params[:type] }
|
122
|
+
end
|
152
123
|
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
124
|
+
params do
|
125
|
+
requires :type, values: ->(v) { ValuesModel.include? v }
|
126
|
+
end
|
127
|
+
get '/lambda_val' do
|
128
|
+
{ type: params[:type] }
|
129
|
+
end
|
159
130
|
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
131
|
+
params do
|
132
|
+
requires :number, type: Integer, values: ->(v) { v > 0 }
|
133
|
+
end
|
134
|
+
get '/lambda_int_val' do
|
135
|
+
{ number: params[:number] }
|
136
|
+
end
|
166
137
|
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
{ type: params[:type] }
|
172
|
-
end
|
138
|
+
params do
|
139
|
+
requires :type, values: -> { [] }
|
140
|
+
end
|
141
|
+
get '/empty_lambda'
|
173
142
|
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
143
|
+
params do
|
144
|
+
optional :type, values: ValuesModel.values, default: -> { ValuesModel.values.sample }
|
145
|
+
end
|
146
|
+
get '/default_lambda' do
|
147
|
+
{ type: params[:type] }
|
148
|
+
end
|
180
149
|
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
150
|
+
params do
|
151
|
+
optional :type, values: -> { ValuesModel.values }, default: -> { ValuesModel.values.sample }
|
152
|
+
end
|
153
|
+
get '/default_and_values_lambda' do
|
154
|
+
{ type: params[:type] }
|
155
|
+
end
|
187
156
|
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
157
|
+
params do
|
158
|
+
optional :type, type: Grape::API::Boolean, desc: 'A boolean', values: [true]
|
159
|
+
end
|
160
|
+
get '/values/optional_boolean' do
|
161
|
+
{ type: params[:type] }
|
162
|
+
end
|
194
163
|
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
164
|
+
params do
|
165
|
+
requires :type, type: Integer, desc: 'An integer', values: [10, 11], default: 10
|
166
|
+
end
|
167
|
+
get '/values/coercion' do
|
168
|
+
{ type: params[:type] }
|
169
|
+
end
|
201
170
|
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
171
|
+
params do
|
172
|
+
requires :type, type: Array[Integer], desc: 'An integer', values: [10, 11], default: 10
|
173
|
+
end
|
174
|
+
get '/values/array_coercion' do
|
175
|
+
{ type: params[:type] }
|
176
|
+
end
|
208
177
|
|
209
|
-
|
210
|
-
|
178
|
+
params do
|
179
|
+
optional :optional, type: Array do
|
180
|
+
requires :type, values: %w[a b]
|
211
181
|
end
|
212
|
-
|
182
|
+
end
|
183
|
+
get '/optional_with_required_values'
|
213
184
|
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
185
|
+
params do
|
186
|
+
requires :type, values: { except: ValuesModel.excepts }
|
187
|
+
end
|
188
|
+
get '/except/exclusive' do
|
189
|
+
{ type: params[:type] }
|
190
|
+
end
|
220
191
|
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
192
|
+
params do
|
193
|
+
requires :type, type: String, values: { except: ValuesModel.excepts }
|
194
|
+
end
|
195
|
+
get '/except/exclusive/type' do
|
196
|
+
{ type: params[:type] }
|
197
|
+
end
|
198
|
+
|
199
|
+
params do
|
200
|
+
requires :type, values: { except: -> { ValuesModel.excepts } }
|
201
|
+
end
|
202
|
+
get '/except/exclusive/lambda' do
|
203
|
+
{ type: params[:type] }
|
225
204
|
end
|
226
|
-
end
|
227
|
-
end
|
228
205
|
|
229
|
-
|
230
|
-
|
206
|
+
params do
|
207
|
+
requires :type, type: String, values: { except: -> { ValuesModel.excepts } }
|
208
|
+
end
|
209
|
+
get '/except/exclusive/lambda/type' do
|
210
|
+
{ type: params[:type] }
|
211
|
+
end
|
212
|
+
|
213
|
+
params do
|
214
|
+
requires :type, type: Integer, values: { except: -> { [3, 4, 5] } }
|
215
|
+
end
|
216
|
+
get '/except/exclusive/lambda/coercion' do
|
217
|
+
{ type: params[:type] }
|
218
|
+
end
|
219
|
+
|
220
|
+
params do
|
221
|
+
requires :type, type: Integer, values: { value: 1..5, except: [3] }
|
222
|
+
end
|
223
|
+
get '/mixed/value/except' do
|
224
|
+
{ type: params[:type] }
|
225
|
+
end
|
226
|
+
|
227
|
+
params do
|
228
|
+
optional :optional, type: Array[String], values: %w[a b c]
|
229
|
+
end
|
230
|
+
put '/optional_with_array_of_string_values'
|
231
|
+
|
232
|
+
params do
|
233
|
+
requires :type, values: { proc: ->(v) { ValuesModel.include? v } }
|
234
|
+
end
|
235
|
+
get '/proc' do
|
236
|
+
{ type: params[:type] }
|
237
|
+
end
|
238
|
+
|
239
|
+
params do
|
240
|
+
requires :type, values: { proc: ->(v) { ValuesModel.include? v }, message: 'failed check' }
|
241
|
+
end
|
242
|
+
get '/proc/message'
|
243
|
+
|
244
|
+
params do
|
245
|
+
optional :name, type: String, values: %w[a b], allow_blank: true
|
246
|
+
end
|
247
|
+
get '/allow_blank'
|
248
|
+
end
|
231
249
|
end
|
232
250
|
|
233
251
|
context 'with a custom validation message' do
|
@@ -244,7 +262,7 @@ describe Grape::Validations::ValuesValidator do
|
|
244
262
|
end
|
245
263
|
|
246
264
|
it 'validates against values in a proc' do
|
247
|
-
|
265
|
+
ValuesModel.add_value('valid-type4')
|
248
266
|
|
249
267
|
get('/custom_message/lambda', type: 'valid-type4')
|
250
268
|
expect(last_response.status).to eq 200
|
@@ -312,7 +330,7 @@ describe Grape::Validations::ValuesValidator do
|
|
312
330
|
expect(last_response.status).to eq 200
|
313
331
|
end
|
314
332
|
|
315
|
-
it '
|
333
|
+
it 'accepts for an optional param with a list of values' do
|
316
334
|
put('/optional_with_array_of_string_values', optional: nil)
|
317
335
|
expect(last_response.status).to eq 200
|
318
336
|
end
|
@@ -343,15 +361,14 @@ describe Grape::Validations::ValuesValidator do
|
|
343
361
|
end
|
344
362
|
|
345
363
|
it 'does not validate updated values without proc' do
|
346
|
-
|
347
|
-
|
364
|
+
ValuesModel.add_value('valid-type4')
|
348
365
|
get('/', type: 'valid-type4')
|
349
366
|
expect(last_response.status).to eq 400
|
350
367
|
expect(last_response.body).to eq({ error: 'type does not have a valid value' }.to_json)
|
351
368
|
end
|
352
369
|
|
353
370
|
it 'validates against values in a proc' do
|
354
|
-
|
371
|
+
ValuesModel.add_value('valid-type4')
|
355
372
|
|
356
373
|
get('/lambda', type: 'valid-type4')
|
357
374
|
expect(last_response.status).to eq 200
|
@@ -364,6 +381,18 @@ describe Grape::Validations::ValuesValidator do
|
|
364
381
|
expect(last_response.body).to eq({ error: 'type does not have a valid value' }.to_json)
|
365
382
|
end
|
366
383
|
|
384
|
+
it 'validates against values in an endless range', if: ActiveSupport::VERSION::MAJOR >= 6 do
|
385
|
+
get('/endless', type: 10)
|
386
|
+
expect(last_response.status).to eq 200
|
387
|
+
expect(last_response.body).to eq({ type: 10 }.to_json)
|
388
|
+
end
|
389
|
+
|
390
|
+
it 'does not allow an invalid value for a parameter using an endless range', if: ActiveSupport::VERSION::MAJOR >= 6 do
|
391
|
+
get('/endless', type: 0)
|
392
|
+
expect(last_response.status).to eq 400
|
393
|
+
expect(last_response.body).to eq({ error: 'type does not have a valid value' }.to_json)
|
394
|
+
end
|
395
|
+
|
367
396
|
it 'does not allow non-numeric string value for int value using lambda' do
|
368
397
|
get('/lambda_int_val', number: 'foo')
|
369
398
|
expect(last_response.status).to eq 400
|
@@ -413,29 +442,39 @@ describe Grape::Validations::ValuesValidator do
|
|
413
442
|
it 'raises IncompatibleOptionValues on an invalid default value from proc' do
|
414
443
|
subject = Class.new(Grape::API)
|
415
444
|
expect do
|
416
|
-
subject.params { optional :type, values: [
|
445
|
+
subject.params { optional :type, values: %w[valid-type1 valid-type2 valid-type3], default: "#{ValuesModel.values.sample}_invalid" }
|
417
446
|
end.to raise_error Grape::Exceptions::IncompatibleOptionValues
|
418
447
|
end
|
419
448
|
|
420
449
|
it 'raises IncompatibleOptionValues on an invalid default value' do
|
421
450
|
subject = Class.new(Grape::API)
|
422
451
|
expect do
|
423
|
-
subject.params { optional :type, values: [
|
452
|
+
subject.params { optional :type, values: %w[valid-type1 valid-type2 valid-type3], default: 'invalid-type' }
|
424
453
|
end.to raise_error Grape::Exceptions::IncompatibleOptionValues
|
425
454
|
end
|
426
455
|
|
427
456
|
it 'raises IncompatibleOptionValues when type is incompatible with values array' do
|
428
457
|
subject = Class.new(Grape::API)
|
429
458
|
expect do
|
430
|
-
subject.params { optional :type, values: [
|
459
|
+
subject.params { optional :type, values: %w[valid-type1 valid-type2 valid-type3], type: Symbol }
|
431
460
|
end.to raise_error Grape::Exceptions::IncompatibleOptionValues
|
432
461
|
end
|
433
462
|
|
434
|
-
|
435
|
-
|
436
|
-
|
437
|
-
|
463
|
+
context 'boolean values' do
|
464
|
+
it 'allows a value from the list' do
|
465
|
+
get('/values/optional_boolean', type: true)
|
466
|
+
|
467
|
+
expect(last_response.status).to eq 200
|
468
|
+
expect(last_response.body).to eq({ type: true }.to_json)
|
469
|
+
end
|
470
|
+
|
471
|
+
it 'rejects a value which is not in the list' do
|
472
|
+
get('/values/optional_boolean', type: false)
|
473
|
+
|
474
|
+
expect(last_response.body).to eq({ error: 'type does not have a valid value' }.to_json)
|
475
|
+
end
|
438
476
|
end
|
477
|
+
|
439
478
|
it 'allows values to be a kind of the coerced type not just an instance of it' do
|
440
479
|
get('/values/coercion', type: 10)
|
441
480
|
expect(last_response.status).to eq 200
|
@@ -462,6 +501,14 @@ describe Grape::Validations::ValuesValidator do
|
|
462
501
|
end.to raise_error Grape::Exceptions::IncompatibleOptionValues
|
463
502
|
end
|
464
503
|
|
504
|
+
it 'allows a blank value when the allow_blank option is true' do
|
505
|
+
get 'allow_blank', name: nil
|
506
|
+
expect(last_response.status).to eq(200)
|
507
|
+
|
508
|
+
get 'allow_blank', name: ''
|
509
|
+
expect(last_response.status).to eq(200)
|
510
|
+
end
|
511
|
+
|
465
512
|
context 'with a lambda values' do
|
466
513
|
subject do
|
467
514
|
Class.new(Grape::API) do
|
@@ -623,9 +670,9 @@ describe Grape::Validations::ValuesValidator do
|
|
623
670
|
end
|
624
671
|
|
625
672
|
it 'accepts multiple valid values' do
|
626
|
-
get '/proc', type: [
|
673
|
+
get '/proc', type: %w[valid-type1 valid-type3]
|
627
674
|
expect(last_response.status).to eq 200
|
628
|
-
expect(last_response.body).to eq({ type: [
|
675
|
+
expect(last_response.body).to eq({ type: %w[valid-type1 valid-type3] }.to_json)
|
629
676
|
end
|
630
677
|
|
631
678
|
it 'rejects a single invalid value' do
|
@@ -635,7 +682,7 @@ describe Grape::Validations::ValuesValidator do
|
|
635
682
|
end
|
636
683
|
|
637
684
|
it 'rejects an invalid value among valid ones' do
|
638
|
-
get '/proc', type: [
|
685
|
+
get '/proc', type: %w[valid-type1 invalid-type1 valid-type3]
|
639
686
|
expect(last_response.status).to eq 400
|
640
687
|
expect(last_response.body).to eq({ error: 'type does not have a valid value' }.to_json)
|
641
688
|
end
|