grape 1.2.5 → 1.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +97 -0
- data/LICENSE +1 -1
- data/README.md +53 -16
- data/UPGRADING.md +231 -23
- data/grape.gemspec +10 -1
- data/lib/grape.rb +6 -7
- data/lib/grape/api.rb +4 -2
- data/lib/grape/api/helpers.rb +2 -0
- data/lib/grape/api/instance.rb +36 -33
- data/lib/grape/config.rb +2 -0
- data/lib/grape/content_types.rb +34 -0
- data/lib/grape/cookies.rb +2 -0
- data/lib/grape/dsl/api.rb +2 -0
- data/lib/grape/dsl/callbacks.rb +2 -0
- data/lib/grape/dsl/configuration.rb +2 -0
- data/lib/grape/dsl/desc.rb +2 -0
- data/lib/grape/dsl/headers.rb +2 -0
- data/lib/grape/dsl/helpers.rb +4 -2
- data/lib/grape/dsl/inside_route.rb +83 -34
- data/lib/grape/dsl/logger.rb +2 -0
- data/lib/grape/dsl/middleware.rb +2 -0
- data/lib/grape/dsl/parameters.rb +8 -6
- data/lib/grape/dsl/request_response.rb +4 -2
- data/lib/grape/dsl/routing.rb +9 -5
- data/lib/grape/dsl/settings.rb +7 -1
- data/lib/grape/dsl/validations.rb +20 -1
- data/lib/grape/eager_load.rb +3 -1
- data/lib/grape/endpoint.rb +21 -13
- data/lib/grape/error_formatter.rb +3 -1
- data/lib/grape/error_formatter/base.rb +2 -0
- data/lib/grape/error_formatter/json.rb +2 -0
- data/lib/grape/error_formatter/txt.rb +2 -0
- data/lib/grape/error_formatter/xml.rb +2 -0
- data/lib/grape/exceptions/base.rb +11 -13
- 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 +2 -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 +2 -0
- 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/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 +2 -0
- data/lib/grape/exceptions/validation.rb +3 -1
- data/lib/grape/exceptions/validation_array_errors.rb +2 -0
- data/lib/grape/exceptions/validation_errors.rb +13 -12
- 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.rb +5 -3
- data/lib/grape/formatter/json.rb +2 -0
- data/lib/grape/formatter/serializable_hash.rb +2 -0
- data/lib/grape/formatter/txt.rb +2 -0
- data/lib/grape/formatter/xml.rb +2 -0
- data/lib/grape/http/headers.rb +50 -18
- data/lib/grape/middleware/auth/base.rb +2 -0
- data/lib/grape/middleware/auth/dsl.rb +2 -0
- 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 +7 -7
- data/lib/grape/middleware/error.rb +3 -1
- data/lib/grape/middleware/filter.rb +2 -0
- data/lib/grape/middleware/formatter.rb +8 -6
- data/lib/grape/middleware/globals.rb +2 -0
- data/lib/grape/middleware/helpers.rb +2 -0
- data/lib/grape/middleware/stack.rb +4 -1
- data/lib/grape/middleware/versioner.rb +2 -0
- data/lib/grape/middleware/versioner/accept_version_header.rb +2 -0
- data/lib/grape/middleware/versioner/header.rb +6 -4
- data/lib/grape/middleware/versioner/param.rb +3 -1
- data/lib/grape/middleware/versioner/parse_media_type_patch.rb +4 -1
- data/lib/grape/middleware/versioner/path.rb +3 -1
- data/lib/grape/namespace.rb +14 -2
- data/lib/grape/parser.rb +3 -1
- data/lib/grape/parser/json.rb +2 -0
- data/lib/grape/parser/xml.rb +2 -0
- data/lib/grape/path.rb +15 -3
- data/lib/grape/presenters/presenter.rb +2 -0
- data/lib/grape/request.rb +15 -8
- data/lib/grape/router.rb +30 -29
- data/lib/grape/router/attribute_translator.rb +39 -8
- data/lib/grape/router/pattern.rb +20 -16
- data/lib/grape/router/route.rb +12 -26
- 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/util/base_inheritable.rb +15 -6
- data/lib/grape/util/cache.rb +20 -0
- data/lib/grape/util/endpoint_configuration.rb +2 -0
- data/lib/grape/util/env.rb +19 -17
- data/lib/grape/util/inheritable_setting.rb +2 -0
- data/lib/grape/util/inheritable_values.rb +2 -0
- data/lib/grape/util/json.rb +2 -0
- data/lib/grape/util/lazy_block.rb +2 -0
- data/lib/grape/util/lazy_object.rb +43 -0
- data/lib/grape/util/lazy_value.rb +2 -0
- data/lib/grape/util/registrable.rb +2 -0
- data/lib/grape/util/reverse_stackable_values.rb +4 -0
- data/lib/grape/util/stackable_values.rb +10 -20
- data/lib/grape/util/strict_hash_configuration.rb +2 -0
- data/lib/grape/util/xml.rb +2 -0
- data/lib/grape/validations.rb +2 -0
- data/lib/grape/validations/attributes_iterator.rb +3 -3
- data/lib/grape/validations/multiple_attributes_iterator.rb +2 -0
- data/lib/grape/validations/params_scope.rb +27 -14
- data/lib/grape/validations/single_attribute_iterator.rb +13 -2
- data/lib/grape/validations/types.rb +12 -34
- data/lib/grape/validations/types/array_coercer.rb +65 -0
- data/lib/grape/validations/types/build_coercer.rb +47 -49
- data/lib/grape/validations/types/custom_type_coercer.rb +15 -49
- data/lib/grape/validations/types/custom_type_collection_coercer.rb +10 -25
- data/lib/grape/validations/types/dry_type_coercer.rb +76 -0
- data/lib/grape/validations/types/file.rb +22 -18
- data/lib/grape/validations/types/json.rb +46 -39
- data/lib/grape/validations/types/multiple_type_coercer.rb +14 -33
- data/lib/grape/validations/types/primitive_coercer.rb +67 -0
- data/lib/grape/validations/types/set_coercer.rb +40 -0
- data/lib/grape/validations/types/variant_collection_coercer.rb +5 -13
- data/lib/grape/validations/validator_factory.rb +2 -0
- data/lib/grape/validations/validators/all_or_none.rb +3 -1
- data/lib/grape/validations/validators/allow_blank.rb +3 -1
- data/lib/grape/validations/validators/as.rb +2 -0
- data/lib/grape/validations/validators/at_least_one_of.rb +3 -1
- data/lib/grape/validations/validators/base.rb +8 -5
- data/lib/grape/validations/validators/coerce.rb +39 -29
- data/lib/grape/validations/validators/default.rb +2 -1
- data/lib/grape/validations/validators/exactly_one_of.rb +6 -2
- data/lib/grape/validations/validators/except_values.rb +3 -1
- data/lib/grape/validations/validators/multiple_params_base.rb +2 -0
- data/lib/grape/validations/validators/mutual_exclusion.rb +3 -1
- data/lib/grape/validations/validators/presence.rb +3 -1
- data/lib/grape/validations/validators/regexp.rb +4 -2
- data/lib/grape/validations/validators/same_as.rb +6 -3
- data/lib/grape/validations/validators/values.rb +17 -5
- data/lib/grape/version.rb +3 -1
- data/spec/grape/api/custom_validations_spec.rb +5 -3
- data/spec/grape/api/deeply_included_options_spec.rb +2 -0
- data/spec/grape/api/defines_boolean_in_params_spec.rb +5 -3
- data/spec/grape/api/inherited_helpers_spec.rb +2 -0
- data/spec/grape/api/instance_spec.rb +104 -0
- data/spec/grape/api/invalid_format_spec.rb +2 -0
- data/spec/grape/api/namespace_parameters_in_route_spec.rb +2 -0
- data/spec/grape/api/nested_helpers_spec.rb +2 -0
- data/spec/grape/api/optional_parameters_in_route_spec.rb +2 -0
- data/spec/grape/api/parameters_modification_spec.rb +3 -1
- data/spec/grape/api/patch_method_helpers_spec.rb +2 -0
- data/spec/grape/api/recognize_path_spec.rb +2 -0
- data/spec/grape/api/required_parameters_in_route_spec.rb +2 -0
- data/spec/grape/api/required_parameters_with_invalid_method_spec.rb +2 -0
- data/spec/grape/api/routes_with_requirements_spec.rb +2 -0
- data/spec/grape/api/shared_helpers_exactly_one_of_spec.rb +2 -0
- data/spec/grape/api/shared_helpers_spec.rb +2 -0
- data/spec/grape/api_remount_spec.rb +2 -0
- data/spec/grape/api_spec.rb +99 -11
- data/spec/grape/config_spec.rb +2 -0
- data/spec/grape/dsl/callbacks_spec.rb +2 -0
- data/spec/grape/dsl/configuration_spec.rb +2 -0
- data/spec/grape/dsl/desc_spec.rb +2 -0
- data/spec/grape/dsl/headers_spec.rb +2 -0
- data/spec/grape/dsl/helpers_spec.rb +4 -2
- data/spec/grape/dsl/inside_route_spec.rb +177 -33
- data/spec/grape/dsl/logger_spec.rb +2 -0
- data/spec/grape/dsl/middleware_spec.rb +2 -0
- data/spec/grape/dsl/parameters_spec.rb +2 -0
- data/spec/grape/dsl/request_response_spec.rb +2 -0
- data/spec/grape/dsl/routing_spec.rb +2 -0
- data/spec/grape/dsl/settings_spec.rb +2 -0
- data/spec/grape/dsl/validations_spec.rb +2 -0
- data/spec/grape/endpoint_spec.rb +21 -6
- data/spec/grape/entity_spec.rb +2 -0
- data/spec/grape/exceptions/base_spec.rb +3 -1
- data/spec/grape/exceptions/body_parse_errors_spec.rb +2 -0
- data/spec/grape/exceptions/invalid_accept_header_spec.rb +2 -0
- data/spec/grape/exceptions/invalid_formatter_spec.rb +2 -0
- data/spec/grape/exceptions/invalid_response_spec.rb +2 -0
- data/spec/grape/exceptions/invalid_versioner_option_spec.rb +2 -0
- data/spec/grape/exceptions/missing_mime_type_spec.rb +2 -0
- data/spec/grape/exceptions/missing_option_spec.rb +2 -0
- data/spec/grape/exceptions/unknown_options_spec.rb +2 -0
- data/spec/grape/exceptions/unknown_validator_spec.rb +2 -0
- data/spec/grape/exceptions/validation_errors_spec.rb +4 -2
- data/spec/grape/exceptions/validation_spec.rb +3 -1
- data/spec/grape/extensions/param_builders/hash_spec.rb +2 -0
- data/spec/grape/extensions/param_builders/hash_with_indifferent_access_spec.rb +2 -0
- data/spec/grape/extensions/param_builders/hashie/mash_spec.rb +2 -0
- data/spec/grape/integration/global_namespace_function_spec.rb +2 -0
- data/spec/grape/integration/rack_sendfile_spec.rb +14 -8
- data/spec/grape/integration/rack_spec.rb +3 -1
- data/spec/grape/loading_spec.rb +2 -0
- data/spec/grape/middleware/auth/base_spec.rb +2 -0
- data/spec/grape/middleware/auth/dsl_spec.rb +2 -0
- data/spec/grape/middleware/auth/strategies_spec.rb +3 -1
- data/spec/grape/middleware/base_spec.rb +2 -0
- data/spec/grape/middleware/error_spec.rb +2 -0
- data/spec/grape/middleware/exception_spec.rb +3 -1
- data/spec/grape/middleware/formatter_spec.rb +19 -12
- data/spec/grape/middleware/globals_spec.rb +2 -0
- data/spec/grape/middleware/stack_spec.rb +11 -0
- data/spec/grape/middleware/versioner/accept_version_header_spec.rb +3 -1
- data/spec/grape/middleware/versioner/header_spec.rb +3 -1
- data/spec/grape/middleware/versioner/param_spec.rb +3 -1
- data/spec/grape/middleware/versioner/path_spec.rb +3 -1
- data/spec/grape/middleware/versioner_spec.rb +2 -0
- data/spec/grape/named_api_spec.rb +2 -0
- data/spec/grape/parser_spec.rb +7 -5
- data/spec/grape/path_spec.rb +6 -4
- data/spec/grape/presenters/presenter_spec.rb +2 -0
- data/spec/grape/request_spec.rb +2 -0
- data/spec/grape/util/inheritable_setting_spec.rb +2 -0
- data/spec/grape/util/inheritable_values_spec.rb +2 -0
- data/spec/grape/util/reverse_stackable_values_spec.rb +2 -0
- data/spec/grape/util/stackable_values_spec.rb +3 -1
- data/spec/grape/util/strict_hash_configuration_spec.rb +2 -0
- data/spec/grape/validations/attributes_iterator_spec.rb +2 -0
- data/spec/grape/validations/instance_behaivour_spec.rb +5 -3
- data/spec/grape/validations/multiple_attributes_iterator_spec.rb +2 -0
- data/spec/grape/validations/params_scope_spec.rb +3 -1
- data/spec/grape/validations/single_attribute_iterator_spec.rb +18 -4
- data/spec/grape/validations/types/array_coercer_spec.rb +35 -0
- data/spec/grape/validations/types/primitive_coercer_spec.rb +135 -0
- data/spec/grape/validations/types/set_coercer_spec.rb +34 -0
- data/spec/grape/validations/types_spec.rb +9 -36
- data/spec/grape/validations/validators/all_or_none_spec.rb +2 -0
- data/spec/grape/validations/validators/allow_blank_spec.rb +2 -0
- data/spec/grape/validations/validators/at_least_one_of_spec.rb +2 -0
- data/spec/grape/validations/validators/coerce_spec.rb +341 -136
- data/spec/grape/validations/validators/default_spec.rb +123 -0
- data/spec/grape/validations/validators/exactly_one_of_spec.rb +14 -12
- data/spec/grape/validations/validators/except_values_spec.rb +3 -1
- data/spec/grape/validations/validators/mutual_exclusion_spec.rb +2 -0
- data/spec/grape/validations/validators/presence_spec.rb +30 -0
- data/spec/grape/validations/validators/regexp_spec.rb +2 -0
- data/spec/grape/validations/validators/same_as_spec.rb +2 -0
- data/spec/grape/validations/validators/values_spec.rb +30 -5
- data/spec/grape/validations_spec.rb +91 -33
- data/spec/integration/eager_load/eager_load_spec.rb +15 -0
- data/spec/integration/multi_json/json_spec.rb +2 -0
- data/spec/integration/multi_xml/xml_spec.rb +2 -0
- data/spec/shared/versioning_examples.rb +2 -0
- data/spec/spec_helper.rb +18 -0
- data/spec/support/basic_auth_encode_helpers.rb +2 -0
- data/spec/support/content_type_helpers.rb +2 -0
- data/spec/support/eager_load.rb +19 -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 +4 -2
- metadata +48 -28
- 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
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'grape/exceptions/base'
|
2
4
|
|
3
5
|
module Grape
|
@@ -12,7 +14,7 @@ module Grape
|
|
12
14
|
@message_key = message if message.is_a?(Symbol)
|
13
15
|
args[:message] = translate_message(message)
|
14
16
|
end
|
15
|
-
super(args)
|
17
|
+
super(**args)
|
16
18
|
end
|
17
19
|
|
18
20
|
# remove all the unnecessary stuff from Grape::Exceptions::Base like status
|
@@ -1,8 +1,13 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'grape/exceptions/base'
|
2
4
|
|
3
5
|
module Grape
|
4
6
|
module Exceptions
|
5
7
|
class ValidationErrors < Grape::Exceptions::Base
|
8
|
+
ERRORS_FORMAT_KEY = 'grape.errors.format'
|
9
|
+
DEFAULT_ERRORS_FORMAT = '%{attributes} %{message}'
|
10
|
+
|
6
11
|
include Enumerable
|
7
12
|
|
8
13
|
attr_reader :errors
|
@@ -39,21 +44,17 @@ module Grape
|
|
39
44
|
end
|
40
45
|
|
41
46
|
def full_messages
|
42
|
-
messages = map
|
47
|
+
messages = map do |attributes, error|
|
48
|
+
I18n.t(
|
49
|
+
ERRORS_FORMAT_KEY,
|
50
|
+
default: DEFAULT_ERRORS_FORMAT,
|
51
|
+
attributes: translate_attributes(attributes),
|
52
|
+
message: error.message
|
53
|
+
)
|
54
|
+
end
|
43
55
|
messages.uniq!
|
44
56
|
messages
|
45
57
|
end
|
46
|
-
|
47
|
-
private
|
48
|
-
|
49
|
-
def full_message(attributes, error)
|
50
|
-
I18n.t(
|
51
|
-
'grape.errors.format',
|
52
|
-
default: '%{attributes} %{message}',
|
53
|
-
attributes: attributes.count == 1 ? translate_attribute(attributes.first) : translate_attributes(attributes),
|
54
|
-
message: error.message
|
55
|
-
)
|
56
|
-
end
|
57
58
|
end
|
58
59
|
end
|
59
60
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Grape
|
2
4
|
module Extensions
|
3
5
|
module ActiveSupport
|
@@ -14,10 +16,9 @@ module Grape
|
|
14
16
|
end
|
15
17
|
|
16
18
|
def build_params
|
17
|
-
params = ::ActiveSupport::HashWithIndifferentAccess
|
19
|
+
params = ::ActiveSupport::HashWithIndifferentAccess.new(rack_params)
|
18
20
|
params.deep_merge!(grape_routing_args) if env[Grape::Env::GRAPE_ROUTING_ARGS]
|
19
|
-
|
20
|
-
DeepHashWithIndifferentAccess.deep_hash_with_indifferent_access(params)
|
21
|
+
params
|
21
22
|
end
|
22
23
|
end
|
23
24
|
end
|
data/lib/grape/formatter.rb
CHANGED
@@ -1,9 +1,11 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Grape
|
2
4
|
module Formatter
|
3
5
|
extend Util::Registrable
|
4
6
|
|
5
7
|
class << self
|
6
|
-
def
|
8
|
+
def builtin_formatters
|
7
9
|
@builtin_formatters ||= {
|
8
10
|
json: Grape::Formatter::Json,
|
9
11
|
jsonapi: Grape::Formatter::Json,
|
@@ -13,8 +15,8 @@ module Grape
|
|
13
15
|
}
|
14
16
|
end
|
15
17
|
|
16
|
-
def formatters(options)
|
17
|
-
|
18
|
+
def formatters(**options)
|
19
|
+
builtin_formatters.merge(default_elements).merge!(options[:formatters] || {})
|
18
20
|
end
|
19
21
|
|
20
22
|
def formatter_for(api_format, **options)
|
data/lib/grape/formatter/json.rb
CHANGED
data/lib/grape/formatter/txt.rb
CHANGED
data/lib/grape/formatter/xml.rb
CHANGED
data/lib/grape/http/headers.rb
CHANGED
@@ -1,29 +1,61 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'grape/util/lazy_object'
|
4
|
+
|
1
5
|
module Grape
|
2
6
|
module Http
|
3
7
|
module Headers
|
4
8
|
# https://github.com/rack/rack/blob/master/lib/rack.rb
|
5
|
-
HTTP_VERSION = 'HTTP_VERSION'
|
6
|
-
PATH_INFO = 'PATH_INFO'
|
7
|
-
REQUEST_METHOD = 'REQUEST_METHOD'
|
8
|
-
QUERY_STRING = 'QUERY_STRING'
|
9
|
-
CONTENT_TYPE = 'Content-Type'
|
10
|
-
|
11
|
-
GET = 'GET'
|
12
|
-
POST = 'POST'
|
13
|
-
PUT = 'PUT'
|
14
|
-
PATCH = 'PATCH'
|
15
|
-
DELETE = 'DELETE'
|
16
|
-
HEAD = 'HEAD'
|
17
|
-
OPTIONS = 'OPTIONS'
|
9
|
+
HTTP_VERSION = 'HTTP_VERSION'
|
10
|
+
PATH_INFO = 'PATH_INFO'
|
11
|
+
REQUEST_METHOD = 'REQUEST_METHOD'
|
12
|
+
QUERY_STRING = 'QUERY_STRING'
|
13
|
+
CONTENT_TYPE = 'Content-Type'
|
14
|
+
|
15
|
+
GET = 'GET'
|
16
|
+
POST = 'POST'
|
17
|
+
PUT = 'PUT'
|
18
|
+
PATCH = 'PATCH'
|
19
|
+
DELETE = 'DELETE'
|
20
|
+
HEAD = 'HEAD'
|
21
|
+
OPTIONS = 'OPTIONS'
|
18
22
|
|
19
23
|
SUPPORTED_METHODS = [GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS].freeze
|
24
|
+
SUPPORTED_METHODS_WITHOUT_OPTIONS = Grape::Util::LazyObject.new { [GET, POST, PUT, PATCH, DELETE, HEAD].freeze }
|
25
|
+
|
26
|
+
HTTP_ACCEPT_VERSION = 'HTTP_ACCEPT_VERSION'
|
27
|
+
X_CASCADE = 'X-Cascade'
|
28
|
+
HTTP_TRANSFER_ENCODING = 'HTTP_TRANSFER_ENCODING'
|
29
|
+
HTTP_ACCEPT = 'HTTP_ACCEPT'
|
30
|
+
|
31
|
+
FORMAT = 'format'
|
20
32
|
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
33
|
+
HTTP_HEADERS = Grape::Util::LazyObject.new do
|
34
|
+
common_http_headers = %w[
|
35
|
+
Version
|
36
|
+
Host
|
37
|
+
Connection
|
38
|
+
Cache-Control
|
39
|
+
Dnt
|
40
|
+
Upgrade-Insecure-Requests
|
41
|
+
User-Agent
|
42
|
+
Sec-Fetch-Dest
|
43
|
+
Accept
|
44
|
+
Sec-Fetch-Site
|
45
|
+
Sec-Fetch-Mode
|
46
|
+
Sec-Fetch-User
|
47
|
+
Accept-Encoding
|
48
|
+
Accept-Language
|
49
|
+
Cookie
|
50
|
+
].freeze
|
51
|
+
common_http_headers.each_with_object({}) do |header, response|
|
52
|
+
response["HTTP_#{header.upcase.tr('-', '_')}"] = header
|
53
|
+
end.freeze
|
54
|
+
end
|
25
55
|
|
26
|
-
|
56
|
+
def self.find_supported_method(route_method)
|
57
|
+
Grape::Http::Headers::SUPPORTED_METHODS.detect { |supported_method| supported_method.casecmp(route_method).zero? }
|
58
|
+
end
|
27
59
|
end
|
28
60
|
end
|
29
61
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'grape/dsl/headers'
|
2
4
|
|
3
5
|
module Grape
|
@@ -6,15 +8,15 @@ module Grape
|
|
6
8
|
include Helpers
|
7
9
|
|
8
10
|
attr_reader :app, :env, :options
|
9
|
-
TEXT_HTML = 'text/html'
|
11
|
+
TEXT_HTML = 'text/html'
|
10
12
|
|
11
13
|
include Grape::DSL::Headers
|
12
14
|
|
13
15
|
# @param [Rack Application] app The standard argument for a Rack middleware.
|
14
16
|
# @param [Hash] options A hash of options, simply stored for use by subclasses.
|
15
|
-
def initialize(app,
|
17
|
+
def initialize(app, options = {})
|
16
18
|
@app = app
|
17
|
-
@options = default_options.merge(
|
19
|
+
@options = default_options.merge(options)
|
18
20
|
@app_response = nil
|
19
21
|
end
|
20
22
|
|
@@ -23,7 +25,7 @@ module Grape
|
|
23
25
|
end
|
24
26
|
|
25
27
|
def call(env)
|
26
|
-
dup.call!(env)
|
28
|
+
dup.call!(env).to_a
|
27
29
|
end
|
28
30
|
|
29
31
|
def call!(env)
|
@@ -72,11 +74,9 @@ module Grape
|
|
72
74
|
end
|
73
75
|
|
74
76
|
def mime_types
|
75
|
-
|
76
|
-
content_types.each_pair do |k, v|
|
77
|
+
@mime_type ||= content_types.each_pair.with_object({}) do |(k, v), types_without_params|
|
77
78
|
types_without_params[v.split(';').first] = k
|
78
79
|
end
|
79
|
-
types_without_params
|
80
80
|
end
|
81
81
|
|
82
82
|
private
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'grape/middleware/base'
|
2
4
|
require 'active_support/core_ext/string/output_safety'
|
3
5
|
|
@@ -77,7 +79,7 @@ module Grape
|
|
77
79
|
|
78
80
|
def format_message(message, backtrace, original_exception = nil)
|
79
81
|
format = env[Grape::Env::API_FORMAT] || options[:format]
|
80
|
-
formatter = Grape::ErrorFormatter.formatter_for(format, options)
|
82
|
+
formatter = Grape::ErrorFormatter.formatter_for(format, **options)
|
81
83
|
throw :error,
|
82
84
|
status: 406,
|
83
85
|
message: "The requested format '#{format}' is not supported.",
|
@@ -1,9 +1,11 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'grape/middleware/base'
|
2
4
|
|
3
5
|
module Grape
|
4
6
|
module Middleware
|
5
7
|
class Formatter < Base
|
6
|
-
CHUNKED = 'chunked'
|
8
|
+
CHUNKED = 'chunked'
|
7
9
|
|
8
10
|
def default_options
|
9
11
|
{
|
@@ -34,9 +36,9 @@ module Grape
|
|
34
36
|
def build_formatted_response(status, headers, bodies)
|
35
37
|
headers = ensure_content_type(headers)
|
36
38
|
|
37
|
-
if bodies.is_a?(Grape::
|
38
|
-
Grape::
|
39
|
-
resp.body = bodies.
|
39
|
+
if bodies.is_a?(Grape::ServeStream::StreamResponse)
|
40
|
+
Grape::ServeStream::SendfileResponse.new([], status, headers) do |resp|
|
41
|
+
resp.body = bodies.stream
|
40
42
|
end
|
41
43
|
else
|
42
44
|
# Allow content-type to be explicitly overwritten
|
@@ -52,7 +54,7 @@ module Grape
|
|
52
54
|
|
53
55
|
def fetch_formatter(headers, options)
|
54
56
|
api_format = mime_types[headers[Grape::Http::Headers::CONTENT_TYPE]] || env[Grape::Env::API_FORMAT]
|
55
|
-
Grape::Formatter.formatter_for(api_format, options)
|
57
|
+
Grape::Formatter.formatter_for(api_format, **options)
|
56
58
|
end
|
57
59
|
|
58
60
|
# Set the content type header for the API format if it is not already present.
|
@@ -97,7 +99,7 @@ module Grape
|
|
97
99
|
unless content_type_for(fmt)
|
98
100
|
throw :error, status: 415, message: "The provided content-type '#{request.media_type}' is not supported."
|
99
101
|
end
|
100
|
-
parser = Grape::Parser.parser_for fmt, options
|
102
|
+
parser = Grape::Parser.parser_for fmt, **options
|
101
103
|
if parser
|
102
104
|
begin
|
103
105
|
body = (env[Grape::Env::API_REQUEST_BODY] = parser.call(body, env))
|