Browse Source

Rename the type http_method/0 to cowboy_http:method/0

Exported types are much better than include files.
Loïc Hoguin 13 years ago
parent
commit
9f40167487
4 changed files with 8 additions and 5 deletions
  1. 1 3
      include/http.hrl
  2. 5 0
      src/cowboy_http.erl
  3. 1 1
      src/cowboy_http_protocol.erl
  4. 1 1
      src/cowboy_http_req.erl

+ 1 - 3
include/http.hrl

@@ -13,8 +13,6 @@
 %% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 %% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
--type http_method() :: 'OPTIONS' | 'GET' | 'HEAD'
-	| 'POST' | 'PUT' | 'DELETE' | 'TRACE' | binary().
 -type http_uri() :: '*' | {absoluteURI, http | https, Host::binary(),
 	Port::integer() | undefined, Path::binary()}
 	| {scheme, Scheme::binary(), binary()}
@@ -47,7 +45,7 @@
 
 	%% Request.
 	pid        = undefined :: pid(),
-	method     = 'GET'     :: http_method(),
+	method     = 'GET'     :: cowboy_http:method(),
 	version    = {1, 1}    :: http_version(),
 	peer       = undefined :: undefined | {inet:ip_address(), inet:ip_port()},
 	host       = undefined :: undefined | cowboy_dispatcher:tokens(),

+ 5 - 0
src/cowboy_http.erl

@@ -26,6 +26,11 @@
 -export([connection_to_atom/1, urldecode/1, urldecode/2, urlencode/1,
 	urlencode/2]).
 
+-type method() :: 'OPTIONS' | 'GET' | 'HEAD'
+	| 'POST' | 'PUT' | 'DELETE' | 'TRACE' | binary().
+
+-export_type([method/0]).
+
 -include("include/http.hrl").
 -include_lib("eunit/include/eunit.hrl").
 

+ 1 - 1
src/cowboy_http_protocol.erl

@@ -108,7 +108,7 @@ wait_request(State=#state{socket=Socket, transport=Transport,
 		{error, _Reason} -> terminate(State)
 	end.
 
--spec request({http_request, http_method(), http_uri(),
+-spec request({http_request, cowboy_http:method(), http_uri(),
 	http_version()}, #state{}) -> ok | none().
 request({http_request, _Method, _URI, Version}, State)
 		when Version =/= {1, 0}, Version =/= {1, 1} ->

+ 1 - 1
src/cowboy_http_req.erl

@@ -56,7 +56,7 @@
 %% Request API.
 
 %% @doc Return the HTTP method of the request.
--spec method(#http_req{}) -> {http_method(), #http_req{}}.
+-spec method(#http_req{}) -> {cowboy_http:method(), #http_req{}}.
 method(Req) ->
 	{Req#http_req.method, Req}.