Merge tag '0.1.1' into develop

Support OTP 20 and 21

See #3 and #6.

Author: yurrriq

Makefile

@@ -134,7 +134,7 @@ upgrade_reply(X1::101, Headers::<a href="http://raw.github.com/elli-lib/elli/dev
 websocket_handler_callback(Req, Handler, Callback, Message, HandlerState) -&gt; Result
 </code></pre>
 
-<ul class="definitions"><li><code>Req = <a href="#type-req">req()</a></code></li><li><code>Handler = module()</code></li><li><code>Callback = websocket_info | websocket_handle</code></li><li><code>Message = any()</code></li><li><code>HandlerState = any()</code></li><li><code>Result = {ok, <a href="#type-req">req()</a>, any()} | {ok, <a href="#type-req">req()</a>, any(), hibernate} | {reply, <a href="elli_websocket.md#type-payload">elli_websocket:payload()</a>, <a href="#type-req">req()</a>, any()} | {reply, <a href="elli_websocket.md#type-payload">elli_websocket:payload()</a>, hibernate, <a href="#type-req">req()</a>, any()} | {shutdown, <a href="#type-req">req()</a>, any()}</code></li></ul>
+<ul class="definitions"><li><code>Req = <a href="#type-req">req()</a></code></li><li><code>Handler = module()</code></li><li><code>Callback = websocket_info | websocket_handle</code></li><li><code>Message = any()</code></li><li><code>HandlerState = any()</code></li><li><code>Result = {ok, <a href="#type-req">req()</a>, any()} | {ok, <a href="#type-req">req()</a>, any(), hibernate} | {reply, <a href="elli_ws_protocol.md#type-frame">elli_ws_protocol:frame()</a> | [<a href="elli_ws_protocol.md#type-frame">elli_ws_protocol:frame()</a>], <a href="#type-req">req()</a>, any()} | {reply, <a href="elli_ws_protocol.md#type-frame">elli_ws_protocol:frame()</a> | [<a href="elli_ws_protocol.md#type-frame">elli_ws_protocol:frame()</a>], <a href="#type-req">req()</a>, any(), hibernate} | {shutdown, <a href="#type-req">req()</a>, any()}</code></li></ul>
 
 Calls websocket_info en websocket_handle callbacks.
 

doc/elli_ws_request_adapter.md

@@ -1,6 +1,9 @@
-{erl_opts, [debug_info]}.
+{erl_opts, [
+  debug_info,
+  {platform_define, "^2[1-9]", post20}
+]}.
 
-{xref_checks, [undefined_function_calls,locals_not_used]}.
+{xref_checks, [undefined_function_calls, locals_not_used]}.
 
 {dialyzer, [{base_plt_apps, [elli]}]}.
 
@@ -9,11 +12,11 @@
     {erl_first_files, [
       "src/elli_websocket_handler"
     ]},
-    {deps, [{elli, "2.0.1"}]}
+    {deps, [{elli, "3.1.0"}]}
   ]},
   {docs, [
     {deps, [
-      {elli, "2.0.1"},
+      {elli, "3.1.0"},
       {edown, "0.8.1"}
     ]}
   ]}
@@ -23,7 +26,7 @@
   {application, elli_websocket},
   {subpackages, false},
   {doclet, edown_doclet},
-  {todo,   true},
+  {todo, true},
   {doc_path, [
     "http://raw.github.com/elli-lib/elli/develop/doc"
   ]},
@@ -34,8 +37,8 @@
 ]}.
 
 {project_plugins, [
-  {coveralls, "1.4.0"},
-  {rebar3_lint, "0.1.9"}
+  {coveralls, "1.5.0"},
+  {rebar3_lint, "0.1.10"}
 ]}.
 
 {provider_hooks, [{pre, [{eunit, lint}]}]}.

rebar.config

@@ -1,6 +1,6 @@
 {application, elli_websocket, [
   {description,  "Elli WebSocket Handler."},
-  {vsn,          "0.1.0"},
+  {vsn,          "0.1.1"},
   {modules,      []},
   {registered,   []},
   {applications, [kernel, stdlib, elli]},

src/elli_websocket.app.src

@@ -329,12 +329,12 @@ websocket_data(State, Req, HandlerState, Data) ->
     handler_before_loop(State, Req, HandlerState, Data).
 
 %% Initialize or update fragmentation state.
-%% -spec websocket_data(#state{}, Req, any(),
-%%   opcode(), non_neg_integer(), mask_key(), binary(), rsv(), 0 | 1)
-%%   -> {ok, Req, cowboy_middleware:env()}
-%%   | {suspend, module(), atom(), [any()]}
-%%   when Req::elli_ws_request_adapter:req().
 %% The opcode is only included in the first frame fragment.
+-spec websocket_data(#state{}, Req, any(),
+                     opcode(), non_neg_integer(), mask_key(), binary(), rsv(), 0 | 1)
+                    -> {ok, Req, cowboy_middleware:env()}
+                           | {suspend, module(), atom(), [any()]}
+                           when Req::elli_ws_request_adapter:req().
 websocket_data(State=#state{frag_state=undefined}, Req, HandlerState,
                Opcode, Len, MaskKey, Data, Rsv, 0) ->
     websocket_payload(State#state{frag_state={nofin, Opcode, <<>>}},

src/elli_ws_protocol.erl

@@ -66,6 +66,13 @@
 
 -type req() :: #req_adapter{}.
 
+-ifdef(post20).
+-define(EXCEPTION(Class, Reason, Stacktrace), Class:Reason:Stacktrace).
+-define(GET_STACK(Stacktrace), Stacktrace).
+-else.
+-define(EXCEPTION(Class, Reason, _), Class:Reason).
+-define(GET_STACK(_), erlang:get_stacktrace()).
+-endif.
 
 %%
 %%
@@ -233,10 +240,9 @@ websocket_handler_handle_event(#req_adapter{req=Req}, Handler, Name, EventArgs,
     try
         Handler:websocket_handle_event(Name, [Req|EventArgs], HandlerOpts)
     catch
-        EvClass:EvError ->
+        ?EXCEPTION(EvClass, EvError, ST) ->
             error_logger:error_msg("~p:handle_event/3 crashed ~p:~p~n~p",
-                                   [Handler, EvClass, EvError,
-                                    erlang:get_stacktrace()])
+                                   [Handler, EvClass, EvError, ?GET_STACK(ST)])
     end.
 
 %% @doc Atoms used to identify messages in {active, once | true} mode.