Replace dict() type depending on Erlang release.

Issue #15

include/webmachine_logger.hrl

@@ -13,5 +13,5 @@
 	 response_length,
 	 end_time :: tuple(),
 	 finish_time :: tuple(),
-	 metadata :: dict()}).
+	 metadata :: wm_dict()}).
 

include/wm_reqdata.hrl

@@ -1,7 +1,14 @@
+
+-ifdef(namespaced_dicts).
+-type wm_dict() :: dict:dict().
+-else.
+-type wm_dict() :: dict().
+-endif.
+
 -record(wm_reqdata, {
     % Reqstate
     socket=undefined,
-    metadata=dict:new(),
+    metadata=dict:new() :: wm_dict(),
     range=undefined,
     peer=undefined :: inet:ip_address(),
     bodyfetch=undefined,
@@ -14,7 +21,7 @@
     disp_path,
     path     :: string(),
     raw_path :: string(),
-    path_info :: dict(),
+    path_info :: wm_dict(),
     path_tokens :: [string()],
     app_root  :: string(),
     response_code :: pos_integer(),

rebar.config

@@ -1,5 +1,8 @@
 %%-*- mode: erlang -*-
-{erl_opts, [warnings_as_errors]}.
+{erl_opts, [
+	warnings_as_errors,
+	{platform_define, "^[0-9]+", namespaced_dicts}
+]}.
 {cover_enabled, true}.
 {edoc_opts, [{preprocess, true}]}.
 

src/webmachine_decision_core.erl

@@ -23,8 +23,8 @@
 -author('Bryan Fink <[email protected]>').
 -export([handle_request/2]).
 -export([do_log/1]).
--include("webmachine_logger.hrl").
 -include("wm_reqdata.hrl").
+-include("webmachine_logger.hrl").
 
 handle_request(Resource, ReqData) ->
     try

src/webmachine_logger.erl

@@ -22,7 +22,10 @@
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
          terminate/2, code_change/3]).
 -export([log_access/1, refresh/0, get_metadata/2]).
--include("webmachine_logger.hrl").
+
+-include_lib("wm_reqdata.hrl").
+-include_lib("webmachine_logger.hrl").
+
 -record(state, {hourstamp, filename, handle}).
 
 alog_path(BaseDir) ->

src/webmachine_mochiweb.erl

@@ -20,8 +20,8 @@
 -author('Andy Gross <[email protected]>').
 -export([start/1, start/2, stop/0, stop/1, loop/2]).
 
--include("webmachine_logger.hrl").
 -include_lib("wm_reqdata.hrl").
+-include_lib("webmachine_logger.hrl").
 
 start(Options) ->
     {PName, Options1} = case get_option(name, Options) of

src/webmachine_perf_logger.erl

@@ -22,7 +22,10 @@
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
          terminate/2, code_change/3]).
 -export([log/1, refresh/0]).
+
+-include_lib("wm_reqdata.hrl").
 -include("webmachine_logger.hrl").
+
 -record(state, {hourstamp, filename, handle}).
 
 alog_path(BaseDir) ->

src/webmachine_request.erl

@@ -76,8 +76,8 @@
      use_sendfile/0
      ]).
 
--include("webmachine_logger.hrl").
--include("wm_reqdata.hrl").
+-include_lib("wm_reqdata.hrl").
+-include_lib("webmachine_logger.hrl").
 
 -define(IDLE_TIMEOUT, infinity).
 -define(FILE_CHUNK_LENGTH, 65536).

src/webmachine_sup.erl

@@ -26,6 +26,7 @@
 %% supervisor callbacks
 -export([init/1]).
 
+-include_lib("wm_reqdata.hrl").
 -include_lib("webmachine_logger.hrl").
 
 %% @spec start_link() -> ServerRet

src/webzmachine.erl

@@ -20,7 +20,6 @@
 -export([start/0, stop/0]).
 -export_type([reqdata/0, context/0, reply/0]).
 
--include("webmachine_logger.hrl").
 -include_lib("include/wm_reqdata.hrl").
 
 -opaque reqdata() :: #wm_reqdata{}.