update deps. add matched controller/action

Author: slogsdon

lib/http_router.ex

@@ -84,6 +84,7 @@ defmodule HttpRouter do
   @http_methods [ :get, :post, :put, :patch, :delete, :any ]
 
   @default_options [
+    add_match_details_to_private: true,
     allow_copy_req_content_type: true,
     allow_head: true,
     allow_method_override: true,
@@ -176,7 +177,7 @@ defmodule HttpRouter do
       # its face when accessing an undefined route.
       def do_match(_,_) do
         fn conn ->
-          conn |> send_resp(404, "")
+          conn |> Plug.Conn.send_resp(404, "")
         end
       end
 
@@ -300,6 +301,7 @@ defmodule HttpRouter do
 
   ## Private API
 
+  defp ignore_args(nil), do: ""
   defp ignore_args(str) do
     str
       |> String.to_char_list
@@ -353,9 +355,9 @@ defmodule HttpRouter do
     do_build_match :options, route, body, caller
   end
   defp build_match(method, route, handler, action, caller) do
-    body = build_body handler, action
-    # body_json = build_body handler, action, :json
-    # body_xml = build_body handler, action, :xml
+    body = build_body handler, action, caller
+    # body_json = build_body handler, action, caller, :json
+    # body_xml = build_body handler, action, caller, :xml
 
     [ #do_build_match(method, route <> ".json", body_json, caller),
       #do_build_match(method, route <> ".xml", body_xml, caller),
@@ -375,8 +377,8 @@ defmodule HttpRouter do
     end
   end
 
-  defp build_body(handler, action), do: build_body(handler, action, :skip)
-  defp build_body(handler, action, add_header) do
+  defp build_body(handler, action, caller), do: build_body(handler, action, caller, :skip)
+  defp build_body(handler, action, _caller, add_header) do
     header = case add_header do
         :json -> [{"accept", "application/json"}]
         :xml  -> [{"accept", "application/xml"}]
@@ -385,8 +387,14 @@ defmodule HttpRouter do
 
     quote do
       opts = [ action: unquote(action), args: binding() ]
-      unquote(handler).call %{ conn | req_headers: unquote(header) ++
-          conn.req_headers }, unquote(handler).init(opts)
+      private = conn.private
+                  |> Map.put(:controller, unquote(handler))
+                  |> Map.put(:handler, unquote(handler))
+                  |> Map.put(:action, unquote(action))
+
+      %{ conn | req_headers: unquote(header) ++ conn.req_headers,
+                private: private }
+        |> unquote(handler).call(unquote(handler).init(opts))
     end
   end
 

mix.exs

@@ -3,7 +3,7 @@ defmodule HttpRouter.Mixfile do
 
   def project do
     [ app: :http_router,
-      version: "0.0.3",
+      version: "0.0.4",
       elixir: "~> 1.0",
       deps: deps,
       name: "HttpRouter",
@@ -21,7 +21,7 @@ defmodule HttpRouter.Mixfile do
   defp deps do
     [ { :cowboy, "~> 1.0.0" },
       { :plug, "~> 0.9.0" },
-      { :poison, "~> 1.2.0" },
+      { :poison, "~> 1.3.0" },
       { :xml_builder, "~> 0.0.5" },
       { :earmark, "~> 0.1.10", only: :docs },
       { :ex_doc, "~> 0.6.1", only: :docs },

mix.lock

@@ -1,7 +1,7 @@
 %{"cowboy": {:hex, :cowboy, "1.0.0"},
   "cowlib": {:hex, :cowlib, "1.0.1"},
   "dialyze": {:hex, :dialyze, "0.1.3"},
-  "earmark": {:hex, :earmark, "0.1.12"},
+  "earmark": {:hex, :earmark, "0.1.13"},
   "ex_doc": {:hex, :ex_doc, "0.6.2"},
   "excoveralls": {:hex, :excoveralls, "0.3.8"},
   "exjsx": {:hex, :exjsx, "3.1.0"},
@@ -10,7 +10,7 @@
   "inch_ex": {:hex, :inch_ex, "0.2.4"},
   "jsx": {:hex, :jsx, "2.4.0"},
   "plug": {:hex, :plug, "0.9.0"},
-  "poison": {:hex, :poison, "1.2.1"},
+  "poison": {:hex, :poison, "1.3.1"},
   "ranch": {:hex, :ranch, "1.0.0"},
   "ssl_verify_hostname": {:hex, :ssl_verify_hostname, "1.0.1"},
   "xml_builder": {:hex, :xml_builder, "0.0.5"}}