Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Validate path params defined on the path item #86

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Validate path params defined on the path item #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51ad0ed
Validate path params defined on the path item
danielfone Jul 4, 2020
5fb59c6
Support inherited parameters for operations
danielfone Aug 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions lib/openapi_parser/concerns/parameter_validatable.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,18 @@ def validate_request_parameter(params, headers, options)
validate_query_parameter(params, object_reference, options)
end

def header_parameter_hash
divided_parameter_hash['header'] || {}
end

def path_parameter_hash
divided_parameter_hash['path'] || {}
end

def query_parameter_hash
divided_parameter_hash['query'] || {}
end

private

# @param [Hash] params query parameter hash
Expand All @@ -29,18 +41,6 @@ def validate_header_parameter(headers, object_reference, options)
OpenAPIParser::ParameterValidator.validate_parameter(header_parameter_hash, headers, object_reference, options, true)
end

def header_parameter_hash
divided_parameter_hash['header'] || []
end

def path_parameter_hash
divided_parameter_hash['path'] || []
end

def query_parameter_hash
divided_parameter_hash['query'] || []
end

# @return [Hash{String => Hash{String => Parameter}}] hash[in][name] => Parameter
def divided_parameter_hash
@divided_parameter_hash ||=
Expand Down
1 change: 0 additions & 1 deletion lib/openapi_parser/request_operation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ def validate_response_body(response_body, response_validate_options = nil)
# @param [OpenAPIParser::SchemaValidator::Options] options request validator options
def validate_request_parameter(params, headers, options = nil)
options ||= config.request_validator_options
path_item&.validate_request_parameter(params, headers, options)
operation_object&.validate_request_parameter(params, headers, options)
end

Expand Down
15 changes: 15 additions & 0 deletions lib/openapi_parser/schemas/operation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ module OpenAPIParser::Schemas
class Operation < Base
include OpenAPIParser::ParameterValidatable

alias path_item parent

openapi_attr_values :tags, :summary, :description, :deprecated

openapi_attr_value :operation_id, schema_key: :operationId
Expand All @@ -30,5 +32,18 @@ def validate_request_body(content_type, params, options)
def validate_response(response_body, response_validate_options)
responses&.validate(response_body, response_validate_options)
end

def header_parameter_hash
@header_parameter_hash ||= path_item.header_parameter_hash.merge(super)
end

def path_parameter_hash
@path_parameter_hash ||= path_item.path_parameter_hash.merge(super)
end

def query_parameter_hash
@query_parameter_hash ||= path_item.query_parameter_hash.merge(super)
end

end
end