Use latest elli_cache

Author: yurrriq

rebar.config

@@ -8,7 +8,11 @@
  [{add, elli_cache, [{erl_opts, [{i, "_build/test/lib"}]}]}]}.
 
 {deps,
- [{elli_cache, "1.0.1"}]}.
+ [%% {elli_cache, "1.0.1"}
+  {elli_cache,
+   {git, "git://github.com/elli-lib/elli_cache.git",
+    {branch, "develop"}}}
+ ]}.
 
 {profiles,
  [{test,

rebar.lock

@@ -0,0 +1,10 @@
+{"1.1.0",
+[{<<"elli_cache">>,
+  {git,"git://github.com/elli-lib/elli_cache.git",
+       {ref,"3884cabf3cf55878b225057be0d1711420072399"}},
+  0},
+ {<<"erlando">>,{pkg,<<"erlando">>,<<"3.1.1">>},1}]}.
+[
+{pkg_hash,[
+ {<<"erlando">>, <<"50E54F9A9DFEC564DDFEB7FC7129F80F491856F5E07686F405CEF4E970BDFE46">>}]}
+].

src/elli_static.erl

@@ -1,39 +1,27 @@
 -module(elli_static).
 
 -behaviour(elli_handler).
+
 -behaviour(elli_cache).
 
 
 -include_lib("elli/include/elli.hrl").
 -include_lib("kernel/include/file.hrl").
--include_lib("elli_cache/src/elli_cache_util.hrl").
-
 
 -define(TABLE, elli_static_table).
 
 
--export([preprocess/2,
-         handle/2, handle_event/3,
-         postprocess/3,
-         get_modified/2,
-         get_size/2
-        ]).
+%% elli_handler callbacks
+-export([handle/2, handle_event/3]).
+
+%% elli_cache callbacks
+-export([get_modified/2, get_size/2]).
 
 -export_type([config/0]).
 
 -type config() :: [{binary(), {dir, file:name_all()}}].
 
 
-preprocess(Req, Config)
-  when not(?GET_OR_HEAD(Req#req.method)) ->
-    MaybeMtime = get_modified(Req, Config),
-    MaybeSize = get_size(Req, Config),
-    MaybeETag  = maybe_etag(MaybeMtime, MaybeSize),
-    rfc7232:init(Req, MaybeMtime, MaybeETag);
-preprocess(Req, _Config) ->
-    Req.
-
-
 -spec handle(elli:req(), config()) -> elli_handler:result().
 handle(_Req, []) ->
     ignore;
@@ -58,16 +46,6 @@ handle_event(_Event, _Args, _Config) ->
     ok.
 
 
-postprocess(Req, {ResponseCode, _Headers, _What} = Res, Config)
-  when ?OK_GET_OR_HEAD(ResponseCode, Req#req.method) ->
-    MaybeMtime = get_modified(Req, Config),
-    MaybeSize = get_size(Req, Config),
-    MaybeETag  = maybe_etag(MaybeMtime, MaybeSize),
-    rfc7232:init(Req, MaybeMtime, MaybeETag, Res);
-postprocess(_, Res, _) ->
-    Res.
-
-
 get_modified(Req, Args) ->
     do_it(Req, fun(#file_info{mtime = Mtime}) -> Mtime end, Args).
 
@@ -116,12 +94,3 @@ maybe_file(Req, Prefix, Dir) ->
         _ ->
             nothing
     end.
-
-
-maybe_etag(nothing, _Size) ->
-    nothing;
-maybe_etag(_Mtime, nothing) ->
-    nothing;
-maybe_etag({just, Mtime}, {just, Size}) ->
-    ETag = list_to_binary(httpd_util:create_etag(Mtime, Size)),
-    {just, <<"\"", ETag/binary, "\"">>}.

test/elli_static_tests.erl

@@ -34,12 +34,12 @@ setup() ->
     Args = [{<<"/elli_static">>, {dir, Dir}}],
     Config = [
               {mods, [
-                      {elli_middleware_cache, [{mod, elli_static_cache}]},
+                      {elli_middleware_cache, [{elli_static, Args}]},
                       {elli_static, Args}
                      ]
               }
              ],
-    {ok, Pid} = elli:start_link([{callback, elli_middleware},                                 
+    {ok, Pid} = elli:start_link([{callback, elli_middleware},
                                  {callback_args, Config},
                                  {port, 3000}]),
     unlink(Pid),