Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions lib/open_api_spex/cast_parameters.ex
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ defmodule OpenApiSpex.CastParameters do
alias OpenApiSpex.Cast.Error
alias Plug.Conn

@default_parsers %{~r/^application\/.*json.*$/ => OpenApi.json_encoder()}

@spec cast(Plug.Conn.t(), Operation.t(), OpenApi.t(), opts :: [OpenApiSpex.cast_opt()]) ::
{:error, [Error.t()]} | {:ok, Conn.t()}
def cast(conn, operation, spec, opts \\ []) do
Expand Down Expand Up @@ -120,7 +118,7 @@ defmodule OpenApiSpex.CastParameters do
opts
) do
parsers = Map.get(ext || %{}, "x-parameter-content-parsers", %{})
parsers = Map.merge(@default_parsers, parsers)
parsers = Map.merge(default_parsers(), parsers)

conn
|> get_params_by_location(
Expand All @@ -134,6 +132,9 @@ defmodule OpenApiSpex.CastParameters do
end
end

defp default_parsers,
do: %{~r/^application\/.*json.*$/ => OpenApi.json_encoder()}

defp pre_parse_parameters(%{} = parameters, %{} = parameters_context, parsers) do
Enum.reduce_while(parameters, Map.new(), fn {key, value}, acc ->
case pre_parse_parameter(value, Map.get(parameters_context, key, %{}), parsers) do
Expand Down
4 changes: 3 additions & 1 deletion lib/open_api_spex/controller_specs.ex
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,9 @@ defmodule OpenApiSpex.ControllerSpecs do

extensions =
spec
|> Enum.filter(fn {key, _val} -> is_atom(key) && String.starts_with?(to_string(key), "x-") end)
|> Enum.filter(fn {key, _val} ->
is_atom(key) && String.starts_with?(to_string(key), "x-")
end)
|> Map.new(fn {key, value} -> {to_string(key), value} end)

%Operation{
Expand Down
2 changes: 1 addition & 1 deletion test/cast/string_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ defmodule OpenApiSpex.CastStringTest do
assert {:error, [error]} = cast(value: "hello", schema: schema)
assert error.reason == :invalid_format
assert error.value == "hello"
assert error.format == ~r/\d-\d/
assert error.format.source == "\\d-\\d"
end

test "string with format (date time)" do
Expand Down
2 changes: 1 addition & 1 deletion test/support/schemas.ex
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ defmodule OpenApiSpexTest.Schemas do
type: :object,
properties: %{
id: %Schema{type: :integer, description: "User ID"},
name: %Schema{type: :string, description: "User name", pattern: ~r/[a-zA-Z][a-zA-Z0-9_]+/},
name: %Schema{type: :string, description: "User name", pattern: "[a-zA-Z][a-zA-Z0-9_]+"},
email: %Schema{type: :string, description: "Email address", format: :email},
password: %Schema{type: :string, description: "Login password", writeOnly: true},
age: %Schema{type: :integer, description: "Age"},
Expand Down
Loading