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
6 changes: 2 additions & 4 deletions lib/tesla/middleware/json.ex
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,9 @@ defmodule Tesla.Middleware.JSON do
# or
{Tesla.Middleware.JSON, engine: JSON}
# or
{Tesla.Middleware.JSON, engine: JSX, engine_opts: [strict: [:comments]]},
# or
{Tesla.Middleware.JSON, engine: Poison, engine_opts: [keys: :atoms]},
# or
{Tesla.Middleware.JSON, decode: &JSX.decode/1, encode: &JSX.encode/1}
{Tesla.Middleware.JSON, decode: &Jason.decode/1, encode: &Jason.encode/1}
])
end
end
Expand All @@ -50,7 +48,7 @@ defmodule Tesla.Middleware.JSON do
- `:decode` - decoding function
- `:encode` - encoding function
- `:encode_content_type` - content-type to be used in request header
- `:engine` - encode/decode engine, e.g `JSON`, `Jason`, `Poison` or `JSX` (defaults to Jason)
- `:engine` - encode/decode engine, e.g `JSON`, `Jason` or `Poison` (defaults to Jason)
- `:engine_opts` - optional engine options
- `:decode_content_types` - list of additional decodable content-types
"""
Expand Down
1 change: 0 additions & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ defmodule Tesla.Mixfile do
# json parsers
{:jason, ">= 1.0.0", optional: true},
{:poison, ">= 1.0.0", optional: true},
{:exjsx, ">= 3.0.0", optional: true},

# messagepack parsers
{:msgpax, "~> 2.3", optional: true},
Expand Down
23 changes: 0 additions & 23 deletions test/tesla/middleware/json_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -295,29 +295,6 @@ defmodule Tesla.Middleware.JsonTest do
end
end

describe "Engine: exjsx" do
defmodule JsxClient do
use Tesla

plug Tesla.Middleware.JSON, engine: JSX

adapter fn env ->
{:ok,
%{
env
| status: 200,
headers: [{"content-type", "application/json"}],
body: ~s|{"value": 123}|
}}
end
end

test "decode with custom engine options" do
assert {:ok, env} = JsxClient.get("/decode")
assert env.body == %{"value" => 123}
end
end

if Code.ensure_loaded?(JSON) do
describe "Engine: JSON" do
defmodule JSONClient do
Expand Down
Loading