rename parsed_headers to headers and headers to original_headers

Author: tsloughter

include/elli.hrl

@@ -1,17 +1,17 @@
--record(req, {method   :: elli:http_method(),
-              scheme   :: undefined | binary(),
-              host     :: undefined | binary(),
-              port     :: undefined | 1..65535,
-              path     :: [binary()],
-              args     :: [{binary(), any()}],
-              raw_path :: binary(),
-              version  :: elli_http:version(),
-              headers  :: elli:headers(),
-              parsed_headers  :: elli:headers(),
-              body     :: elli:body(),
-              pid      :: pid(),
-              socket   :: undefined | elli_tcp:socket(),
-              callback :: elli_handler:callback()
+-record(req, {method           :: elli:http_method(),
+              scheme           :: undefined | binary(),
+              host             :: undefined | binary(),
+              port             :: undefined | 1..65535,
+              path             :: [binary()],
+              args             :: [{binary(), any()}],
+              raw_path         :: binary(),
+              version          :: elli_http:version(),
+              headers          :: elli:headers(),
+              original_headers :: elli:headers(),
+              body             :: elli:body(),
+              pid              :: pid(),
+              socket           :: undefined | elli_tcp:socket(),
+              callback         :: elli_handler:callback()
              }).
 
 -define(EXAMPLE_CONF, [{callback, elli_example_callback},

src/elli_http.erl

@@ -606,9 +606,9 @@ mk_req(Method, PathTuple, Headers, ParsedHeaders, Body, V, Socket, {Mod, Args} =
         {ok, {Scheme, Host, Port}, {Path, URL, URLArgs}} ->
             #req{method   = Method, scheme   = Scheme, host    = Host,
                  port     = Port,   path     = URL,    args    = URLArgs,
-                 version  = V,      raw_path = Path,   headers = Headers,
+                 version  = V,      raw_path = Path,   original_headers = Headers,
                  body     = Body,   pid      = self(), socket  = Socket,
-                 callback = Callback, parsed_headers = ParsedHeaders};
+                 callback = Callback, headers = ParsedHeaders};
         {error, Reason} ->
             handle_event(Mod, request_parse_error,
                          [{Reason, {Method, PathTuple}}], Args),
@@ -621,7 +621,6 @@ mk_req(Method, Scheme, Host, Port, PathTuple, Headers, ParsedHeaders, Body, V, S
     Req = mk_req(Method, PathTuple, Headers, ParsedHeaders, Body, V, Socket, Callback),
     Req#req{scheme = Scheme, host = Host, port = Port}.
 
-
 %%
 %% HEADERS
 %%

src/elli_request.erl

@@ -24,8 +24,8 @@
         , post_args/1
         , post_args_decoded/1
         , body_qs/1
+        , original_headers/1
         , headers/1
-        , parsed_headers/1
         , peer/1
         , method/1
         , body/1
@@ -57,7 +57,7 @@ raw_path(#req{raw_path = Path})  -> Path.
 %% @doc Return the original `headers'.
 headers(#req{headers = Headers}) -> Headers.
 %% @doc Return the `headers' that have had `string:casefold/1' run on each key.
-parsed_headers(#req{parsed_headers = Headers}) -> Headers.
+original_headers(#req{original_headers = Headers}) -> Headers.
 %% @doc Return the `method'.
 method(#req{method = Method})    -> Method.
 %% @doc Return the `body'.
@@ -77,11 +77,11 @@ peer(#req{socket = Socket} = _Req) ->
             undefined
     end.
 
-get_header(Key, #req{parsed_headers = Headers}) ->
+get_header(Key, #req{headers = Headers}) ->
     CaseFoldedKey = string:casefold(Key),
     proplists:get_value(CaseFoldedKey, Headers).
 
-get_header(Key, #req{parsed_headers = Headers}, Default) ->
+get_header(Key, #req{headers = Headers}, Default) ->
     CaseFoldedKey = string:casefold(Key),
     proplists:get_value(CaseFoldedKey, Headers, Default).
 
@@ -176,7 +176,7 @@ query_str(#req{raw_path = Path}) ->
 %% The result is either a `byte_range_set()' or the atom `parse_error'.
 %% Use {@link elli_util:normalize_range/2} to get a validated, normalized range.
 -spec get_range(elli:req()) -> [http_range()] | parse_error.
-get_range(#req{parsed_headers = Headers})  ->
+get_range(#req{headers = Headers})  ->
     case proplists:get_value(<<"range">>, Headers) of
         <<"bytes=", RangeSetBin/binary>> ->
             parse_range_set(RangeSetBin);

test/elli_tests.erl

@@ -111,12 +111,12 @@ accessors_test_() ->
     Body = <<"name=knut%3D">>,
     Name = <<"knut=">>,
     Req1 = #req{raw_path = RawPath,
+                original_headers = Headers,
                 headers = Headers,
-                parsed_headers = Headers,
                 method = Method,
                 body = Body},
     Args = [{<<"name">>, Name}],
-    Req2 = #req{headers = Headers, parsed_headers = Headers, args = Args, body = <<>>},
+    Req2 = #req{original_headers = Headers, headers = Headers, args = Args, body = <<>>},
 
     [
      %% POST /foo/bar
@@ -627,17 +627,17 @@ body_qs_test() ->
     Body     = <<"foo=bar&baz=bang&found">>,
     Headers  = [{<<"content-type">>, <<"application/x-www-form-urlencoded">>}],
     ?assertMatch(Expected, elli_request:body_qs(#req{body = Body,
-                                                     headers = Headers,
-                                                     parsed_headers = Headers})).
+                                                     original_headers = Headers,
+                                                     headers = Headers})).
 
 to_proplist_test() ->
     Req  = #req{method   = 'GET',
                 path     = [<<"crash">>],
                 args     = [],
                 version  = {1, 1},
                 raw_path = <<"/crash">>,
-                headers  = [{<<"Host">>, <<"localhost:3001">>}],
-                parsed_headers  = [{<<"host">>, <<"localhost:3001">>}],
+                original_headers  = [{<<"Host">>, <<"localhost:3001">>}],
+                headers  = [{<<"host">>, <<"localhost:3001">>}],
                 body     = <<>>,
                 pid      = self(),
                 socket   = socket,
@@ -651,8 +651,8 @@ to_proplist_test() ->
             {args,     []},
             {raw_path, <<"/crash">>},
             {version,  {1, 1}},
-            {headers,  [{<<"Host">>, <<"localhost:3001">>}]},
-            {parsed_headers,  [{<<"host">>, <<"localhost:3001">>}]},
+            {headers,  [{<<"host">>, <<"localhost:3001">>}]},
+            {original_headers,  [{<<"Host">>, <<"localhost:3001">>}]},
             {body,     <<>>},
             {pid,      self()},
             {socket,   socket},
@@ -677,11 +677,11 @@ query_str_test_() ->
 
 
 get_range_test_() ->
-    Req       = #req{parsed_headers = [{<<"range">>,
+    Req       = #req{headers = [{<<"range">>,
                                         <<"bytes=0-99 ,500-999 , -800">>}]},
-    OffsetReq = #req{parsed_headers = [{<<"range">>, <<"bytes=200-">>}]},
-    UndefReq  = #req{parsed_headers = []},
-    BadReq    = #req{parsed_headers = [{<<"range">>, <<"bytes=--99,hallo-world">>}]},
+    OffsetReq = #req{headers = [{<<"range">>, <<"bytes=200-">>}]},
+    UndefReq  = #req{headers = []},
+    BadReq    = #req{headers = [{<<"range">>, <<"bytes=--99,hallo-world">>}]},
 
     ByteRangeSet = [{bytes, 0, 99}, {bytes, 500, 999}, {suffix, 800}],