fix elixir 1.4 warnings, update deps

.travis.yml

@@ -3,8 +3,7 @@ notifications:
   recipients:
     - eduardo@gurgel.me
 elixir:
-  - 1.2.6
-  - 1.3.0
+  - 1.4.2
 otp_release:
   - 18.0
   - 18.1

lib/httparrot.ex

@@ -6,6 +6,9 @@ defmodule HTTParrot do
     Supervisor.start_link(__MODULE__, arg)
   end
 
+  def init([]) do
+  end
+
   def start(_type, _args) do
     dispatch = :cowboy_router.compile([
       {:_, [ {'/', :cowboy_static, {:priv_file, :httparrot, "index.html"}},
@@ -60,7 +63,7 @@ defmodule HTTParrot do
         [env: [dispatch: dispatch], onresponse: &prettify_json/4])
     end
 
-    if unix_socket_supported? && Application.get_env(:httparrot, :unix_socket, false) do
+    if unix_socket_supported?() && Application.get_env(:httparrot, :unix_socket, false) do
       {:ok, socket_path} = Application.fetch_env(:httparrot, :socket_path)
       if File.exists?(socket_path), do: File.rm(socket_path)
       IO.puts "Starting HTTParrot on unix socket #{socket_path}"

mix.exs

@@ -8,11 +8,11 @@ defmodule Httparrot.Mixfile do
   def project do
     [ app: :httparrot,
       version: "0.5.0",
-      elixir: "~> 1.2",
+      elixir: "~> 1.4",
       name: "HTTParrot",
       description: @description,
-      package: package,
-      deps: deps ]
+      package: package(),
+      deps: deps() ]
   end
 
   def application do
@@ -28,8 +28,8 @@ defmodule Httparrot.Mixfile do
 
   defp deps do
     [ {:cowboy, "~> 1.0.0"},
-      {:exjsx, "~> 3.0"},
-      {:con_cache, "~> 0.11.1"},
+      {:exjsx, "~> 4.0"},
+      {:con_cache, "~> 0.12.0"},
       {:ex_doc, ">= 0.0.0", only: :dev},
       {:meck, "~> 0.8.2", only: :test } ]
   end

mix.lock

@@ -1,10 +1,10 @@
-%{"con_cache": {:hex, :con_cache, "0.11.1", "acbe5a1d10c47faba30d9629c9121e1ef9bca0aa5eddbb86f4e777bd9f9f9b6f", [:mix], [{:exactor, "~> 2.2.0", [hex: :exactor, optional: false]}]},
+%{"con_cache": {:hex, :con_cache, "0.12.0", "2d961aec219aa5a914473873f348f5a6088292dc69d5192a9d25f8a1e13e9905", [:mix], [{:exactor, "~> 2.2.0", [hex: :exactor, optional: false]}]},
   "cowboy": {:hex, :cowboy, "1.0.0", "d0b46a5e5f971c5543eb46f86fe76b9add567d12fb5262a852b8f27c64c0555d", [:make, :rebar], [{:cowlib, "~> 1.0.0", [hex: :cowlib, optional: false]}, {:ranch, "~> 1.0", [hex: :ranch, optional: false]}]},
   "cowlib": {:hex, :cowlib, "1.0.0", "397d890d669e56d486b0b5329973ad1a07012412bc110d34a737698dd6941741", [:make], []},
   "earmark": {:hex, :earmark, "1.0.1", "2c2cd903bfdc3de3f189bd9a8d4569a075b88a8981ded9a0d95672f6e2b63141", [:mix], []},
   "ex_doc": {:hex, :ex_doc, "0.13.0", "aa2f8fe4c6136a2f7cfc0a7e06805f82530e91df00e2bff4b4362002b43ada65", [:mix], [{:earmark, "~> 1.0", [hex: :earmark, optional: false]}]},
-  "exactor": {:hex, :exactor, "2.2.2", "90b27d72c05614801a60f8400afd4e4346dfc33ea9beffe3b98a794891d2ff96", [:mix], []},
-  "exjsx": {:hex, :exjsx, "3.1.0", "d419162cb2d5be80070835c2c2b8c78c8c45907706c991d23f3750dae506d1e9", [:mix], [{:jsx, "~> 2.4.0", [hex: :jsx, optional: false]}]},
-  "jsx": {:hex, :jsx, "2.4.0", "fb83830ac15e981b6ce310b645324ceecd01b1e0847d23921c33df829de5d2db", [:mix], []},
+  "exactor": {:hex, :exactor, "2.2.3", "a6972f43bb6160afeb73e1d8ab45ba604cd0ac8b5244c557093f6e92ce582786", [:mix], []},
+  "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, optional: false]}]},
+  "jsx": {:hex, :jsx, "2.8.2", "7acc7d785b5abe8a6e9adbde926a24e481f29956dd8b4df49e3e4e7bcc92a018", [:mix, :rebar3], []},
   "meck": {:hex, :meck, "0.8.2", "f15f7d513e14ec8c8dee9a95d4ae585b3e5a88bf0fa6a7573240d6ddb58a7236", [:make, :rebar], []},
   "ranch": {:hex, :ranch, "1.0.0", "e3ac054e4265de77e2d2696dd7e1d6a67b7525aade13ba10c860e7f499a0d433", [:make], []}}

test/base64_handler_test.exs

@@ -5,7 +5,7 @@ defmodule HTTParrot.Base64HandlerTest do
 
   setup do
     new :cowboy_req
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/basic_auth_handler_test.exs

@@ -6,7 +6,7 @@ defmodule HTTParrot.BasicAuthHandlerTest do
   setup do
     new :cowboy_req
     new JSX
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/cache_handler_test.exs

@@ -6,7 +6,7 @@ defmodule HTTParrot.CacheHandlerTest do
   setup do
     new HTTParrot.GeneralRequestInfo
     new JSX
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/cookies_handler_test.exs

@@ -6,7 +6,7 @@ defmodule HTTParrot.CookiesHandlerTest do
   setup do
     new :cowboy_req
     new JSX
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/deflate_handler_test.exs

@@ -6,7 +6,7 @@ defmodule HTTParrot.DeflateHandlerTest do
   setup do
     new HTTParrot.GeneralRequestInfo
     new JSX
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/delayed_handler_test.exs

@@ -7,7 +7,7 @@ defmodule HTTParrot.DelayedHandlerTest do
     new HTTParrot.GeneralRequestInfo
     new JSX
     new :cowboy_req
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/delete_cookies_handler_test.exs

@@ -5,7 +5,7 @@ defmodule HTTParrot.DeleteCookiesHandlerTest do
 
   setup do
     new :cowboy_req
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/delete_handler_test.exs

@@ -7,7 +7,7 @@ defmodule HTTParrot.DeleteHandlerTest do
     new :cowboy_req
     new HTTParrot.GeneralRequestInfo
     new JSX
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/general_request_info_test.exs

@@ -5,7 +5,7 @@ defmodule HTTParrot.GeneralRequestInfoTest do
 
   setup do
     new :cowboy_req
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/get_handler_test.exs

@@ -6,7 +6,7 @@ defmodule HTTParrot.GetHandlerTest do
   setup do
     new HTTParrot.GeneralRequestInfo
     new JSX
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/gzip_handler_test.exs

@@ -6,7 +6,7 @@ defmodule HTTParrot.GzipHandlerTest do
   setup do
     new HTTParrot.GeneralRequestInfo
     new JSX
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/headers_handler_test.exs

@@ -6,7 +6,7 @@ defmodule HTTParrot.HeadersHandlerTest do
   setup do
     new :cowboy_req
     new JSX
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/hidden_basic_auth_handler_test.exs

@@ -6,7 +6,7 @@ defmodule HTTParrot.HiddenBasicAuthHandlerTest do
   setup do
     new :cowboy_req
     new JSX
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/httparrot_test.exs

@@ -5,7 +5,7 @@ defmodule HTTParrotTest do
 
   setup do
     new :cowboy_req
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/ip_handler_test.exs

@@ -6,7 +6,7 @@ defmodule HTTParrot.IPHandlerTest do
   setup do
     new :cowboy_req
     new JSX
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/p_handler_test.exs

@@ -7,7 +7,7 @@ defmodule HTTParrot.PHandlerTest do
     new HTTParrot.GeneralRequestInfo
     new JSX
     new :cowboy_req
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/redirect_handler_test.exs

@@ -5,7 +5,7 @@ defmodule HTTParrot.RedirectHandlerTest do
 
   setup do
     new :cowboy_req
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/redirect_to_handler_test.exs

@@ -5,7 +5,7 @@ defmodule HTTParrot.RedirectToHandlerTest do
 
   setup do
     new :cowboy_req
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/relative_redirect_handler_test.exs

@@ -5,7 +5,7 @@ defmodule HTTParrot.RelativeRedirectHandlerTest do
 
   setup do
     new :cowboy_req
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/response_headers_handler_test.exs

@@ -6,7 +6,7 @@ defmodule HTTParrot.ResponseHeadersHandlerTest do
   setup do
     new :cowboy_req
     new JSX
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/retrieve_request_handler_tests.exs

@@ -5,7 +5,7 @@ defmodule HTTParrot.RetrieveRequestHandlerTests do
 
   setup do
     HTTParrot.RequestStore.clear(:test)
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/set_cookies_handler_test.exs

@@ -5,7 +5,7 @@ defmodule HTTParrot.SetCookiesHandlerTest do
 
   setup do
     new :cowboy_req
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/status_code_handler_test.exs

@@ -5,7 +5,7 @@ defmodule HTTParrot.StatusCodeHandlerTest do
 
   setup do
     new :cowboy_req
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/store_request_handler_test.exs

@@ -5,7 +5,7 @@ defmodule HTTParrot.StoreRequestHandlerTests do
 
   setup do
     HTTParrot.RequestStore.clear(:test)
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 

test/stream_bytes_handler_test.exs

@@ -5,7 +5,7 @@ defmodule HTTParrot.StreamBytesHandlerTest do
 
   setup do
     new :cowboy_req
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 
@@ -103,7 +103,7 @@ defmodule HTTParrot.StreamBytesHandlerTest do
     assert {{:chunked, func}, :req1, nil} = get_bytes(:req1, {9, 3, 4})
     assert is_function(func)
 
-    send_func = fn(body) -> send(self, {:chunk, body}) end
+    send_func = fn(body) -> send(self(), {:chunk, body}) end
     func.(send_func)
 
     assert_receive {:chunk, chunk1}

test/stream_handler_test.exs

@@ -7,7 +7,7 @@ defmodule HTTParrot.StreamHandlerTest do
     new :cowboy_req
     new HTTParrot.GeneralRequestInfo
     new JSX
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end
 
@@ -51,7 +51,7 @@ defmodule HTTParrot.StreamHandlerTest do
     assert {{:chunked, func}, :req2, nil} = get_json(:req1, 2)
     assert is_function(func)
 
-    send_func = fn(body) -> send(self, {:chunk, body}) end
+    send_func = fn(body) -> send(self(), {:chunk, body}) end
     func.(send_func)
 
     assert_receive {:chunk, :json1}

test/user_agent_test.exs

@@ -6,7 +6,7 @@ defmodule HTTParrot.UserAgentHandlerTest do
   setup do
     new :cowboy_req
     new JSX
-    on_exit fn -> unload end
+    on_exit fn -> unload() end
     :ok
   end