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.

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

Support for elixir 1.5 #70

Merged
merged 3 commits into from Oct 1, 2017
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion .travis.yml
@@ -1,10 +1,17 @@
language: elixir
elixir:
- 1.3.4
- 1.4.0
- 1.4.5
- 1.5.1
otp_release:
- 18.3
- 19.2
- 20.0

matrix:
exclude:
- elixir: 1.3.4
otp_release: 20.0

sudo: false

Expand Down
4 changes: 2 additions & 2 deletions lib/maxwell/adapter/httpc.ex
Expand Up @@ -71,10 +71,10 @@ defmodule Maxwell.Adapter.Httpc do

defp header_serialize(headers) do
{content_type, headers} = Map.pop(headers, "content-type")
headers = Enum.map(headers, fn {key, value} -> {to_char_list(key), to_char_list(value)} end)
headers = Enum.map(headers, fn {key, value} -> {to_charlist(key), to_charlist(value)} end)
case content_type do
nil -> {nil, headers}
type -> {to_char_list(type), headers}
type -> {to_charlist(type), headers}
end
end

Expand Down
2 changes: 1 addition & 1 deletion lib/maxwell/adapter/util.ex
Expand Up @@ -24,7 +24,7 @@ defmodule Maxwell.Adapter.Util do
url = url |> append_query_string(path, query_string)
case type do
:string -> url
:char_list -> url |> to_char_list
:char_list -> url |> to_charlist
end
end

Expand Down
2 changes: 1 addition & 1 deletion lib/maxwell/middleware/rels.ex
Expand Up @@ -18,7 +18,7 @@ defmodule Maxwell.Middleware.Rels do
link
|> to_string
|> String.split(",")
|> Enum.map(&String.strip/1)
|> Enum.map(&String.trim/1)
|> Enum.reduce(%{}, fn (e, acc) ->
case Regex.named_captures(~r/(?<value>(.+)); rel=(?<key>(.+))/, e) do
nil -> acc;
Expand Down
2 changes: 1 addition & 1 deletion mix.exs
Expand Up @@ -42,7 +42,7 @@ defmodule Maxwell.Mixfile do
{:cmark, "~> 0.6", only: [:dev]},
{:inch_ex, "~> 0.5.4", only: :docs},
{:credo, "~> 0.5", only: [:dev]},
{:mock, "~> 0.2.0", only: :test},
{:mock, "~> 0.3.1", only: :test},
]
end

Expand Down
4 changes: 2 additions & 2 deletions mix.lock
Expand Up @@ -14,9 +14,9 @@
"inch_ex": {:hex, :inch_ex, "0.5.6", "418357418a553baa6d04eccd1b44171936817db61f4c0840112b420b8e378e67", [:mix], [{:poison, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
"jsx": {:hex, :jsx, "2.8.2", "7acc7d785b5abe8a6e9adbde926a24e481f29956dd8b4df49e3e4e7bcc92a018", [:mix, :rebar3], [], "hexpm"},
"markdown": {:git, "https://github.com/devinus/markdown.git", "d065dbcc4e242a85ca2516fdadd0082712871fd8", []},
"meck": {:hex, :meck, "0.8.4", "59ca1cd971372aa223138efcf9b29475bde299e1953046a0c727184790ab1520", [:make, :rebar], [], "hexpm"},
"meck": {:hex, :meck, "0.8.8", "eeb3efe811d4346e1a7f65b2738abc2ad73cbe1a2c91b5dd909bac2ea0414fa6", [:rebar3], [], "hexpm"},
"metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm"},
"mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], [], "hexpm"},
"mock": {:hex, :mock, "0.2.1", "bfdba786903e77f9c18772dee472d020ceb8ef000783e737725a4c8f54ad28ec", [:mix], [{:meck, "~> 0.8.2", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm"},
"mock": {:hex, :mock, "0.3.1", "994f00150f79a0ea50dc9d86134cd9ebd0d177ad60bd04d1e46336cdfdb98ff9", [:mix], [{:meck, "~> 0.8.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm"},
"poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"},
"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.1", "28a4d65b7f59893bc2c7de786dec1e1555bd742d336043fe644ae956c3497fbe", [:make, :rebar], [], "hexpm"}}