Fixed cors origin port issue

.gitignore

@@ -1,3 +1,4 @@
+.rebar
 ebin
 deps
 *.beam
@@ -7,6 +8,8 @@ erl_crash.dump
 docs/public_html
 docs/tmp
 docs/elisp
+.eunit
+.rebar
 *~
 \#*
 .\#*

.travis.yml

@@ -1,14 +1,7 @@
 language: erlang
-otp_release:
-  - R16B
-  - R15B03
-  - R15B02
-  - R15B01
-  - R15B
 notifications:
   email: false
-  irc: "chat.freenode.net#leptus"
-  on_success: change
-  on_failure: change
-install: "make deps"
-script: "make test"
+otp_release:
+  - 20.1
+  - 19.3
+  - 18.3

README.org

@@ -1,14 +1,14 @@
-* Leptus [[https://travis-ci.org/s1n4/leptus][https://travis-ci.org/s1n4/leptus.png?branch=master]]
+* Leptus [[https://travis-ci.org/Ledest/leptus][https://travis-ci.org/Ledest/leptus.png]]
 
   Leptus is an Erlang REST framework that runs on top of cowboy.
 
   Leptus aims at simply creating RESTful APIs.
 
 ** Requirements
 
-   - Erlang/OTP R15B or newer
-   - [[https://github.com/extend/cowboy][cowboy]]
-   - [[https://github.com/davisp/jiffy][jiffy]] or [[https://github.com/talentdeficit/jsx][jsx]]
+   - Erlang/OTP 18 or newer
+   - [[https://github.com/ninenines/cowboy][cowboy]]
+   - [[https://github.com/talentdeficit/jsx][jsx]]
    - [[https://github.com/msgpack/msgpack-erlang][msgpack]]
 
 ** Installation
@@ -27,17 +27,6 @@
           ]}.
    #+END_SRC
 
-   NOTE: if you prefer [[https://github.com/talentdeficit/jsx][jsx]] rather than [[https://github.com/davisp/jiffy][jiffy]]
-   the environment variable ~USE_JSX~ must be set to ~true~ when getting
-   dependencies and/or compiling.
-
-   i.e.
-   #+BEGIN_SRC
-   USE_JSX=true make
-   # OR
-   USE_JSX=true rebar get-deps compile
-   #+END_SRC
-
 ** Quick example
 
    #+BEGIN_SRC erlang

docs/leptus_req.org

@@ -142,7 +142,7 @@
     %% e.g.
     body(Req) -> <<"foo=bar">>
 
-    %% when content-type is set to applicaation/json or application/x-msgpack
+    %% when content-type is set to applicaation/json or application/msgpack
     body(Req) -> [{<<"function">>, <<"body/1">>}]
     #+END_SRC
 

rebar.config

@@ -1,10 +1,7 @@
-%%-*- mode: erlang -*-
+{require_min_otp_vsn, "18"}.
 
-{deps, [
-        {cowboy, ".*", {git, "git://github.com/extend/cowboy.git", {tag, "0.9.0"}}},
-        {jiffy, ".*", {git, "git://github.com/davisp/jiffy.git", {tag, "0.8.5"}}},
-        {jsx, ".*", {git, "git://github.com/talentdeficit/jsx.git", {tag, "v1.4.5"}}},
-        {msgpack, ".*", {git, "git://github.com/msgpack/msgpack-erlang.git", {tag, "0.2.8"}}}
-       ]}.
+{deps, [{cowboy,  ".*", {git, "https://github.com/extend/cowboy.git",          {branch, "1.0.x"}}},
+        {jsx,     ".*", {git, "https://github.com/talentdeficit/jsx.git",      {branch, "master"}}},
+        {msgpack, ".*", {git, "https://github.com/msgpack/msgpack-erlang.git", {branch, "master"}}}]}.
 
 {clean_files, ["*.beam", "test/*.beam", "erl_crash.dump"]}.

src/leptus.app.src

@@ -19,23 +19,10 @@
 %% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 %% THE SOFTWARE.
 
-{application, leptus,
- [
-  {description, "REST framework that runs on top of cowboy"},
-  {vsn, "0.4.2"},
-  {registered, []},
-  {applications, [
-                  kernel,
-                  stdlib,
-                  cowboy
-                 ]},
-  {mod, {leptus_app, []}},
-  {env, []},
-  {modules, [
-             leptus, leptus_app, leptus_sup,
-             leptus_handler, leptus_router, leptus_pt,
-             leptus_config, leptus_req_sup, leptus_req,
-             leptus_json, leptus_utils, leptus_logger,
-             leptus_access_log
-            ]}
- ]}.
+{application, leptus, [{description, "REST framework that runs on top of cowboy"},
+                       {vsn, "1.0.0"},
+                       {registered, []},
+                       {applications, [kernel, stdlib, cowboy]},
+                       {mod, {leptus_app, []}},
+                       {env, []},
+                       {modules, []}]}.

src/leptus.erl

@@ -60,6 +60,16 @@
 -export_type([listener/0]).
 -export_type([options/0]).
 
+-callback init(Route::string(), Req::pid(), State::any()) -> {ok, any()} | {error, any()}.
+-callback terminate(Reason::any(), Route::string(), Req::pid(), State::any()) -> ok.
+-callback routes() -> [string()].
+-callback allowed_methods(Route::string()) -> [binary()].
+-callback get(Route::string(), Req::pid(), State::any()) -> {ok, any(), any()} | {error, any()}.
+-callback put(Route::string(), Req::pid(), State::any()) -> {ok, any(), any()} | {error, any()}.
+-callback post(Route::string(), Req::pid(), State::any()) -> {ok, any(), any()} | {error, any()}.
+-callback delete(Route::string(), Req::pid(), State::any()) -> {ok, any(), any()} | {error, any()}.
+-callback options(Route::string(), Req::pid(), State::any()) -> {ok, any(), any()} | {error, any()}.
+-optional_callbacks([get/3, put/3, post/3, delete/3, options/3]).
 
 %% -----------------------------------------------------------------------------
 %% start a listener
@@ -251,10 +261,7 @@ ensure_started(App) ->
 %% -----------------------------------------------------------------------------
 -spec ensure_deps_started() -> ok.
 ensure_deps_started() ->
-    ensure_started(crypto),
-    ensure_started(ranch),
-    ensure_started(cowlib),
-    ensure_started(cowboy).
+    lists:foreach(fun(A) -> ok = ensure_started(A) end, [crypto, asn1, public_key, ssl, ranch, cowlib, cowboy]).
 
 -spec opt(atom(), options(), Default) -> any() | Default when Default :: any().
 opt(Key, [{Key, Value}|_], _) ->
@@ -286,7 +293,7 @@ print_info(Listener, IP, Port) ->
 update_listener_bucket({Listener, {Handlers, Opts}}) ->
     %% [{Listener, Bucket}]
     Bucket = #listener_bucket{handlers = Handlers, options = Opts,
-                              started_timestamp = now()},
+                              started_timestamp = os:timestamp()},
     Listeners = leptus_config:lookup(listeners, []),
     Listeners1 = lists:keystore(Listener, 1, Listeners, {Listener, Bucket}),
     leptus_config:set(listeners, Listeners1).

src/leptus_handler.erl

@@ -35,15 +35,15 @@
 -type req() :: pid().
 -type status() :: non_neg_integer() | binary() | atom().
 -type headers() :: cowboy:http_headers().
--type body() :: binary() | string() | {json | msgpack, leptus_json:json_term()}
+-type body() :: binary() | string() | {json | msgpack, jsx:json_term()} | {erlang, term()}
               | {html, binary()}.
 -type method() :: get | put | post | delete.
 -type response() :: {body(), handler_state()}
                   | {status(), body(), handler_state()}
                   | {status(), headers(), body(), handler_state()}.
 -type terminate_reason() :: normal | not_allowed | unauthenticated
                           | no_permission | {error, any()}.
--type data_format() :: text | json | msgpack | html.
+-type data_format() :: text | erlang | json | msgpack | html.
 -type status_code() :: 100..101 | 200..206 | 300..307 | 400..417 | 500..505.
 
 -export_type([status/0]).
@@ -288,7 +288,7 @@ method_not_allowed(Handler, Route, HandlerState) ->
 
 -spec allowed_methods(handler(), route()) -> binary().
 allowed_methods(Handler, Route) ->
-    join_http_methods(Handler:allowed_methods(Route)).
+    join_with_comma(Handler:allowed_methods(Route)).
 
 %% -----------------------------------------------------------------------------
 %% Handler:cross_domains/3
@@ -344,10 +344,21 @@ is_preflight(Req) ->
 -spec cors_headers(handler(), route(), binary(), req()) -> headers().
 cors_headers(Handler, Route, Origin, Req) ->
     AccessControlAllowOrigin = {<<"access-control-allow-origin">>, Origin},
+    AccessControlAllowHeaders =
+        case erlang:function_exported(Handler, allowed_headers, 2) of
+            true ->
+                Method = http_method(leptus_req:header(Req,
+                    <<"access-control-request-method">>)),
+                AllowedHeaders = Handler:allowed_headers(Method, Route),
+                [{<<"access-control-allow-headers">>,
+                  join_with_comma(AllowedHeaders)}];
+            false -> []
+        end,
     case is_preflight(Req) of
         true ->
             [AccessControlAllowOrigin|[{<<"access-control-allow-methods">>,
-                                        allowed_methods(Handler, Route)}]];
+                                        allowed_methods(Handler, Route)}]]
+                ++ AccessControlAllowHeaders;
         false ->
             [AccessControlAllowOrigin]
     end.
@@ -407,10 +418,12 @@ reply(Status, Headers, Body, Req) ->
     leptus_req:reply(Req, Status, Headers, Body).
 
 -spec prepare_headers_body(headers(), body()) -> {headers(), body()}.
+prepare_headers_body(Headers, {erlang, Body}) ->
+    {maybe_set_content_type(erlang, Headers), term_to_binary(Body)};
 prepare_headers_body(Headers, {json, Body}) ->
-    {maybe_set_content_type(json, Headers), leptus_json:encode(Body)};
+    {maybe_set_content_type(json, Headers), jsx:encode(Body)};
 prepare_headers_body(Headers, {msgpack, Body}) ->
-    {maybe_set_content_type(msgpack, Headers), msgpack:pack({Body}, [jiffy])};
+    {maybe_set_content_type(msgpack, Headers), msgpack:pack(Body, [{map_format, jsx}])};
 prepare_headers_body(Headers, {html, Body}) ->
     {maybe_set_content_type(html, Headers), Body};
 prepare_headers_body(Headers, Body) ->
@@ -430,8 +443,9 @@ maybe_set_content_type(Type, Headers) ->
 -spec content_type(data_format()) -> binary().
 content_type(text) -> <<"text/plain">>;
 content_type(html) -> <<"text/html">>;
+content_type(erlang) -> <<"application/erlang">>;
 content_type(json) -> <<"application/json">>;
-content_type(msgpack) -> <<"application/x-msgpack">>.
+content_type(msgpack) -> <<"application/msgpack">>.
 
 %% -----------------------------------------------------------------------------
 %% HTTP status code bindings
@@ -485,10 +499,10 @@ status(gateway_timeout) -> 504;
 status(http_version_not_supported) -> 505;
 status(A) -> A.
 
--spec join_http_methods([binary()]) -> binary().
-join_http_methods(Methods) ->
-    <<", ", Allow/binary>> = << <<", ", M/binary>> || M <- Methods >>,
-    Allow.
+-spec join_with_comma([binary()]) -> binary().
+join_with_comma(List) ->
+    <<", ", Res/binary>> = << <<", ", E/binary>> || E <- List >>,
+    Res.
 
 -spec compile_host(string() | binary()) -> [[binary() | atom()]] | [atom()].
 compile_host(HostMatch) ->