Skip to content

Commit

Permalink
Merge pull request #37 from lattenwald/master
Browse files Browse the repository at this point in the history 
error strings typo fixes
  • Loading branch information
@bitwalker
bitwalker committed Jan 16, 2017
2 parents d6a3be5 + 38069a9 commit 8957e54
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 30 deletions.
23 changes: 11 additions & 12 deletions lib/maxwell/middleware/json.ex
View file
Expand Up @@ -45,14 +45,14 @@ defmodule Maxwell.Middleware.Json do
for {key, value} <- opts do
case key do
:encode_func ->
unless is_function(value, 1), do: raise(ArgumentError, "Json Middleware :encode_func only accpect function/1");
unless is_function(value, 1), do: raise(ArgumentError, "Json Middleware :encode_func only accepts function/1");
:encode_content_type ->
unless is_binary(value), do: raise(ArgumentError, "Json Middleware :encode_content_types only accpect string");
unless is_binary(value), do: raise(ArgumentError, "Json Middleware :encode_content_types only accepts string");
:decode_func ->
unless is_function(value, 1), do: raise(ArgumentError, "Json Middleware :decode_func only accpect function/1");
unless is_function(value, 1), do: raise(ArgumentError, "Json Middleware :decode_func only accepts function/1");
:decode_content_types ->
unless is_list(value), do: raise(ArgumentError, "Json Middleware :decode_content_types only accpect lists");
_ -> raise(ArgumentError, "Json Middleware Options don't accpect #{key}")
unless is_list(value), do: raise(ArgumentError, "Json Middleware :decode_content_types only accepts lists");
_ -> raise(ArgumentError, "Json Middleware Options doesn't accept #{key}")
end
end
end
Expand Down Expand Up @@ -103,10 +103,10 @@ defmodule Maxwell.Middleware.EncodeJson do
for {key, value} <- opts do
case key do
:encode_func ->
unless is_function(value, 1), do: raise(ArgumentError, "EncodeJson :encode_func only accpect function/1");
unless is_function(value, 1), do: raise(ArgumentError, "EncodeJson :encode_func only accepts function/1");
:encode_content_type ->
unless is_binary(value), do: raise(ArgumentError, "EncodeJson :encode_content_types only accpect string");
_ -> raise(ArgumentError, "EncodeJson Options don't accpect #{key} (:encode_func and :encode_content_type)")
unless is_binary(value), do: raise(ArgumentError, "EncodeJson :encode_content_types only accepts string");
_ -> raise(ArgumentError, "EncodeJson Options doesn't accept #{key} (:encode_func and :encode_content_type)")
end
end
end
Expand Down Expand Up @@ -168,13 +168,12 @@ defmodule Maxwell.Middleware.DecodeJson do
for {key, value} <- opts do
case key do
:decode_func ->
unless is_function(value, 1), do: raise(ArgumentError, "DecodeJson :decode_func only accpect function/1");
unless is_function(value, 1), do: raise(ArgumentError, "DecodeJson :decode_func only accepts function/1");
:decode_content_types ->
unless is_list(value), do: raise(ArgumentError, "DecodeJson :decode_content_types only accpect lists");
unless is_list(value), do: raise(ArgumentError, "DecodeJson :decode_content_types only accepts lists");
_ ->
raise(ArgumentError, "DecodeJson Options don't accpect #{key} (:decode_func and :decode_content_types)")
raise(ArgumentError, "DecodeJson Options doesn't accept #{key} (:decode_func and :decode_content_types)")
end
end
end
end

5 changes: 2 additions & 3 deletions lib/maxwell/middleware/logger.ex
View file
Expand Up @@ -53,11 +53,10 @@ defmodule Maxwell.Middleware.Logger do
for {key, value} <- opts do
case key do
:log_level ->
unless is_atom(value), do: raise(ArgumentError, "Logger Middleware :log_level only accpect atom");
_ -> raise(ArgumentError, "Logger Middleware Options don't accpect #{key} (:log_level)")
unless is_atom(value), do: raise(ArgumentError, "Logger Middleware :log_level only accepts atom");
_ -> raise(ArgumentError, "Logger Middleware Options doesn't accept #{key} (:log_level)")
end
end
end

end

23 changes: 11 additions & 12 deletions test/maxwell/middleware/json_test.exs
View file
Expand Up @@ -157,7 +157,7 @@ defmodule DecodeJsonTest do
end

test "JsonTest with invalid options encode_func" do
assert_raise ArgumentError, "Json Middleware :encode_func only accpect function/1", fn ->
assert_raise ArgumentError, "Json Middleware :encode_func only accepts function/1", fn ->
defmodule TAtom1 do
use Maxwell.Builder, [:get, :post]
middleware Maxwell.Middleware.Json, [encode_func: :atom]
Expand All @@ -167,7 +167,7 @@ defmodule DecodeJsonTest do
end

test "JsonTest with invalid options encode_content_type" do
assert_raise ArgumentError, "Json Middleware :encode_content_types only accpect string", fn ->
assert_raise ArgumentError, "Json Middleware :encode_content_types only accepts string", fn ->
defmodule TAtom2 do
use Maxwell.Builder, [:get, :post]
middleware Maxwell.Middleware.Json, [encode_content_type: :atom]
Expand All @@ -177,7 +177,7 @@ defmodule DecodeJsonTest do
end

test "JsonTest with invalid options decode_func" do
assert_raise ArgumentError, "Json Middleware :decode_func only accpect function/1", fn ->
assert_raise ArgumentError, "Json Middleware :decode_func only accepts function/1", fn ->
defmodule TAtom3 do
use Maxwell.Builder, [:get, :post]
middleware Maxwell.Middleware.Json, [decode_func: 123]
Expand All @@ -187,7 +187,7 @@ defmodule DecodeJsonTest do
end

test "JsonTest with invalid options decode_content_types" do
assert_raise ArgumentError, "Json Middleware :decode_content_types only accpect lists", fn ->
assert_raise ArgumentError, "Json Middleware :decode_content_types only accepts lists", fn ->
defmodule TAtom4 do
use Maxwell.Builder, [:get, :post]
middleware Maxwell.Middleware.Json, [decode_content_types: "application/json"]
Expand All @@ -197,7 +197,7 @@ defmodule DecodeJsonTest do
end

test "JsonTest with wrong options" do
assert_raise ArgumentError, "Json Middleware Options don't accpect wrong_option", fn ->
assert_raise ArgumentError, "Json Middleware Options doesn't accept wrong_option", fn ->
defmodule TAtom5 do
use Maxwell.Builder, [:get, :post]
middleware Maxwell.Middleware.Json, [wrong_option: "application/json"]
Expand All @@ -207,7 +207,7 @@ defmodule DecodeJsonTest do
end

test "EncodeJsonTest with invalid options encode_func " do
assert_raise ArgumentError, "EncodeJson :encode_func only accpect function/1", fn ->
assert_raise ArgumentError, "EncodeJson :encode_func only accepts function/1", fn ->
defmodule TAtom6 do
use Maxwell.Builder, [:get, :post]
middleware Maxwell.Middleware.EncodeJson, [encode_func: "application/json"]
Expand All @@ -217,7 +217,7 @@ defmodule DecodeJsonTest do
end

test "EncodeJsonTest with invalid options encode_content_type" do
assert_raise ArgumentError, "EncodeJson :encode_content_types only accpect string", fn ->
assert_raise ArgumentError, "EncodeJson :encode_content_types only accepts string", fn ->
defmodule TAtom7 do
use Maxwell.Builder, [:get, :post]
middleware Maxwell.Middleware.EncodeJson, [encode_content_type: 1234]
Expand All @@ -227,7 +227,7 @@ defmodule DecodeJsonTest do
end

test "EncodeJsonTest with wrong option" do
assert_raise ArgumentError, "EncodeJson Options don't accpect wrong_option (:encode_func and :encode_content_type)", fn ->
assert_raise ArgumentError, "EncodeJson Options doesn't accept wrong_option (:encode_func and :encode_content_type)", fn ->
defmodule TAtom8 do
use Maxwell.Builder, [:get, :post]
middleware Maxwell.Middleware.EncodeJson, [wrong_option: 1234]
Expand All @@ -237,7 +237,7 @@ defmodule DecodeJsonTest do
end

test "DecodeJsonTest with invalid options decode_func " do
assert_raise ArgumentError, "DecodeJson :decode_func only accpect function/1", fn ->
assert_raise ArgumentError, "DecodeJson :decode_func only accepts function/1", fn ->
defmodule TAtom9 do
use Maxwell.Builder, [:get, :post]
middleware Maxwell.Middleware.DecodeJson, [decode_func: "application/json"]
Expand All @@ -247,7 +247,7 @@ defmodule DecodeJsonTest do
end

test "DecodeJsonTest with invalid options decode_content_types" do
assert_raise ArgumentError, "DecodeJson :decode_content_types only accpect lists", fn ->
assert_raise ArgumentError, "DecodeJson :decode_content_types only accepts lists", fn ->
defmodule TAtom10 do
use Maxwell.Builder, [:get, :post]
middleware Maxwell.Middleware.DecodeJson, [decode_content_types: 1234]
Expand All @@ -257,7 +257,7 @@ defmodule DecodeJsonTest do
end

test "DecodeJsonTest with wrong option" do
assert_raise ArgumentError, "DecodeJson Options don't accpect wrong_option (:decode_func and :decode_content_types)", fn ->
assert_raise ArgumentError, "DecodeJson Options doesn't accept wrong_option (:decode_func and :decode_content_types)", fn ->
defmodule TAtom11 do
use Maxwell.Builder, [:get, :post]
middleware Maxwell.Middleware.DecodeJson, [wrong_option: 1234]
Expand All @@ -267,4 +267,3 @@ defmodule DecodeJsonTest do
end

end

5 changes: 2 additions & 3 deletions test/maxwell/middleware/logger_test.exs
View file
Expand Up @@ -45,7 +45,7 @@ defmodule LoggerTest do
end

test "Middleware Logger with invalid log_level" do
assert_raise ArgumentError, "Logger Middleware :log_level only accpect atom", fn ->
assert_raise ArgumentError, "Logger Middleware :log_level only accepts atom", fn ->
defmodule TAtom1 do
use Maxwell.Builder, [:get, :post]
middleware Maxwell.Middleware.Logger, [log_level: 1234]
Expand All @@ -55,7 +55,7 @@ defmodule LoggerTest do
end

test "Middleware.Logger with wrong options" do
assert_raise ArgumentError, "Logger Middleware Options don't accpect wrong_option (:log_level)", fn ->
assert_raise ArgumentError, "Logger Middleware Options doesn't accept wrong_option (:log_level)", fn ->
defmodule TAtom2 do
use Maxwell.Builder, [:get, :post]
middleware Maxwell.Middleware.Logger, [wrong_option: :haah]
Expand All @@ -65,4 +65,3 @@ defmodule LoggerTest do
end

end

0 comments on commit 8957e54

Please sign in to comment.