diff options
| -rw-r--r-- | examples/rest_hello_world/src/toppage_handler.erl | 2 | ||||
| -rw-r--r-- | src/cowboy_http_static.erl | 6 | ||||
| -rw-r--r-- | src/cowboy_rest.erl (renamed from src/cowboy_http_rest.erl) | 2 | ||||
| -rw-r--r-- | test/rest_forbidden_resource.erl | 2 | ||||
| -rw-r--r-- | test/rest_nodelete_resource.erl | 2 | ||||
| -rw-r--r-- | test/rest_resource_etags.erl | 2 | ||||
| -rw-r--r-- | test/rest_simple_resource.erl | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/examples/rest_hello_world/src/toppage_handler.erl b/examples/rest_hello_world/src/toppage_handler.erl index 8ee1904..c41cf91 100644 --- a/examples/rest_hello_world/src/toppage_handler.erl +++ b/examples/rest_hello_world/src/toppage_handler.erl @@ -10,7 +10,7 @@ -export([hello_to_text/2]). init(_Transport, _Req, []) -> - {upgrade, protocol, cowboy_http_rest}. + {upgrade, protocol, cowboy_rest}. content_types_provided(Req, State) -> {[ diff --git a/src/cowboy_http_static.erl b/src/cowboy_http_static.erl index d8e10a0..ca13532 100644 --- a/src/cowboy_http_static.erl +++ b/src/cowboy_http_static.erl @@ -62,7 +62,7 @@ %% `application/octet-stream'. This can be overriden by supplying a list %% of filename extension to mimetypes pairs in the `mimetypes' option. %% The filename extension should be a binary string including the leading dot. -%% The mimetypes must be of a type that the `cowboy_http_rest' protocol can +%% The mimetypes must be of a type that the `cowboy_rest' protocol can %% handle. %% %% The <a href="https://github.com/spawngrid/mimetypes">spawngrid/mimetypes</a> @@ -176,7 +176,7 @@ %% cowboy_protocol callbacks -export([init/3]). -%% cowboy_http_rest callbacks +%% cowboy_rest callbacks -export([rest_init/2]). -export([allowed_methods/2]). -export([malformed_request/2]). @@ -208,7 +208,7 @@ %% @private Upgrade from HTTP handler to REST handler. init({_Transport, http}, _Req, _Opts) -> - {upgrade, protocol, cowboy_http_rest}. + {upgrade, protocol, cowboy_rest}. %% @private Set up initial state of REST handler. diff --git a/src/cowboy_http_rest.erl b/src/cowboy_rest.erl index a9ff934..de12f3f 100644 --- a/src/cowboy_http_rest.erl +++ b/src/cowboy_rest.erl @@ -18,7 +18,7 @@ %% can be found in the Webmachine source tree, and on the Webmachine %% documentation available at http://wiki.basho.com/Webmachine.html %% at the time of writing. --module(cowboy_http_rest). +-module(cowboy_rest). -export([upgrade/4]). diff --git a/test/rest_forbidden_resource.erl b/test/rest_forbidden_resource.erl index eef04d0..9d3cd95 100644 --- a/test/rest_forbidden_resource.erl +++ b/test/rest_forbidden_resource.erl @@ -4,7 +4,7 @@ post_is_create/2, create_path/2, to_text/2, from_text/2]). init(_Transport, _Req, _Opts) -> - {upgrade, protocol, cowboy_http_rest}. + {upgrade, protocol, cowboy_rest}. rest_init(Req, [Forbidden]) -> {ok, Req, Forbidden}. diff --git a/test/rest_nodelete_resource.erl b/test/rest_nodelete_resource.erl index e0ece5a..8c83422 100644 --- a/test/rest_nodelete_resource.erl +++ b/test/rest_nodelete_resource.erl @@ -3,7 +3,7 @@ get_text_plain/2]). init(_Transport, _Req, _Opts) -> - {upgrade, protocol, cowboy_http_rest}. + {upgrade, protocol, cowboy_rest}. allowed_methods(Req, State) -> {['GET', 'HEAD', 'DELETE'], Req, State}. diff --git a/test/rest_resource_etags.erl b/test/rest_resource_etags.erl index 17b5eb6..43f1e05 100644 --- a/test/rest_resource_etags.erl +++ b/test/rest_resource_etags.erl @@ -2,7 +2,7 @@ -export([init/3, generate_etag/2, content_types_provided/2, get_text_plain/2]). init(_Transport, _Req, _Opts) -> - {upgrade, protocol, cowboy_http_rest}. + {upgrade, protocol, cowboy_rest}. generate_etag(Req, State) -> case cowboy_req:qs_val(<<"type">>, Req) of diff --git a/test/rest_simple_resource.erl b/test/rest_simple_resource.erl index e2c573c..97145dd 100644 --- a/test/rest_simple_resource.erl +++ b/test/rest_simple_resource.erl @@ -2,7 +2,7 @@ -export([init/3, content_types_provided/2, get_text_plain/2]). init(_Transport, _Req, _Opts) -> - {upgrade, protocol, cowboy_http_rest}. + {upgrade, protocol, cowboy_rest}. content_types_provided(Req, State) -> {[{{<<"text">>, <<"plain">>, []}, get_text_plain}], Req, State}. |