Skip to content
Browse files

Separate rebar confs, add backwards compat cb

Also, added slightly new rebar
  • Loading branch information...
1 parent 11935b9 commit 104bca52d4f9e0967abc70d157ed5a90e318baed @choptastic choptastic committed Mar 21, 2013
Showing with 27 additions and 5 deletions.
  1. +1 −0 .gitignore
  2. +4 −2 Makefile
  3. BIN rebar
  4. +1 −3 rebar.config
  5. +18 −0 rebar.test.config
  6. +3 −0 src/cowboy_bridge_modules/cowboy_request_bridge.erl
View
1 .gitignore
@@ -1,6 +1,7 @@
erl_crash.dump
*~
.*.sw?
+*.beam
.eunit/
/deps/*
test/logs/*
View
6 Makefile
@@ -9,5 +9,7 @@ compile: get-deps
clean:
./rebar clean
-test: compile
- ./rebar ct
+test: clean
+ ./rebar --config "rebar.test.config" get-deps
+ ./rebar --config "rebar.test.config" compile
+ ./rebar --config "rebar.test.config" skip_deps=true ct
View
BIN rebar
Binary file not shown.
View
4 rebar.config
@@ -9,7 +9,5 @@
{deps, [
{mimetypes, ".*", {git, "git://github.com/spawngrid/mimetypes.git", "HEAD"}},
- {pmod_transform, ".*", {git, "git://github.com/choptastic/pmod_transform.git", "HEAD"}},
- {ranch, ".*", {git, "git://github.com/extend/ranch.git", "HEAD"}},
- {cowboy, ".*", {git, "git://github.com/extend/cowboy", "HEAD"}}
+ {pmod_transform, ".*", {git, "git://github.com/choptastic/pmod_transform.git", "HEAD"}}
]}.
View
18 rebar.test.config
@@ -0,0 +1,18 @@
+% -*- Erlang -*-
+%% vim: ts=4 sw=4 et ft=erlang
+
+{lib_dirs,["deps"]}.
+{src_dirs, ["src", "test"]}.
+{erl_opts, [debug_info, fail_on_warning]}.
+{cover_enabled, true}.
+{xref_checks, [undefined_function_calls]}.
+
+{deps, [
+ {mimetypes, ".*", {git, "git://github.com/spawngrid/mimetypes.git", "HEAD"}},
+ {pmod_transform, ".*", {git, "git://github.com/choptastic/pmod_transform.git", "HEAD"}},
+ {ranch, ".*", {git, "git://github.com/extend/ranch.git", "HEAD"}},
+ {cowboy, ".*", {git, "git://github.com/extend/cowboy", "HEAD"}},
+
+ {proper, ".*", {git, "https://github.com/manopapad/proper.git", {branch, "master"}}}
+ %{proper_stdlib, ".*", {git, "https://github.com/spawngrid/proper_stdlib.git", {branch, "master"}}}
+]}.
View
3 src/cowboy_bridge_modules/cowboy_request_bridge.erl
@@ -23,6 +23,9 @@
recv_from_socket/3
]).
+init({Req, _DocRoot}) ->
+ %% This two-tuple version is deprecated but maintained for backwards compatibility
+ init(Req);
init(Req) ->
ReqKey = new_key(),
put_key(ReqKey, #request_cache{body = not_loaded, request = Req}),

0 comments on commit 104bca5

Please sign in to comment.
Something went wrong with that request. Please try again.