File leptus-0.4.2-git.patch of Package leptus

Overview Repositories Revisions Requests Users Attributes Meta

File leptus-0.4.2-git.patch of Package leptus (Revision 659694497e730d8f97464590e0f87fc0)

Currently displaying revision 659694497e730d8f97464590e0f87fc0 , Show latest

diff --git a/.gitignore b/.gitignore
index 4659e87..24dfd60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@ erl_crash.dump
 docs/public_html
 docs/tmp
 docs/elisp
+*~
+\#*
+.\#*
diff --git a/CHANGELOG b/CHANGELOG
index f3bbdb0..7274c4d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,87 @@
+2015-04-01  Sina Samavati  <sina.samv@gmail.com>
+
+	* src/leptus_handler.erl (handler_cross_domains): use leptus_utils:get_uri_authority/1
+	  to parse 'Origin' header value
+
+	* src/leptus_utils.erl: add get_uri_authority/1
+
+	* src/leptus.erl (print_info/2): fix started listener information
+
+2014-08-30  Sina Samavati  <sina.samv@gmail.com>
+
+	* Makefile: avoid overriding DEPS_DIR. fix moving deps/*/deps/* to deps/
+
+2014-08-05  Sina Samavati  <sina.samv@gmail.com>
+
+	* src/leptus.erl (start_listener/3): keep used options in an ETS table
+	(upgrade/3): add function upgrade/3 to use options when upgrading a listener
+
+2014-07-14  Sina Samavati  <sina.samv@gmail.com>
+
+	* src/leptus_logger.erl (delete_handler/2): fix type spec
+
+2014-07-13  Sina Samavati  <sina.samv@gmail.com>
+
+	* src/leptus_logger.erl: fix type spec of add_handler/2 & add delete_handler/2
+
+2014-07-04  Sina Samavati  <sina.samv@gmail.com>
+
+	* test/leptus_handler_SUITE.erl: add tests for three internal functions of leptus_handler
+
+2014-07-03  Sina Samavati  <sina.samv@gmail.com>
+
+	* src/leptus.erl: add function specifications for ensure_started/1,
+	  ensure_deps_started/0, opt/3, print_info/2, update_listener_bucket/1
+
+2014-06-29  Sina Samavati  <sina.samv@gmail.com>
+
+	* src/leptus_access_log.erl (handle_call/2): fix return error
+
+	* src/leptus_handler.erl: fix a type error
+
+2014-06-28  Sina Samavati  <sina.samv@gmail.com>
+
+	* src/leptus_logger.erl (timezone): re-fix timezone calculation
+
+2014-06-27  Sina Samavati  <sina.samv@gmail.com>
+
+	* src/leptus_logger.erl (timezone): fix timezone calculation
+
+2014-06-22  Sina Samavati  <sina.samv@gmail.com>
+
+	* src/leptus_access_log.erl: add open_file/1 & millsec_til_tomorrow/0.
+	  add a timer for asking for a new file once a day
+
+2014-06-17  Sina Samavati  <sina.samv@gmail.com>
+
+	* src/leptus_handler.erl: spawn processes for doing the access & console log
+
+	* src/leptus_sup.erl (init/1): add logger event manager in the supervisor tree
+
+2014-06-15  Sina Samavati  <sina.samv@gmail.com>
+
+	* src/leptus_access_log.erl: update the event handler to make log format customizable
+
+	* src/leptus.erl (start_listener/3): add the option 'log_handlers' to specify log event handlers
+	  and add them to the event manager before starting the listener
+
+2014-06-11  Sina Samavati  <sina.samv@gmail.com>
+
+	* src/leptus_access_log.erl: add access log event handler
+
+	* src/leptus_req.erl: add peer/1 and header/3
+
+	* src/leptus_logger.erl (datetime/1): update it to return 2 digits for hour, minute and second
+
+	* Makefile: update ERLC_OPTS and the target 'deps' to keep tarballs
+
+	* test/leptus_logger_SUITE.erl: add tests for the leptus_logger module
+
+	* include/leptus_logger.hrl: add the record 'log_data' and the macro 'LOGGER'
+
+	* src/leptus_logger.erl: add the module for adding logging handlers to the system
+	  and providing a simple log formatter
+
 2014-06-05  Sina Samavati  <sina.samv@gmail.com>
 
 	* 0.4.2 - src/leptus_handler.erl: use leptus_req:header/2 correctly (fix handling CORS)
diff --git a/LICENSE b/LICENSE
index 24a3b09..895c8a1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,4 @@
-The MIT License
-
-Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Makefile b/Makefile
index 7d127a5..f372557 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,8 @@
 # THE SOFTWARE.
 
 PROJECT = leptus
-CT_SUITES = leptus_router leptus_req leptus_http leptus_pt leptus_config
+CT_SUITES = leptus_pt leptus_router leptus_handler leptus_logger leptus_http \
+	leptus_config leptus_utils
 
 dep_cowboy = https://github.com/extend/cowboy/archive/0.9.0.tar.gz
 dep_msgpack = https://github.com/msgpack/msgpack-erlang/archive/0.2.8.tar.gz
@@ -32,20 +33,19 @@ else
     dep_jiffy = https://github.com/davisp/jiffy/archive/0.8.5.tar.gz
 endif
 
+DEPS_DIR ?= $(CURDIR)/deps
+export DEPS_DIR
+
 EBIN = $(CURDIR)/ebin
-DEPS_DIR = $(CURDIR)/deps
 DOCS_DIR = $(CURDIR)/docs
 TEST_DIR = $(CURDIR)/test
 PLT_FILE = $(CURDIR)/.$(PROJECT).plt
 
-ERLC_OPTS ?= -Werror +debug_info +warn_export_all +warn_export_vars \
+ERLC_OPTS += -I include -Werror +debug_info +warn_export_all +warn_export_vars \
 	+warn_shadow_vars +warn_obsolete_guard
 
 V ?= 0
 
-appsrc_verbose_0 = @echo "  APP   " $(PROJECT).app.src;
-appsrc_verbose = $(appsrc_verbose_$(V))
-
 erlc_verbose_0 = @echo "  ERLC  " $(?F);
 erlc_verbose = $(erlc_verbose_$(V))
 
@@ -73,18 +73,25 @@ all: deps app
 # ------------------------------------------------------------------------------
 # fetch and build dependencies
 # ------------------------------------------------------------------------------
-deps: $(DEPS_DIR) $(patsubst dep_%,deps/%/,$(filter dep_%,$(.VARIABLES)))
-	$(if $(wildcard deps/*/deps/), \
-	    mv -v deps/*/deps/* deps/ && rm -rf $(wildcard deps/*/deps/))
-deps/%/:
-	curl -L $(word 1,$(dep_$*)) -o $@.tar.gz
+.PRECIOUS: $(DEPS_DIR)/%.tar.gz
+
+deps: $(DEPS_DIR) $(patsubst dep_%,$(DEPS_DIR)/%/,$(filter dep_%,$(.VARIABLES)))
+	$(if $(shell find $(DEPS_DIR)/*/deps/* -maxdepth 1 -type d 2> /dev/null), \
+	    mv -v $(DEPS_DIR)/*/deps/* $(DEPS_DIR) && rm -rf $(DEPS_DIR)/*/deps/)
+
+$(DEPS_DIR):
+	mkdir -p $(DEPS_DIR)
+
+$(DEPS_DIR)/%/: $(DEPS_DIR)/%.tar.gz
 	mkdir -p $(DEPS_DIR)/$*
-	tar xzf $@.tar.gz -C $(DEPS_DIR)/$* --strip-components=1
-	@if [ -f $@/Makefile ]; \
-	then echo 'make -C $@' ; \
-		make -C $@ all  ; \
+	tar xzf $(DEPS_DIR)/$*.tar.gz -C $(DEPS_DIR)/$* --strip-components=1
+	@if [ -f $(DEPS_DIR)/$*/Makefile ]; \
+	then $(MAKE) -C $(DEPS_DIR)/$* all ; \
 	else echo 'cd $@ && rebar get-deps compile' ; \
-		cd $@ && rebar get-deps compile  ; fi
+		cd $(DEPS_DIR)/$* && rebar get-deps compile ; fi
+
+$(DEPS_DIR)/%.tar.gz:
+	curl -L $(word 1,$(dep_$*)) -o $(DEPS_DIR)/$*.tar.gz
 
 # ------------------------------------------------------------------------------
 # build application
@@ -95,12 +102,8 @@ ebin/: $(wildcard src/*.erl)
 	@mkdir -p $(EBIN)
 	$(erlc_verbose) erlc -v -o ebin $(ERLC_OPTS) $?
 
-ebin/$(PROJECT).app:
-	$(eval MODULES := $(shell find ebin -type f -name \*.beam \
-		| sed 's/ebin\///;s/\.beam/,/' | sed '$$s/.$$//'))
-	$(appsrc_verbose) cat src/$(PROJECT).app.src \
-		| sed 's/{modules,[[:space:]]*\[\]}/{modules, \[$(MODULES)\]}/' \
-		> ebin/$(PROJECT).app
+ebin/%.app: src/%.app.src
+	cp $< $@
 
 # ------------------------------------------------------------------------------
 # build docs
@@ -117,7 +120,7 @@ shell:
 # ------------------------------------------------------------------------------
 # run tests
 # ------------------------------------------------------------------------------
-test: ERLC_OPTS += -DTEST=1
+test: ERLC_OPTS += -DTEST=1 +export_all
 test: clean deps app
 	$(gen_verbose) erlc -v -o test $(ERLC_OPTS) \
 		$(wildcard test/*.erl test/*/*.erl) -pa ebin
@@ -131,7 +134,7 @@ test: clean deps app
 dialyze: $(PLT_FILE)
 	@dialyzer +S 8 --src src --plt $(PLT_FILE) --no_native $(DIALYZER_OPTS)
 
-$(CURDIR)/%.plt:
+$(PLT_FILE):
 	$(gen_verbose) dialyzer +S 8 --build_plt --output_plt $@ \
 		--apps erts kernel stdlib $(PLT_APPS) \
 		$(patsubst %/,%,$(filter %/,$(wildcard $(DEPS_DIR)/*/)))
@@ -154,6 +157,3 @@ clean-docs:
 distclean: clean clean-docs
 	rm -rf $(DEPS_DIR) $(CURDIR)/logs $(CURDIR)/*.beam $(PLT_FILE)
 	$(MAKE) -C $(DOCS_DIR) distclean
-
-$(CURDIR)/%:
-	mkdir -p $@
diff --git a/README.org b/README.org
index b2b7c69..ed84732 100644
--- a/README.org
+++ b/README.org
@@ -95,7 +95,8 @@
 ** Support
 
    - [[https://github.com/s1n4/leptus/issues][Issue tracker]]
-   - #leptus on Freenode
+   - #leptus IRC channel on Freenode
+   - [[https://groups.google.com/group/leptus][leptus]] mailing-list on Google Groups
 
 ** License
 
diff --git a/THANKS.org b/THANKS.org
index 57f858a..aa46be2 100644
--- a/THANKS.org
+++ b/THANKS.org
@@ -8,3 +8,6 @@
   - [[https://github.com/hamidreza-s][Hamidreza Soleimani]]
   - [[https://github.com/wmealing][Wade Mealing]]
   - [[https://github.com/seth][Seth Falcon]]
+  - [[https://github.com/jfacorro][Juan Facorro]]
+  - [[https://github.com/ptuckey][Patrick Tuckey]]
+  - [[https://github.com/knv][Kamyar Navidan]]
diff --git a/docs/Makefile b/docs/Makefile
index 3b94574..e78f003 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -5,12 +5,10 @@ INDEX_FILE = $(TMP_DIR)/index.org
 PUBLISH_SCRIPT = $(CURDIR)/publish.el
 
 DEPS_DIR = $(CURDIR)/elisp
-ORG_MODE_URL = http://orgmode.org/org-latest.tar.gz
-ORG_MODE = $(DEPS_DIR)/org-latest.tar.gz
-HTMLIZE_URL = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.cgi
-HTMLIZE = $(DEPS_DIR)/htmlize.el
-DEPS = $(ORG_MODE) \
-       $(HTMLIZE)
+
+ORG_MODE_DIR = $(DEPS_DIR)/org-mode
+ORG_MODE_URL = http://orgmode.org/org-8.2.10.tar.gz
+ORG_MODE = $(DEPS_DIR)/org-8.2.10.tar.gz
 
 all: deps $(TMP_DIR)
 	cp -r *.org $(TMP_DIR)
@@ -18,15 +16,12 @@ all: deps $(TMP_DIR)
 		-i $(INDEX_FILE)
 	emacs -Q --script $(PUBLISH_SCRIPT)
 
-deps: $(DEPS_DIR) $(DEPS)
+deps: $(ORG_MODE_DIR) $(ORG_MODE)
 
 $(ORG_MODE):
-	wget $(ORG_MODE_URL) -O $(ORG_MODE)
-	cd $(DEPS_DIR); tar xzf $(ORG_MODE)
-	-cd $(DEPS_DIR)/org-mode; $(MAKE)
-
-$(HTMLIZE):
-	wget $(HTMLIZE_URL) -O $(HTMLIZE)
+	curl -L $(ORG_MODE_URL) -o $(ORG_MODE)
+	cd $(ORG_MODE_DIR); tar xzf $(ORG_MODE) --strip-components=1
+	-cd $(ORG_MODE_DIR); $(MAKE)
 
 $(CURDIR)/%:
 	mkdir -p $@
diff --git a/docs/callbacks.org b/docs/callbacks.org
index 4bb2431..dd3ba1d 100644
--- a/docs/callbacks.org
+++ b/docs/callbacks.org
@@ -172,7 +172,7 @@
          {Body, State} | {Status, Body, State} | {Status, Headers, Body, State}
      #+END_SRC
 
-     In this case, ~Route~ must be a pattern matching.
+     In this case, ~Route~ must be a pattern that would match only a single string.
 
      Examples:
 
diff --git a/docs/configuration.org b/docs/configuration.org
index c0d54c8..6b1d513 100644
--- a/docs/configuration.org
+++ b/docs/configuration.org
@@ -8,11 +8,12 @@
   :CUSTOM_ID: configuration
   :END:
 
+  NOTE: Read this if you want to pass the ~App~ name as the second argument to
+  ~leptus:start_listener/2~.
+
   Leptus configuration file must be named ~leptus.config~ and put in ~priv~
   directory.
 
-  There are two types of configuration that can be defined:
-
 ** Sections
    :PROPERTIES:
    :CUSTOM_ID: sections
@@ -23,9 +24,8 @@
     :CUSTOM_ID: handlers
     :END:
 
-    Leptus must know your request handlers and their states, they should be
-    defined as ~{handlers, [{HostMatch, [{module(), State :: any()}]}]}.~ in
-    ~leptus.config~
+    Your request handlers should be defined as
+    ~{handlers, [{HostMatch, [{module(), State :: any()}]}]}.~ in ~leptus.config~
 
 *** options
     :PROPERTIES:
@@ -38,14 +38,15 @@
     #+BEGIN_SRC erlang
     {options,
      [
-      {ip, inet:ip_address()},
-      {port, inet:port_number()}
+       {ip, inet:ip_address()},
+       {port, inet:port_number()}
      ]
     }.
     #+END_SRC
 
-    Note that HTTPS and SPDY require three options that are ~cacertfile~,
-    ~certfile~ and ~keyfile~:
+    Note: For HTTPS and SPDY you also need to specify ~cacertfile~, ~certfile~
+    and ~keyfile~:
+
     #+BEGIN_SRC erlang
     {options,
      [
@@ -56,7 +57,7 @@
     }.
     #+END_SRC
 
-** Examples
+** Example
    :PROPERTIES:
    :CUSTOM_ID: examples
    :END:
@@ -64,27 +65,6 @@
    #+BEGIN_SRC erlang
    %% leptus.config
 
-   %% example 1
-   {options,
-    [
-     {ip, {0, 0, 0, 0}},
-     {port, 4000},
-     {hostmatch, "api.example.org"},
-    ]
-   }.
-
-   %% example 2
-   {options,
-    [
-     {ip, {0, 0, 0, 0}},
-     {port, 4443},
-     {cacertfile, "ssl/ca.crt"},
-     {certfile, "ssl/server.crt"},
-     {keyfile, "ssl/server.key"}
-    ]
-   }.
-
-   %% example 3
    {options,
     [
      {ip, {0, 0, 0, 0}},
@@ -98,7 +78,8 @@
    {handlers,
     [
      {'_',
-      [{rq_handler, undefined_state}]
+      [{rq_handler1, undefined_state},
+       {rq_handler2, [admin, dev]}]
      }
     ]
    }.
diff --git a/docs/index.org b/docs/index.org
index f0a8438..3e382cd 100644
--- a/docs/index.org
+++ b/docs/index.org
@@ -1,30 +1,64 @@
-#+TITLE:    Leptus documentations
+#+TITLE:    Leptus documentation
 #+AUTHOR:   Sina Samavati
 #+EMAIL:    sina.samv@gmail.com
 #+OPTIONS:  ^:nil toc:nil num:nil
 
-* Leptus documentations
+* Leptus documentation
   :PROPERTIES:
   :CUSTOM_ID: docs
   :END:
 
-** Preface
+** Overview
    :PROPERTIES:
    :CUSTOM_ID: preface
    :END:
 
-   Let me talk about a /thing/ that makes Leptus simple. Parse transform,
-   the /thing/ that saves us some headache, so now we've got a rule,
-   using the module ~leptus_pt~ for doing the parse transform when compiling our
-   request/resource handlers (modules).
+   #+BEGIN_SRC erlang
+   -module(hello).
+   -compile({parse_transform, leptus_pt}).
+
+   %% leptus callbacks
+   -export([init/3]).
+   -export([get/3]).
+   -export([terminate/4]).
+
+   init(_Route, _Req, State) ->
+       {ok, State}.
 
-   So, I suggest you using the following in your request/resource handlers
-   (modules):
+   get("/", _Req, State) ->
+       {<<"Hello, leptus!">>, State};
+   get("/hi/:name", Req, State) ->
+       Status = ok,
+       Name = leptus_req:param(Req, name),
+       Body = [{<<"say">>, <<"Hi">>}, {<<"to">>, Name}],
+       {Status, {json, Body}, State}.
 
+   terminate(_Reason, _Route, _Req, _State) ->
+       ok.
+   #+END_SRC
+
+   Note the use of the following in your request/resource handler module.
    #+BEGIN_SRC erlang
    -compile({parse_transform, leptus_pt}).
    #+END_SRC
 
+   Let's compile and run the example above.
+
+   #+BEGIN_SRC
+   $ erl -pa ebin deps/*/ebin
+   #+END_SRC
+
+   #+BEGIN_SRC
+   > c(hello).
+   > leptus:start_listener(http, [{'_', [{hello, undefined_state}]}]).
+   Leptus started on http://127.0.0.1:8080
+   #+END_SRC
+
+   #+BEGIN_SRC
+   $ curl localhost:8080/hi/Leptus
+   {"say":"Hi","to":"Leptus"}
+   #+END_SRC
+
 ** Table of contents
    :PROPERTIES:
    :CUSTOM_ID: toc
@@ -69,6 +103,7 @@
      - [[leptus.org][leptus]]
      - [[leptus_config.org][leptus_config]]
      - [[leptus_json.org][leptus_json]]
+     - [[leptus_logger.org][leptus_logger]]
      - [[leptus_req.org][leptus_req]]
      - [[leptus_router.org][leptus_router]]
      - [[leptus_utils.org][leptus_utils]]
diff --git a/docs/leptus.org b/docs/leptus.org
index cc5a53b..0f87f52 100644
--- a/docs/leptus.org
+++ b/docs/leptus.org
@@ -8,6 +8,8 @@
   :CUSTOM_ID: leptus
   :END:
 
+  Leptus high-level API for working with listeners.
+
 ** Types
    :PROPERTIES:
    :CUSTOM_ID:       types
diff --git a/docs/leptus_logger.org b/docs/leptus_logger.org
new file mode 100644
index 0000000..01f3130
--- /dev/null
+++ b/docs/leptus_logger.org
@@ -0,0 +1,117 @@
+#+TITLE:    leptus_router module
+#+AUTHOR:   Sina Samavati
+#+EMAIL:    sina.samv@gmail.com
+#+OPTIONS:  ^:nil num:nil
+
+* leptus_logger module
+  :PROPERTIES:
+  :CUSTOM_ID: leptus_logger
+  :END:
+
+  This module is used for adding/removing log handlers and sending log events.
+
+** Functions
+  :PROPERTIES:
+  :CUSTOM_ID: functions
+  :END:
+
+*** add_handler/2
+    :PROPERTIES:
+    :CUSTOM_ID: add_handler-2
+    :END:
+
+    Adds a new log handler to the gen_event manager leptus_log_man.
+
+    #+BEGIN_SRC erlang
+    add_handler(Handler, Args) -> ok | {'EXIT', any()} | any()
+    #+END_SRC
+
+    Types:
+
+    #+BEGIN_SRC erlang
+    Handler = atom() | {atom(), any()}
+    Args = any()
+    #+END_SRC
+
+*** delete_handler/2
+    :PROPERTIES:
+    :CUSTOM_ID: delete_handler-2
+    :END:
+
+    Removes a log handler from the gen_event manager leptus_log_man.
+
+    #+BEGIN_SRC erlang
+    delete_handler(Handler, Args) -> any() | {error, module_not_found} | {'EXIT', any()}
+    #+END_SRC
+
+    Types:
+
+    #+BEGIN_SRC erlang
+    Handler = atom() | {atom(), any()}
+    Args = any()
+    #+END_SRC
+
+*** access_log/1
+    :PROPERTIES:
+    :CUSTOM_ID: access_log-2
+    :END:
+
+    Sends the event notification ~{access_log, LogData}~ to the event manager
+    leptus_log_man.
+
+    #+BEGIN_SRC erlang
+    access_log(LogData) -> ok
+    #+END_SRC
+
+    Type:
+
+    #+BEGIN_SRC erlang
+    LogData = #log_data {
+                          request_time :: calendar:datetime(),
+                          response_time :: undefined | calendar:datetime(),
+                          request_line :: string(),
+                          ip :: inet:ip_address(),
+                          version :: atom(),
+                          method :: binary(),
+                          uri :: binary(),
+                          headers :: [{binary(), iodata()}],
+                          status :: non_neg_integer(),
+                          content_length :: non_neg_integer()
+                        }
+    #+END_SRC
+
+*** format/2
+    :PROPERTIES:
+    :CUSTOM_ID: format-2
+    :END:
+
+    Produces a log line with a given format.
+
+    #+BEGIN_SRC erlang
+    format(Fmt, LogData) -> string()
+    #+END_SRC
+
+    Types:
+
+    #+BEGIN_SRC erlang
+    Fmt = string()
+    LogData = #log_data {
+                          request_time :: calendar:datetime(),
+                          response_time :: undefined | calendar:datetime(),
+                          request_line :: string(),
+                          ip :: inet:ip_address(),
+                          version :: atom(),
+                          method :: binary(),
+                          uri :: binary(),
+                          headers :: [{binary(), iodata()}],
+                          status :: non_neg_integer(),
+                          content_length :: non_neg_integer()
+                        }
+    #+END_SRC
+
+    Example:
+
+    #+BEGIN_SRC erlang
+    > format("~h ~l ~u ~t \"~r\" ~s ~B", LogData).
+    "127.0.0.1 - - [11/Jun/2014:03:07:25 +0450] \"GET /b?p=2 HTTP/1.1\" 200 83"
+    #+END_SRC
diff --git a/docs/leptus_req.org b/docs/leptus_req.org
index c2a412d..076b818 100644
--- a/docs/leptus_req.org
+++ b/docs/leptus_req.org
@@ -188,6 +188,21 @@
     header(Req, <<"content-type">>) -> <<"application/x-www-form-urlencoded">>
     #+END_SRC
 
+*** header/3
+    :PROPERTIES:
+    :CUSTOM_ID: header-3
+    :END:
+
+    Returns the given header value or the default value if the header does not
+    exist.
+
+    #+BEGIN_SRC erlang
+    header(Req, binary(), Default) -> binary() | Default
+
+    %% e.g.
+    header(Req, <<"content-type">>, undefined) -> undefined
+    #+END_SRC
+
 *** parse_header/2
     :PROPERTIES:
     :CUSTOM_ID: parse_header-2
@@ -218,6 +233,20 @@
     auth(Req, basic) -> {<<"username">>, <<"p4ssw0rd">>}
     #+END_SRC
 
+*** peer/1
+    :PROPERTIES:
+    :CUSTOM_ID: peer-1
+    :END:
+
+    Returns the IP address and the port number of the remote host.
+
+    #+BEGIN_SRC erlang
+    peer(Req) -> {inet:ip_address(), inet:port_number()}
+
+    %% e.g.
+    peer(Req) -> {{127, 0, 0, 1}, 3846}
+    #+END_SRC
+
 *** get_req/1
     :PROPERTIES:
     :CUSTOM_ID: get_req-1
diff --git a/docs/publish.el b/docs/publish.el
index 27108cc..5d5e7d6 100644
--- a/docs/publish.el
+++ b/docs/publish.el
@@ -1,8 +1,8 @@
 (add-to-list 'load-path "elisp")
 (add-to-list 'load-path "elisp/org-mode/lisp")
+(add-to-list 'load-path "elisp/org-mode/contrib/lisp")
 
 (require 'htmlize)
-(require 'org-publish)
 (require 'ox-html)
 
 (setq org-publish-project-alist
diff --git a/docs/start.org b/docs/start.org
index c893b0a..d04a3f6 100644
--- a/docs/start.org
+++ b/docs/start.org
@@ -17,6 +17,19 @@
    Listener          = http | https | spdy
    AppName           = atom()
    HandlersOrAppName = Handlers | AppName
+
+   HostMatch = term()
+   StaticDir = file:name() | {priv_dir, App :: atom(), Dir :: file:name()}
+
+   Option = {nb_acceptors, non_neg_integer()}
+          | {ip, inet:ip_address()}
+          | {port, inet:port_number()}
+          | {cacertfile, file:name_all()}
+          | {certfile, file:name_all()}
+          | {keyfile, file:name_all()}
+          | {static_dir, {HostMatch, StaticDir}}
+          | {log_handlers, [{module(), any()}]}
+   Options = [Option]
    #+END_SRC
 
 ** leptus functions
@@ -56,12 +69,11 @@
 
 ** The OTP way
 
-   The way everyone recommends for starting an OTP application:
+   The recommended method for starting an OTP application:
    #+BEGIN_SRC erlang
    application:start(crypto),
    application:start(ranch),
    application:start(cowboy),
    application:start(leptus).
    #+END_SRC
-   and then the function that is described above should be called to start a
-   listener.
+   After that ~start_listener~ function should be called to start a listener.
diff --git a/include/leptus_logger.hrl b/include/leptus_logger.hrl
new file mode 100644
index 0000000..d70b664
--- /dev/null
+++ b/include/leptus_logger.hrl
@@ -0,0 +1,36 @@
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
+%%
+%% Permission is hereby granted, free of charge, to any person obtaining a copy
+%% of this software and associated documentation files (the "Software"), to deal
+%% in the Software without restriction, including without limitation the rights
+%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+%% copies of the Software, and to permit persons to whom the Software is
+%% furnished to do so, subject to the following conditions:
+%%
+%% The above copyright notice and this permission notice shall be included in
+%% all copies or substantial portions of the Software.
+%%
+%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+%% THE SOFTWARE.
+
+-define(LOGGER, leptus_log_man).
+
+-record(log_data,
+        {
+          request_time = erlang:localtime() :: calendar:datetime(),
+          response_time :: undefined | calendar:datetime(),
+          request_line = "" :: string(),
+          ip :: inet:ip_address(),
+          version = 'HTTP/1.1' :: atom(),
+          method = <<"GET">> :: binary(),
+          uri = <<"/">> :: binary(),
+          headers = [] :: [{binary(), iodata()}],
+          status = 200 :: non_neg_integer(),
+          content_length = 0 :: non_neg_integer()
+        }).
+-type log_data() :: #log_data{}.
diff --git a/src/leptus.app.src b/src/leptus.app.src
index 38a8a8d..460fff0 100644
--- a/src/leptus.app.src
+++ b/src/leptus.app.src
@@ -1,7 +1,5 @@
 %%-*- mode: erlang -*-
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
@@ -33,5 +31,11 @@
                  ]},
   {mod, {leptus_app, []}},
   {env, []},
-  {modules, []}
+  {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
+            ]}
  ]}.
diff --git a/src/leptus.erl b/src/leptus.erl
index 66ea19f..82b113a 100644
--- a/src/leptus.erl
+++ b/src/leptus.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
@@ -27,9 +25,11 @@
 %% -----------------------------------------------------------------------------
 -export([start_listener/2]).
 -export([start_listener/3]).
+-export([start_listener/4]).
 -export([upgrade/0]).
 -export([upgrade/1]).
 -export([upgrade/2]).
+-export([upgrade/3]).
 -export([stop_listener/1]).
 -export([running_listeners/0]).
 -export([listener_uptime/1]).
@@ -54,7 +54,8 @@
                 | {cacertfile, file:name_all()}
                 | {certfile, file:name_all()}
                 | {keyfile, file:name_all()}
-                | {static_dir, {host_match(), static_directory()}}.
+                | {static_dir, {host_match(), static_directory()}}
+                | {log_handlers, [{module(), any()}]}.
 -type options() :: [option()].
 -export_type([listener/0]).
 -export_type([options/0]).
@@ -79,9 +80,18 @@ start_listener(Listener, Handlers) ->
 -spec start_listener(listener(), handlers(), options()) ->
                             {ok, pid()} | {error, any()}.
 start_listener(Listener, Handlers, Opts) ->
+    start_listener(Listener, Handlers, Opts, []).
+
+-spec start_listener(listener(), handlers(), options(), cowboy_protocol:opts()) ->
+                            {ok, pid()} | {error, any()}.
+start_listener(Listener, Handlers, Opts, UserCowboyProtoOpts) ->
     ensure_deps_started(),
     ensure_started(leptus),
 
+    %% add log handlers to the event manager
+    LogHandlers = opt(log_handlers, Opts, []),
+    [ok = leptus_logger:add_handler(M, A) || {M, A} <- LogHandlers],
+
     %% routes
     Paths = leptus_router:paths(Handlers),
     %% serving static files
@@ -104,12 +114,16 @@ start_listener(Listener, Handlers, Opts) ->
     Port = opt(port, Opts, 8080),
 
     ListenerOpts = listener_opts(Listener, IP, Port, Opts),
-    Res = cowboy:ListenerFunc(Ref, NbAcceptors, ListenerOpts,
-                              [{env, [{dispatch, Dispatch1}]}]),
+    CowboyProtoOpts = [{env, [{dispatch, Dispatch1}]} | UserCowboyProtoOpts],
+
+    Res = cowboy:ListenerFunc(Ref, NbAcceptors, ListenerOpts, CowboyProtoOpts),
     case Res of
         {ok, _} ->
-            update_listener_bucket({Listener, {Handlers, ListenerOpts}}),
-            print_info(IP, Port);
+            Opts1 = lists:keydelete(ip, 1, Opts),
+            Opts2 = lists:keydelete(port, 1, Opts1),
+            Opts3 = [{ip, IP}, {port, Port}|Opts2],
+            update_listener_bucket({Listener, {Handlers, Opts3}}),
+            print_info(Listener, IP, Port);
         _ ->
             ok
     end,
@@ -133,8 +147,24 @@ upgrade(Listeners) ->
 %% -----------------------------------------------------------------------------
 -spec upgrade(listener(), handlers()) -> ok.
 upgrade(Listener, Handlers) ->
+    Opts = case leptus_utils:listener_bucket(Listener) of
+               not_found ->
+                   [];
+               #listener_bucket{options = Opts1} ->
+                   Opts1
+           end,
+    upgrade(Listener, Handlers, Opts).
+
+-spec upgrade(listener(), handlers(), options()) -> ok.
+upgrade(Listener, Handlers, Opts) ->
     Paths = leptus_router:paths(Handlers),
-    Dispatch = cowboy_router:compile(Paths),
+    Paths1 = case opt(static_dir, Opts, undefined) of
+                 undefined ->
+                     [];
+                 Path ->
+                     leptus_router:static_file_routes(Path)
+             end,
+    Dispatch = cowboy_router:compile(Paths ++ Paths1),
     %% sort compiled routes
     Dispatch1 = leptus_router:sort_dispatch(Dispatch),
     Ref = get_ref(Listener),
@@ -155,7 +185,7 @@ running_listeners() ->
     F = fun({L, _}, Acc) ->
                 [L|Acc]
         end,
-    lists:foldr(F, [], leptus_config:lookup(listeners)).
+    lists:foldr(F, [], leptus_config:lookup(listeners, [])).
 
 %% -----------------------------------------------------------------------------
 %% get uptime of a running listener
@@ -207,6 +237,7 @@ extra_listener_opts(Opts) ->
      {keyfile, opt(keyfile, Opts, "")}
     ].
 
+-spec ensure_started(atom()) -> ok.
 ensure_started(App) ->
     case application:start(App) of
         ok ->
@@ -215,13 +246,17 @@ ensure_started(App) ->
             ok
     end.
 
+%% -----------------------------------------------------------------------------
 %% ensure dependencies are started
+%% -----------------------------------------------------------------------------
+-spec ensure_deps_started() -> ok.
 ensure_deps_started() ->
     ensure_started(crypto),
     ensure_started(ranch),
     ensure_started(cowlib),
     ensure_started(cowboy).
 
+-spec opt(atom(), options(), Default) -> any() | Default when Default :: any().
 opt(Key, [{Key, Value}|_], _) ->
     Value;
 opt(Key, [_|Rest], Default) ->
@@ -232,15 +267,22 @@ opt(_, [], Default) ->
 %% -----------------------------------------------------------------------------
 %% print the version number and what ip/port it's started on
 %% -----------------------------------------------------------------------------
-print_info(IP, Port) ->
+-spec print_info(listener(), inet:ip_address(), inet:portn_number()) -> ok.
+print_info(Listener, IP, Port) ->
     {ok, Vsn} = application:get_key(leptus, vsn),
-    io:format("Leptus ~s started on http://~s:~p~n",
-              [Vsn, inet_parse:ntoa(IP), Port]).
+    Listener1 = case Listener of
+                    http -> "http";
+                    https -> "https";
+                    spdy -> "https"
+                end,
+    io:format("Leptus ~s started on ~s://~s:~p~n",
+              [Vsn, Listener1, inet_parse:ntoa(IP), Port]).
 
 %% -----------------------------------------------------------------------------
 %% update leptus_config ETS table
 %% keep handlers and options in an ETS table
 %% -----------------------------------------------------------------------------
+-spec update_listener_bucket({listener(), {handlers(), options()}}) -> ok.
 update_listener_bucket({Listener, {Handlers, Opts}}) ->
     %% [{Listener, Bucket}]
     Bucket = #listener_bucket{handlers = Handlers, options = Opts,
diff --git a/src/leptus.hrl b/src/leptus.hrl
index 30be8b4..009e6fe 100644
--- a/src/leptus.hrl
+++ b/src/leptus.hrl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
diff --git a/src/leptus_access_log.erl b/src/leptus_access_log.erl
new file mode 100644
index 0000000..2a610bc
--- /dev/null
+++ b/src/leptus_access_log.erl
@@ -0,0 +1,96 @@
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
+%%
+%% Permission is hereby granted, free of charge, to any person obtaining a copy
+%% of this software and associated documentation files (the "Software"), to deal
+%% in the Software without restriction, including without limitation the rights
+%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+%% copies of the Software, and to permit persons to whom the Software is
+%% furnished to do so, subject to the following conditions:
+%%
+%% The above copyright notice and this permission notice shall be included in
+%% all copies or substantial portions of the Software.
+%%
+%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+%% THE SOFTWARE.
+
+-module(leptus_access_log).
+-behaviour(gen_event).
+
+%% -----------------------------------------------------------------------------
+%% gen_event callbacks
+%% -----------------------------------------------------------------------------
+-export([init/1]).
+-export([handle_event/2]).
+-export([handle_call/2]).
+-export([handle_info/2]).
+-export([terminate/2]).
+-export([code_change/3]).
+
+-define(FILENAME_SUFFIX, "-access.log").
+-define(LOG_FORMAT, "~h ~l ~u ~t \"~r\" ~s ~B \"~{referer}\" \"~{user-agent}\"").
+
+-record(state, {dir, io_dev, log_fmt, tref}).
+
+init({Dir, LogFmt}) ->
+    %% ask for a new file once a day
+    {ok, TRef} = timer:send_interval(millsec_til_tomorrow(), open_new_file),
+    {ok, IoDev} = open_file(Dir),
+    {ok, #state{dir = Dir, io_dev = IoDev, log_fmt = LogFmt, tref = TRef}};
+init(Dir) ->
+    init({Dir, ?LOG_FORMAT}).
+
+handle_event({access_log, LogData}, State=#state{io_dev=IoDev, log_fmt=LogFmt}) ->
+    Log = leptus_logger:format(LogFmt, LogData),
+    file:write(IoDev, [Log, $\n]),
+    {ok, State};
+handle_event(_, State) ->
+    {ok, State}.
+
+handle_call(_Request, State) ->
+    {ok, ok, State}.
+
+handle_info(open_new_file, State=#state{dir=Dir, io_dev=IoDev}) ->
+    file:close(IoDev),
+    {ok, IoDev1} = open_file(Dir),
+    {ok, State#state{io_dev = IoDev1}};
+handle_info(_Info, State) ->
+    {ok, State}.
+
+terminate(_Args, #state{io_dev=IoDev, tref=TRef}) ->
+    file:close(IoDev),
+    timer:cancel(TRef),
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%% -----------------------------------------------------------------------------
+%% make filename. e.g. "Dir/2014_06_22-access.log"
+%% -----------------------------------------------------------------------------
+filename(Dir) ->
+    {{Y, M, D}, _} = erlang:localtime(),
+    filename:join(Dir, io_lib:format("~w_~2..0w_~2..0w~s",
+                                     [Y, M, D, ?FILENAME_SUFFIX])).
+
+%% -----------------------------------------------------------------------------
+%% take directory, make a filename, and open file
+%% -----------------------------------------------------------------------------
+open_file(Dir) ->
+    Filename = filename(Dir),
+    filelib:ensure_dir(Filename),
+    file:open(Filename, [append, raw]).
+
+%% -----------------------------------------------------------------------------
+%% milliseconds left until a new day arrives
+%% -----------------------------------------------------------------------------
+millsec_til_tomorrow() ->
+    {_, {CH, CM, CS}} = erlang:localtime(),
+    H = (23 - CH) * (60 * 60) * 1000,
+    M = (59 - CM) * (60 * 1000),
+    S = (59 - CS) * 1000,
+    (H + M) + S.
diff --git a/src/leptus_app.erl b/src/leptus_app.erl
index 77ef0f9..688f821 100644
--- a/src/leptus_app.erl
+++ b/src/leptus_app.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
diff --git a/src/leptus_config.erl b/src/leptus_config.erl
index e00df9a..b5e6e5b 100644
--- a/src/leptus_config.erl
+++ b/src/leptus_config.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
diff --git a/src/leptus_debug_log.erl b/src/leptus_debug_log.erl
new file mode 100644
index 0000000..620e685
--- /dev/null
+++ b/src/leptus_debug_log.erl
@@ -0,0 +1,78 @@
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
+%%
+%% Permission is hereby granted, free of charge, to any person obtaining a copy
+%% of this software and associated documentation files (the "Software"), to deal
+%% in the Software without restriction, including without limitation the rights
+%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+%% copies of the Software, and to permit persons to whom the Software is
+%% furnished to do so, subject to the following conditions:
+%%
+%% The above copyright notice and this permission notice shall be included in
+%% all copies or substantial portions of the Software.
+%%
+%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+%% THE SOFTWARE.
+
+-module(leptus_debug_log).
+-behaviour(gen_event).
+
+-include("leptus_logger.hrl").
+
+%% -----------------------------------------------------------------------------
+%% gen_event callbacks
+%% -----------------------------------------------------------------------------
+-export([init/1]).
+-export([handle_event/2]).
+-export([handle_call/2]).
+-export([handle_info/2]).
+-export([terminate/2]).
+-export([code_change/3]).
+
+-define(LOG_FORMAT, "~h ~l ~u ~t \"~r\" ~s ~B \"~{referer}\" \"~{user-agent}\"").
+
+init(default) ->
+    {ok, ?LOG_FORMAT};
+init(LogFmt) ->
+    {ok, LogFmt}.
+
+handle_event({debug_log, LogData}, LogFmt) ->
+    Log = leptus_logger:format(LogFmt, LogData),
+    console_log(LogData#log_data.status, Log),
+    {ok, LogFmt};
+handle_event(_, LogFmt) ->
+    {ok, LogFmt}.
+
+handle_call(_Request, LogFmt) ->
+    {ok, ok, LogFmt}.
+
+handle_info(_Info, LogFmt) ->
+    {ok, LogFmt}.
+
+terminate(_Args, _LogFmt) ->
+    ok.
+
+code_change(_OldVsn, LogFmt, _Extra) ->
+    {ok, LogFmt}.
+
+%% -----------------------------------------------------------------------------
+%% print request date-time, requested URI, response status and content-length
+%% -----------------------------------------------------------------------------
+-spec console_log(leptus_logger:status_code(), string()) -> ok.
+console_log(Status, FormatedLog) ->
+    Color = status_color(Status),
+    io:format("~s~s\e[0m~n", [Color, FormatedLog]).
+
+%% -----------------------------------------------------------------------------
+%% get terminal color escape code based on status code
+%% -----------------------------------------------------------------------------
+-spec status_color(non_neg_integer()) -> string().
+status_color(N) when N >= 200, N < 300 -> "\e[32m"; %% green
+status_color(N) when N >= 300, N < 400 -> "\e[34m"; %% blue
+status_color(N) when N >= 400, N < 500 -> "\e[31m"; %% red
+status_color(N) when N >= 500 -> "\e[1m\e[31m"; %% bold red
+status_color(_) -> "".
diff --git a/src/leptus_handler.erl b/src/leptus_handler.erl
index 6b43ac4..0d104ea 100644
--- a/src/leptus_handler.erl
+++ b/src/leptus_handler.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
@@ -29,6 +27,7 @@
 -export([upgrade/4]).
 
 -include("leptus.hrl").
+-include("leptus_logger.hrl").
 
 %% -----------------------------------------------------------------------------
 %% types
@@ -47,13 +46,16 @@
 -type data_format() :: text | json | msgpack | html.
 -type status_code() :: 100..101 | 200..206 | 300..307 | 400..417 | 500..505.
 
+-export_type([status/0]).
+
 %% -----------------------------------------------------------------------------
 %% internal state record
 %% -----------------------------------------------------------------------------
 -record(state, {
           resrc = #resrc{} :: resrc(),
           method = <<"GET">> :: binary(),
-          terminate_reason = normal :: terminate_reason()
+          terminate_reason = normal :: terminate_reason(),
+          log_data = #log_data{} :: log_data()
          }).
 -type state() :: #state{}.
 
@@ -61,15 +63,18 @@
 %% cowboy callbacks
 %% -----------------------------------------------------------------------------
 init(_, Req, Resrc) ->
+    LogData = #log_data{},
+    Headers = cowboy_req:get(headers, Req),
     {ok, ReqPid} = leptus_req_sup:start_child(Req),
     Method = leptus_req:method(ReqPid),
-    State = #state{resrc = Resrc, method = Method},
+    LogData1 = LogData#log_data{method = Method, headers = Headers},
+    State = #state{resrc = Resrc, method = Method, log_data = LogData1},
     {upgrade, protocol, ?MODULE, ReqPid, State}.
 
 upgrade(Req, Env, _Handler,
         State=#state{resrc=#resrc{handler=Handler, route=Route,
                                   handler_state=HState}=Resrc,
-                     method=Method}) ->
+                     method=Method, log_data=LogData}) ->
     {ok, State2} =
         try Handler:init(Route, Req, HState) of
             {ok, HState1} ->
@@ -85,20 +90,27 @@ upgrade(Req, Env, _Handler,
                 error_info(Class, Reason, Route, Req, HState),
                 {ok, State#state{terminate_reason={error, Reason}}}
         end,
-    TerminateReason = State2#state.terminate_reason,
-    HState2 = State2#state.resrc#resrc.handler_state,
-    handler_terminate(TerminateReason, Handler, Route, Req, HState2),
 
+    LogData1 = LogData#log_data{response_time = erlang:localtime()},
     receive
         {Status, ContentLength} ->
-            console_log(Method, Status, ContentLength, Req)
+            {IP, _} = leptus_req:peer(Req),
+            Version = leptus_req:version(Req),
+            URI = leptus_req:uri(Req),
+            LogData2 = LogData1#log_data{ip = IP, version = Version,
+                                         uri = URI, status = Status,
+                                         content_length = ContentLength},
+            spawn(leptus_logger, send_event, [access_log, LogData2]),
+            spawn(leptus_logger, send_event, [debug_log, LogData2])
     end,
 
+    TerminateReason = State2#state.terminate_reason,
+    HState2 = State2#state.resrc#resrc.handler_state,
+    handler_terminate(TerminateReason, Handler, Route, Req, HState2),
     Req1 = leptus_req:get_req(Req),
     leptus_req:stop(Req),
     {ok, Req1, Env}.
 
-
 %% -----------------------------------------------------------------------------
 %% internal
 %% -----------------------------------------------------------------------------
@@ -106,7 +118,7 @@ upgrade(Req, Env, _Handler,
 is_defined(Handler, Func) ->
     erlang:function_exported(Handler, Func, 3).
 
--spec http_method(binary()) -> method() | not_allowed.
+-spec http_method(binary()) -> method() | options | not_allowed.
 http_method(<<"GET">>) -> get;
 http_method(<<"PUT">>) -> put;
 http_method(<<"POST">>) -> post;
@@ -118,28 +130,18 @@ http_method(_) -> not_allowed.
 %% -----------------------------------------------------------------------------
 %% Handler:Method/3 (Method :: get | put | post | delete)
 %% -----------------------------------------------------------------------------
--spec handle_request(not_allowed, req(), State) ->
-                            {ok, State} when State :: state();
-                    (options, req(), State) ->
-                            {ok, State} when State :: state();
-                    (method(), req(), State) ->
+-spec handle_request(not_allowed | options | method(), req(), State) ->
                             {ok, State} when State :: state().
 handle_request(not_allowed, Req,
                State=#state{resrc=#resrc{handler_state=HandlerState,
                                          handler=Handler, route=Route}}) ->
     Response = method_not_allowed(Handler, Route, HandlerState),
     handle_response(Response, Req, State#state{terminate_reason=not_allowed});
-handle_request(options, Req,
-               State=#state{resrc=#resrc{handler=Handler, route=Route,
-                                         handler_state=HandlerState}}) ->
+handle_request(options, Req, State=#state{
+				      resrc=#resrc{
+					       handler_state=HandlerState}}) ->
     %% deal with CORS preflight request
-    Method = leptus_req:header(Req, <<"access-control-request-method">>),
-    case is_allowed(Handler, http_method(Method), Route, Method) of
-        true ->
-            handle_response({<<>>, HandlerState}, Req, State);
-        false ->
-            handle_request(not_allowed, Req, State)
-    end;
+    handle_options_request(Req, State, HandlerState, check_cors_preflight(Req, State));
 handle_request(Func, Req,
                State=#state{resrc=#resrc{handler=Handler, route=Route,
                                          handler_state=HandlerState},
@@ -168,6 +170,18 @@ handle_request(Func, Req,
                 end,
     handle_response(Response, Req, State#state{terminate_reason=TReason}).
 
+check_cors_preflight(Req, #state{
+			     resrc=#resrc{
+				      handler=Handler,
+				      route=Route}}) ->
+    Method = leptus_req:header(Req, <<"access-control-request-method">>),
+    is_allowed(Handler, http_method(Method), Route, Method).
+
+handle_options_request(Req, State, HandlerState, true) ->
+    handle_response({<<>>, HandlerState}, Req, State);
+handle_options_request(Req, State, _, false) ->
+    handle_request(not_allowed, Req, State).
+
 %% -----------------------------------------------------------------------------
 %% Handler:is_authenticated/3 and Handler:has_permission/3
 %% -----------------------------------------------------------------------------
@@ -299,10 +313,7 @@ handler_cross_domains(Handler, Route, Req, HandlerState) ->
                     F = cross_domains,
                     try Handler:F(Route, Req, HandlerState) of
                         {HostMatches, HandlerState1} ->
-                            Host = case http_uri:parse(binary_to_list(Origin)) of
-                                       {ok, {_, _, Host1, _, _, _}} -> Host1;
-                                       _ -> Origin
-                                   end,
+                            Host = leptus_utils:get_uri_authority(Origin),
                             case origin_matches(Host, HostMatches) of
                                 false ->
                                     {[], HandlerState1};
@@ -536,27 +547,3 @@ error_info(Class, Reason, Route, Req, State) ->
                            "** ~p~n",
                            [Class, self(), Route, Req, State,
                             {Reason, erlang:get_stacktrace()}]).
-
-%% -----------------------------------------------------------------------------
-%% print request date-time, requested URI, response status and content-length
-%% -----------------------------------------------------------------------------
--spec console_log(binary(), status_code(), non_neg_integer(), req()) -> ok.
-console_log(Method, Status, ContentLength, Req) ->
-    %% [%Y-%m-%d %H:%M:%S] "METHOD URL VERSION" STATUS CONTENT-LENGTH
-    {{Year, Month, Day}, {Hour, Min, Sec}} = erlang:localtime(),
-    Version = leptus_req:version(Req),
-    URI = leptus_req:uri(Req),
-    Color = status_color(Status),
-    io:format("~s[~w-~w-~w ~w:~w:~w] \"\~s ~s ~s\"\ ~w ~p\e[0m~n",
-              [Color, Year, Month, Day, Hour, Min, Sec, Method, URI, Version,
-               Status, ContentLength]).
-
-%% -----------------------------------------------------------------------------
-%% get terminal color escape code based on status code
-%% -----------------------------------------------------------------------------
--spec status_color(non_neg_integer()) -> string().
-status_color(N) when N >= 200, N < 300 -> "\e[32m"; %% green
-status_color(N) when N >= 300, N < 400 -> "\e[33m"; %% yellow
-status_color(N) when N >= 400, N < 500 -> "\e[31m"; %% red
-status_color(N) when N >= 500 -> "\e[1m\e[31m"; %% bold red
-status_color(_) -> "".
diff --git a/src/leptus_json.erl b/src/leptus_json.erl
index ff96027..d5215f1 100644
--- a/src/leptus_json.erl
+++ b/src/leptus_json.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
diff --git a/src/leptus_logger.erl b/src/leptus_logger.erl
new file mode 100644
index 0000000..b2682ab
--- /dev/null
+++ b/src/leptus_logger.erl
@@ -0,0 +1,136 @@
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
+%%
+%% Permission is hereby granted, free of charge, to any person obtaining a copy
+%% of this software and associated documentation files (the "Software"), to deal
+%% in the Software without restriction, including without limitation the rights
+%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+%% copies of the Software, and to permit persons to whom the Software is
+%% furnished to do so, subject to the following conditions:
+%%
+%% The above copyright notice and this permission notice shall be included in
+%% all copies or substantial portions of the Software.
+%%
+%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+%% THE SOFTWARE.
+
+-module(leptus_logger).
+
+-include("leptus_logger.hrl").
+
+%% -----------------------------------------------------------------------------
+%% API
+%% -----------------------------------------------------------------------------
+-export([add_handler/2]).
+-export([delete_handler/2]).
+-export([send_event/2]).
+-export([format/2]).
+
+-spec add_handler(atom() | {atom(), any()}, any()) ->
+                         ok | {'EXIT', any()} | any().
+add_handler(Mod, Args) ->
+    gen_event:add_handler(?LOGGER, Mod, Args).
+
+-spec delete_handler(atom() | {atom(), any()}, any()) ->
+                            any() | {error, module_not_found} | {'EXIT', any()}.
+delete_handler(Mod, Args) ->
+    gen_event:delete_handler(?LOGGER, Mod, Args).
+
+-spec send_event(atom(), log_data()) -> ok.
+send_event(Event, LogData) ->
+    gen_event:sync_notify(?LOGGER, {Event, LogData}).
+
+-spec format(string(), log_data()) -> string().
+format(Fmt, LogData) ->
+    %% e.g.
+    %% "~h ~l ~u ~t \"~r\" ~s ~B", LogData ->
+    %%   127.0.0.1 - - [11/Jun/2014:03:07:25 +0450] "GET /b?p=2 HTTP/1.1" 200 83
+    format(Fmt, LogData, []).
+
+%% -----------------------------------------------------------------------------
+%% internal
+%% -----------------------------------------------------------------------------
+-spec format(string(), log_data(), iolist()) -> string().
+format([], _, Acc) ->
+    lists:flatten(lists:reverse(Acc));
+format([$~, $h|Fmt], LD=#log_data{ip=IP}, Acc) ->
+    format(Fmt, LD, [inet_parse:ntoa(IP)|Acc]);
+format([$~, $l|Fmt], LD, Acc) ->
+    format(Fmt, LD, [$-|Acc]);
+format([$~, $u|Fmt], LD, Acc) ->
+    format(Fmt, LD, [$-|Acc]);
+format([$~, $t|Fmt], LD=#log_data{request_time=Datetime}, Acc) ->
+    format(Fmt, LD, [[$[, datetime(Datetime), $]]|Acc]);
+format([$~, $r|Fmt], LD=#log_data{method=M, uri=U, version=V}, Acc) ->
+    format(Fmt, LD, [[binary_to_list(M), $ ,
+                      binary_to_list(U), $ ,
+                      atom_to_list(V)]|Acc]);
+format([$~, $s|Fmt], LD=#log_data{status=S}, Acc) ->
+    format(Fmt, LD, [integer_to_list(S)|Acc]);
+format([$~, $b|Fmt], LD=#log_data{content_length=0}, Acc) ->
+    format(Fmt, LD, [$-|Acc]);
+format([$~, $b|Fmt], LD=#log_data{content_length=B}, Acc) ->
+    format(Fmt, LD, [integer_to_list(B)|Acc]);
+format([$~, $B|Fmt], LD=#log_data{content_length=B}, Acc) ->
+    format(Fmt, LD, [integer_to_list(B)|Acc]);
+format([$~, ${|Fmt], LD=#log_data{headers=Headers}, Acc) ->
+    {Name, Fmt1} = get_name(Fmt, []),
+    format(Fmt1, LD, [get_value(Name, Headers)|Acc]);
+format([H|Fmt], LD, Acc) ->
+    format(Fmt, LD, [H|Acc]).
+
+-spec get_name(string(), string()) -> {binary(), string()}.
+get_name([$}|Fmt], Acc) ->
+    {list_to_binary(lists:reverse(Acc)), Fmt};
+get_name([H|Fmt], Acc) ->
+    get_name(Fmt, [H|Acc]).
+
+-spec get_value(binary(), [{binary(), iodata()}]) -> list().
+get_value(K, Props) ->
+    case lists:keyfind(K, 1, Props) of
+        {K, V} -> binary_to_list(V);
+        _ -> "-"
+    end.
+
+-spec month(1..12) -> string().
+month(1) -> "Jan";
+month(2) -> "Feb";
+month(3) -> "Mar";
+month(4) -> "Apr";
+month(5) -> "May";
+month(6) -> "Jun";
+month(7) -> "Jul";
+month(8) -> "Aug";
+month(9) -> "Sep";
+month(10) -> "Oct";
+month(11) -> "Nov";
+month(12) -> "Dec".
+
+-spec timezone() -> io_lib:chars().
+timezone() ->
+    {DiffH, DiffM} = timezone(erlang:universaltime(), erlang:localtime()),
+    %% Ugly reformatting code to get times like +0000 and -1300
+    if DiffH < 0 ->
+            io_lib:format("-~2..0w~2..0w", [abs(DiffH), abs(DiffM)]);
+       true ->
+            io_lib:format("+~2..0w~2..0w", [DiffH, DiffM])
+    end.
+
+-spec timezone(calendar:datetime(), calendar:datetime()) ->
+                      {integer(), integer()}.
+timezone(UniversalTime, LocalTime) ->
+    DiffSecs = calendar:datetime_to_gregorian_seconds(LocalTime) -
+        calendar:datetime_to_gregorian_seconds(UniversalTime),
+    Mins = (DiffSecs / 60),
+    H = trunc(Mins / 60),
+    M =  trunc(Mins - (H * 60)),
+    {H, M}.
+
+-spec datetime(calendar:datetime()) -> string().
+datetime({{Y, M, D}, {H, Mi, S}}) ->
+    io_lib:format("~w/~s/~w:~2..0w:~2..0w:~2..0w ~s",
+                  [D, month(M), Y, H, Mi, S, timezone()]).
diff --git a/src/leptus_pt.erl b/src/leptus_pt.erl
index ebe1aa7..2b10a88 100644
--- a/src/leptus_pt.erl
+++ b/src/leptus_pt.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
diff --git a/src/leptus_req.erl b/src/leptus_req.erl
index be7d2cb..e45d116 100644
--- a/src/leptus_req.erl
+++ b/src/leptus_req.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
@@ -41,8 +39,10 @@
 -export([body_raw/1]).
 -export([body_qs/1]).
 -export([header/2]).
+-export([header/3]).
 -export([parse_header/2]).
 -export([auth/2]).
+-export([peer/1]).
 -export([reply/4]).
 -export([get_req/1]).
 -export([set_req/2]).
@@ -141,6 +141,10 @@ body_qs(Pid) ->
 header(Pid, Name) ->
     invoke(Pid, header, [Name]).
 
+-spec header(pid(), binary(), Default) -> binary() | Default when Default :: any().
+header(Pid, Name, Default) ->
+    invoke(Pid, header, [Name, Default]).
+
 -spec parse_header(pid(), binary()) -> any() | undefined | {error, any()}.
 parse_header(Pid, Name) ->
     invoke(Pid, parse_header, [Name, undefined]).
@@ -154,6 +158,10 @@ auth(Pid, basic) ->
             Value
     end.
 
+-spec peer(pid()) -> {inet:ip_address(), inet:port_number()}.
+peer(Pid) ->
+    invoke(Pid, peer, []).
+
 -spec reply(pid(), cowboy:http_status(), cowboy:http_headers(), iodata()) -> ok.
 reply(Pid, Status, Headers, Body) ->
     invoke(Pid, reply, [Status, Headers, Body]).
diff --git a/src/leptus_req_sup.erl b/src/leptus_req_sup.erl
index dc67270..1261bd4 100644
--- a/src/leptus_req_sup.erl
+++ b/src/leptus_req_sup.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
diff --git a/src/leptus_router.erl b/src/leptus_router.erl
index af359ae..1efe769 100644
--- a/src/leptus_router.erl
+++ b/src/leptus_router.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
diff --git a/src/leptus_stats.hrl b/src/leptus_stats.hrl
index ac015e5..3f19790 100644
--- a/src/leptus_stats.hrl
+++ b/src/leptus_stats.hrl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
diff --git a/src/leptus_sup.erl b/src/leptus_sup.erl
index e2cbd84..967da31 100644
--- a/src/leptus_sup.erl
+++ b/src/leptus_sup.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +24,8 @@
 -export([start_link/0]).
 -export([init/1]).
 
+-include("leptus_logger.hrl").
+
 %% -----------------------------------------------------------------------------
 %% API
 %% -----------------------------------------------------------------------------
@@ -36,12 +36,13 @@ start_link() ->
 %% supervisor callback
 %% -----------------------------------------------------------------------------
 init([]) ->
-    %% TODO: choose a better MaxRestarts in MaxTime
     {ok, {{one_for_one, 50, 10},
           [
            {leptus_config, {leptus_config, start_link, []},
             permanent, 5000, worker, [leptus_config]},
            {leptus_req_sup, {leptus_req_sup, start_link, []},
-            permanent, 5000, supervisor, [leptus_req_sup]}
+            permanent, 5000, supervisor, [leptus_req_sup]},
+           {leptus_logger, {gen_event, start_link, [{local, ?LOGGER}]},
+            permanent, 5000, worker, []}
           ]
          }}.
diff --git a/src/leptus_utils.erl b/src/leptus_utils.erl
index 5328323..d8c3d83 100644
--- a/src/leptus_utils.erl
+++ b/src/leptus_utils.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
@@ -31,6 +29,7 @@
 -export([listener_bucket/1]).
 -export([listener_handlers/1]).
 -export([print_listener_info/1]).
+-export([get_uri_authority/1]).
 
 -include("leptus_stats.hrl").
 
@@ -111,6 +110,9 @@ print_listener_info(Listener) ->
     io:fwrite("~.98c~n~n", [$=]),
     lists:foreach(F, Modules).
 
+get_uri_authority(URI) ->
+    get_uri_authority(URI, <<>>).
+
 %% -----------------------------------------------------------------------------
 %% internal
 %% -----------------------------------------------------------------------------
@@ -128,3 +130,14 @@ get_value(Key, Opts, Default) ->
         {_, Value} -> Value;
         _ -> Default
     end.
+
+get_uri_authority(<<>>, Acc) ->
+    Acc;
+get_uri_authority(<<$/, _/binary>>, Acc) ->
+    %% skip the rest
+    Acc;
+get_uri_authority(<<"://", Rest/binary>>, _) ->
+    %% skip scheme
+    get_uri_authority(Rest, <<>>);
+get_uri_authority(<<Char:1/binary, Rest/binary>>, Acc) ->
+    get_uri_authority(Rest, <<Acc/binary, Char/binary>>).
diff --git a/test/helpers.erl b/test/helpers.erl
index e0bcf5c..7fe16d8 100644
--- a/test/helpers.erl
+++ b/test/helpers.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
diff --git a/test/leptus_config_SUITE.erl b/test/leptus_config_SUITE.erl
index 1b59bd6..50f7a9c 100644
--- a/test/leptus_config_SUITE.erl
+++ b/test/leptus_config_SUITE.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
@@ -52,4 +50,5 @@ lookup(_) ->
     <<"1,2,3">> = leptus_config:lookup(t2),
     {port_num, 8080} = leptus_config:lookup(http1),
     {ip_addr, "127.0.0.1"} = leptus_config:lookup(http2),
-    [{port_num, 8080}, {ip_addr, "127.0.0.1"}] = leptus_config:lookup(http).
+    [{port_num, 8080}, {ip_addr, "127.0.0.1"}] = leptus_config:lookup(http),
+    ok.
diff --git a/test/leptus_handler_SUITE.erl b/test/leptus_handler_SUITE.erl
new file mode 100644
index 0000000..f51edd3
--- /dev/null
+++ b/test/leptus_handler_SUITE.erl
@@ -0,0 +1,67 @@
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
+%%
+%% Permission is hereby granted, free of charge, to any person obtaining a copy
+%% of this software and associated documentation files (the "Software"), to deal
+%% in the Software without restriction, including without limitation the rights
+%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+%% copies of the Software, and to permit persons to whom the Software is
+%% furnished to do so, subject to the following conditions:
+%%
+%% The above copyright notice and this permission notice shall be included in
+%% all copies or substantial portions of the Software.
+%%
+%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+%% THE SOFTWARE.
+
+-module(leptus_handler_SUITE).
+
+-export([all/0]).
+-export([join_methods/1]).
+-export([compile_host/1]).
+-export([origin_matches/1]).
+
+all() ->
+    [join_methods, compile_host, origin_matches].
+
+join_methods(_) ->
+    <<"GET, PUT">> = leptus_handler:join_http_methods([<<"GET">>, <<"PUT">>]),
+    <<"GET, PUT, POST, DELETE">> =
+        leptus_handler:join_http_methods([<<"GET">>, <<"PUT">>, <<"POST">>,
+                                          <<"DELETE">>]),
+    ok.
+
+compile_host(_) ->
+    ['_'] = leptus_handler:compile_host('_'),
+    [[<<"org">>, <<"example">>]] = leptus_handler:compile_host("example.org"),
+    [[<<"org">>, <<"example">>], [<<"org">>, <<"example">>, <<"www">>]] =
+        leptus_handler:compile_host(<<"[www.]example.org">>),
+    ok.
+
+origin_matches(_) ->
+    O1 = <<"example.org">>,
+    true = leptus_handler:origin_matches(O1, ['_']),
+    true = leptus_handler:origin_matches(O1, [<<"example.org">>]),
+    true = leptus_handler:origin_matches(O1, [<<"[...]example.org">>]),
+    true = leptus_handler:origin_matches(O1, [<<"example.[...]">>]),
+    true = leptus_handler:origin_matches(O1, [<<"www.example.org">>, <<"[www.]example.org">>]),
+    true = leptus_handler:origin_matches(O1, ["whatever.:_", "[...]:_"]),
+    false = leptus_handler:origin_matches(O1, [<<":subdomain.example.org">>]),
+    false = leptus_handler:origin_matches(O1, ["[www.]example.com", "example.com"]),
+    false = leptus_handler:origin_matches(O1, ["examplez[...]"]),
+
+    O2 = <<"sub.example.org">>,
+    true = leptus_handler:origin_matches(O2, ["sub.example.:_"]),
+    true = leptus_handler:origin_matches(O2, ["asdf.com", "123.org", "x.io", "sub.example.org"]),
+    true = leptus_handler:origin_matches(O2, ["[...]example.org"]),
+    false = leptus_handler:origin_matches(O2, ["www.example.org", "[www.]example.org"]),
+    false = leptus_handler:origin_matches(O2, ["whatever.:_"]),
+    false = leptus_handler:origin_matches(O2, [<<"subdomain.:[...]">>]),
+
+    true = leptus_handler:origin_matches(O1, ["[sub.]example.org"]),
+    true = leptus_handler:origin_matches(O2, ["[sub.]example.org"]),
+    ok.
diff --git a/test/leptus_http_SUITE.erl b/test/leptus_http_SUITE.erl
index 840feaa..d3f530b 100644
--- a/test/leptus_http_SUITE.erl
+++ b/test/leptus_http_SUITE.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
@@ -51,18 +49,23 @@ init_per_suite(Config) ->
                 {leptus_http4, []},
                 {leptus_http5, []}
                ],
-    {ok, _} = leptus:start_listener(http, [{'_', Handlers}], []),
+    Options = [{log_handlers, [{leptus_debug_log, default}]}],
+    {ok, _} = leptus:start_listener(http, [{'_', Handlers}], Options),
     Config.
 
 end_per_suite(_Config) ->
     ok = leptus:stop_listener(http).
 
 groups() ->
-    [{main, [parallel], [
-                         http_get, http_post, http_put, http_delete, http_404,
-                         http_405, http_is_authenticated, http_has_permission,
-                         http_msgpack
-                        ]}].
+    [{main, [parallel], [http_get,
+                         http_post,
+                         http_put,
+                         http_delete,
+                         http_404,
+                         http_405,
+                         http_is_authenticated,
+                         http_has_permission,
+                         http_msgpack]}].
 
 all() ->
     [{group, main}].
diff --git a/test/leptus_http_SUITE_data/leptus_http1.erl b/test/leptus_http_SUITE_data/leptus_http1.erl
index d00ad8f..b89382d 100644
--- a/test/leptus_http_SUITE_data/leptus_http1.erl
+++ b/test/leptus_http_SUITE_data/leptus_http1.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
@@ -21,21 +19,13 @@
 %% THE SOFTWARE.
 
 -module(leptus_http1).
+-compile({parse_transform, leptus_pt}).
 
 %% leptus callbacks
--export([routes/0]).
--export([allowed_methods/1]).
 -export([init/3]).
 -export([get/3]).
 -export([terminate/4]).
 
-routes() ->
-    ["/", "/hello", "/hello/:name"].
-
-allowed_methods("/") -> [<<"GET">>];
-allowed_methods("/hello") -> [<<"GET">>];
-allowed_methods("/hello/:name") -> [<<"GET">>].
-
 init(_Route, _Req, State) ->
     {ok, State}.
 
diff --git a/test/leptus_http_SUITE_data/leptus_http2.erl b/test/leptus_http_SUITE_data/leptus_http2.erl
index 9db0efe..dc9b278 100644
--- a/test/leptus_http_SUITE_data/leptus_http2.erl
+++ b/test/leptus_http_SUITE_data/leptus_http2.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
@@ -21,28 +19,20 @@
 %% THE SOFTWARE.
 
 -module(leptus_http2).
+-compile({parse_transform, leptus_pt}).
 
 %% leptus callbacks
--export([routes/0]).
 -export([init/3]).
 -export([is_authenticated/3]).
--export([allowed_methods/1]).
 -export([get/3]).
 -export([put/3]).
 -export([post/3]).
 -export([terminate/4]).
 
 
-routes() ->
-    ["/users/:id", "/users/:id/interests", "/users/:id/profile"].
-
 init(_Route, _Req, _State) ->
     {ok, blah}.
 
-allowed_methods("/users/:id") -> [<<"GET">>, <<"PUT">>, <<"POST">>];
-allowed_methods("/users/:id/interests") -> [<<"GET">>];
-allowed_methods("/users/:id/profile") -> [<<"GET">>].
-
 is_authenticated("/users/:id", Req, State) ->
     case leptus_req:method(Req) of
         <<"PUT">> ->
diff --git a/test/leptus_http_SUITE_data/leptus_http3.erl b/test/leptus_http_SUITE_data/leptus_http3.erl
index d061097..cf0aebb 100644
--- a/test/leptus_http_SUITE_data/leptus_http3.erl
+++ b/test/leptus_http_SUITE_data/leptus_http3.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
@@ -21,27 +19,19 @@
 %% THE SOFTWARE.
 
 -module(leptus_http3).
+-compile({parse_transform, leptus_pt}).
 
 %% leptus callbacks
--export([routes/0]).
 -export([init/3]).
--export([allowed_methods/1]).
 -export([post/3]).
 -export([put/3]).
 -export([delete/3]).
 -export([terminate/4]).
 
 
-routes() ->
-    ["/user/register", "/settings/change-password", "/users/:username/posts/:id"].
-
 init(_Route, _Req, _State) ->
     {ok, my_state}.
 
-allowed_methods("/user/register") -> [<<"POST">>];
-allowed_methods("/settings/change-password") -> [<<"PUT">>];
-allowed_methods(_) -> [<<"DELETE">>].
-
 post("/user/register", Req, State) ->
     Body = leptus_req:body_qs(Req),
     Username = proplists:get_value(<<"username">>, Body),
diff --git a/test/leptus_http_SUITE_data/leptus_http4.erl b/test/leptus_http_SUITE_data/leptus_http4.erl
index cc40163..8e01c5d 100644
--- a/test/leptus_http_SUITE_data/leptus_http4.erl
+++ b/test/leptus_http_SUITE_data/leptus_http4.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
@@ -21,15 +19,12 @@
 %% THE SOFTWARE.
 
 -module(leptus_http4).
+-compile({parse_transform, leptus_pt}).
 
--export([routes/0]).
--export([allowed_methods/1]).
 -export([init/3]).
 -export([get/3]).
 -export([terminate/4]).
 
-routes() -> ["/msgpack/:msg"].
-allowed_methods("/msgpack/:msg") -> [<<"GET">>].
 init(_Route, _Req, State) -> {ok, State}.
 
 get("/msgpack/:msg", Req, State) ->
diff --git a/test/leptus_http_SUITE_data/leptus_http5.erl b/test/leptus_http_SUITE_data/leptus_http5.erl
index d850b0b..056a1e0 100644
--- a/test/leptus_http_SUITE_data/leptus_http5.erl
+++ b/test/leptus_http_SUITE_data/leptus_http5.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
@@ -21,19 +19,14 @@
 %% THE SOFTWARE.
 
 -module(leptus_http5).
+-compile({parse_transform, leptus_pt}).
 
--export([routes/0]).
--export([allowed_methods/1]).
 -export([init/3]).
 -export([is_authenticated/3]).
 -export([has_permission/3]).
 -export([get/3]).
 -export([terminate/4]).
 
-routes() -> ["/needs-perm"].
-
-allowed_methods(_) -> [<<"GET">>].
-
 init(_Route, _Req, State) ->
     {ok, State}.
 
diff --git a/test/leptus_logger_SUITE.erl b/test/leptus_logger_SUITE.erl
new file mode 100644
index 0000000..ed9e54f
--- /dev/null
+++ b/test/leptus_logger_SUITE.erl
@@ -0,0 +1,48 @@
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
+%%
+%% Permission is hereby granted, free of charge, to any person obtaining a copy
+%% of this software and associated documentation files (the "Software"), to deal
+%% in the Software without restriction, including without limitation the rights
+%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+%% copies of the Software, and to permit persons to whom the Software is
+%% furnished to do so, subject to the following conditions:
+%%
+%% The above copyright notice and this permission notice shall be included in
+%% all copies or substantial portions of the Software.
+%%
+%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+%% THE SOFTWARE.
+
+-module(leptus_logger_SUITE).
+
+-export([all/0]).
+-export([datetime/1]).
+-export([format/1]).
+
+-include("leptus_logger.hrl").
+
+all() ->
+    [datetime, format].
+
+datetime(_) ->
+    Datetime = erlang:localtime(),
+    true = is_list(leptus_logger:datetime(Datetime)),
+    ok.
+
+format(_) ->
+    Fmt1 = "\"~r\" ~s ~B \"~{asdf}\" ok \"~{user-agent}\"!",
+    LD1 = #log_data{headers = [{<<"user-agent">>, <<"curl">>}]},
+    "\"GET / HTTP/1.1\" 200 0 \"-\" ok \"curl\"!" =
+        leptus_logger:format(Fmt1, LD1),
+
+    Fmt2 = "~h ~l ~u ~l \"~r\" ~s ~b",
+    LD2 = #log_data{ip = {127, 0, 0, 1}, uri = <<"/resource/a">>,
+                    method = <<"DELETE">>, status = 204},
+    "127.0.0.1 - - - \"DELETE /resource/a HTTP/1.1\" 204 -" =
+        leptus_logger:format(Fmt2, LD2),
+    ok.
diff --git a/test/leptus_pt_SUITE.erl b/test/leptus_pt_SUITE.erl
index 51ada1a..844441e 100644
--- a/test/leptus_pt_SUITE.erl
+++ b/test/leptus_pt_SUITE.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +38,8 @@ all() ->
 routes(_) ->
     ["/", "/hello", "/hello/:name"] = pt1:routes(),
     ["/1", "/2", "/3", "/4"] = pt2:routes(),
-    ["/", "/new", "/old"] = pt3:routes().
+    ["/", "/new", "/old"] = pt3:routes(),
+    ok.
 
 allowed_methods(_) ->
     [<<"GET">>] = pt1:allowed_methods("/"),
@@ -49,7 +48,8 @@ allowed_methods(_) ->
     [<<"GET">>, <<"POST">>] = pt2:allowed_methods("/1"),
     [<<"GET">>] = pt3:allowed_methods("/"),
     [<<"POST">>] = pt3:allowed_methods("/new"),
-    [<<"PUT">>, <<"DELETE">>] = pt3:allowed_methods("/old").
+    [<<"PUT">>, <<"DELETE">>] = pt3:allowed_methods("/old"),
+    ok.
 
 rq_pt(_) ->
     {ok, _} = pt3:start(),
diff --git a/test/leptus_pt_SUITE_data/pt1.erl b/test/leptus_pt_SUITE_data/pt1.erl
index 7337e72..237d4fb 100644
--- a/test/leptus_pt_SUITE_data/pt1.erl
+++ b/test/leptus_pt_SUITE_data/pt1.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
diff --git a/test/leptus_pt_SUITE_data/pt2.erl b/test/leptus_pt_SUITE_data/pt2.erl
index 7e959c1..0922bad 100644
--- a/test/leptus_pt_SUITE_data/pt2.erl
+++ b/test/leptus_pt_SUITE_data/pt2.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
diff --git a/test/leptus_pt_SUITE_data/pt3.erl b/test/leptus_pt_SUITE_data/pt3.erl
index 136cca8..0b4969f 100644
--- a/test/leptus_pt_SUITE_data/pt3.erl
+++ b/test/leptus_pt_SUITE_data/pt3.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
diff --git a/test/leptus_req_SUITE.erl b/test/leptus_req_SUITE.erl
index d0d192e..49dd892 100644
--- a/test/leptus_req_SUITE.erl
+++ b/test/leptus_req_SUITE.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
@@ -66,11 +64,21 @@ end_per_testcase(_, Config) ->
     Config.
 
 groups() ->
-    [{main, [parallel], [
-                         param, params, qs, qs_val, uri, version, body, body_raw,
-                         body_qs, header, parse_header, auth, method, get_req,
-                         set_req
-                        ]}].
+    [{main, [parallel], [param,
+                         params,
+                         qs,
+                         qs_val,
+                         uri,
+                         version,
+                         body,
+                         body_raw,
+                         body_qs,
+                         header,
+                         parse_header,
+                         auth,
+                         method,
+                         get_req,
+                         set_req]}].
 
 all() ->
     [{group, main}].
@@ -82,19 +90,22 @@ param(Config) ->
     <<"leptus">> = leptus_req:param(Req1, name),
     true = undefined =:= leptus_req:param(Req1, idz),
     <<"97dba1">> = leptus_req:param(Req1, id),
-    undefined = leptus_req:param(Req2, id).
+    undefined = leptus_req:param(Req2, id),
+    ok.
 
 params(Config) ->
     Req1 = ?config(req1, Config),
     Req2 = ?config(req2, Config),
     [{name, <<"leptus">>}, {id, <<"97dba1">>}] = leptus_req:params(Req1),
-    [] = leptus_req:params(Req2).
+    [] = leptus_req:params(Req2),
+    ok.
 
 qs(Config) ->
     Req1 = ?config(req1, Config),
     Req2 = ?config(req2, Config),
     <<>> = leptus_req:qs(Req1),
-    <<"q=123&b=456">> = leptus_req:qs(Req2).
+    <<"q=123&b=456">> = leptus_req:qs(Req2),
+    ok.
 
 qs_val(Config) ->
     Req1 = ?config(req1, Config),
@@ -102,19 +113,22 @@ qs_val(Config) ->
     undefined = leptus_req:qs_val(Req1, <<"p">>),
     undefined = leptus_req:qs_val(Req2, <<"p">>),
     <<"123">> = leptus_req:qs_val(Req2, <<"q">>),
-    <<"456">> = leptus_req:qs_val(Req2, <<"b">>).
+    <<"456">> = leptus_req:qs_val(Req2, <<"b">>),
+    ok.
 
 uri(Config) ->
     Req1 = ?config(req1, Config),
     Req2 = ?config(req2, Config),
     <<"/hello/leptus/97dba1">> = leptus_req:uri(Req1),
-    <<"/hello/leptus/97dba1?q=123&b=456">> = leptus_req:uri(Req2).
+    <<"/hello/leptus/97dba1?q=123&b=456">> = leptus_req:uri(Req2),
+    ok.
 
 version(Config) ->
     Req1 = ?config(req1, Config),
     Req2 = ?config(req2, Config),
     'HTTP/1.1' = leptus_req:version(Req1),
-    'HTTP/1.1' = leptus_req:version(Req2).
+    'HTTP/1.1' = leptus_req:version(Req2),
+    ok.
 
 body(Config) ->
     Req1 = ?config(req1, Config),
@@ -135,7 +149,8 @@ body(Config) ->
     [
      {<<"abc">>, 123},
      {456, <<"def">>}
-    ] = leptus_req:body(Req7).
+    ] = leptus_req:body(Req7),
+    ok.
 
 body_raw(Config) ->
     Req1 = ?config(req1, Config),
@@ -144,7 +159,8 @@ body_raw(Config) ->
     <<>> = leptus_req:body_raw(Req1),
     <<"AAAAAAAAAAA">> = leptus_req:body_raw(Req3),
     <<"{\"firstname\": \"Sina\","
-      " \"lastname\": \"Samavati\"}">> = leptus_req:body_raw(Req5).
+      " \"lastname\": \"Samavati\"}">> = leptus_req:body_raw(Req5),
+    ok.
 
 body_qs(Config) ->
     Req1 = ?config(req1, Config),
@@ -155,7 +171,8 @@ body_qs(Config) ->
     [
      {<<"firstname">>, <<"Sina">>},
      {<<"lastname">>, <<"Samavati">>}
-    ] = leptus_req:body_qs(Req4).
+    ] = leptus_req:body_qs(Req4),
+    ok.
 
 header(Config) ->
     Req1 = ?config(req1, Config),
@@ -164,7 +181,8 @@ header(Config) ->
     undefined = leptus_req:header(Req1, <<"content-type">>),
     <<"localhost:8080">> = leptus_req:header(Req2, <<"host">>),
     <<"application/x-www-form-urlencoded">> =
-        leptus_req:header(Req3, <<"content-type">>).
+        leptus_req:header(Req3, <<"content-type">>),
+    ok.
 
 parse_header(Config) ->
     Req1 = ?config(req1, Config),
@@ -178,7 +196,8 @@ parse_header(Config) ->
     } = leptus_req:parse_header(Req3, <<"content-type">>),
     {
       <<"application">>, <<"json">>, []
-    } = leptus_req:parse_header(Req5, <<"content-type">>).
+    } = leptus_req:parse_header(Req5, <<"content-type">>),
+    ok.
 
 auth(Config) ->
     Req1 = ?config(req1, Config),
@@ -188,7 +207,8 @@ auth(Config) ->
     undefined = leptus_req:auth(Req1, basic),
     undefined = leptus_req:auth(Req3, basic),
     {<<"123">>, <<"456">>} = leptus_req:auth(Req5, basic),
-    {error, badarg} = leptus_req:auth(Req6, basic).
+    {error, badarg} = leptus_req:auth(Req6, basic),
+    ok.
 
 method(Config) ->
     Req1 = ?config(req1, Config),
@@ -198,16 +218,19 @@ method(Config) ->
     <<"GET">> = leptus_req:method(Req1),
     <<"GET">> = leptus_req:method(Req2),
     <<"POST">> = leptus_req:method(Req3),
-    <<"POST">> = leptus_req:method(Req4).
+    <<"POST">> = leptus_req:method(Req4),
+    ok.
 
 get_req(Config) ->
     Req1 = ?config(req1, Config),
-    true = (req1() =:= leptus_req:get_req(Req1)).
+    true = (req1() =:= leptus_req:get_req(Req1)),
+    ok.
 
 set_req(Config) ->
     Req1 = ?config(req1, Config),
     ok = leptus_req:set_req(Req1, empty),
-    empty = leptus_req:get_req(Req1).
+    empty = leptus_req:get_req(Req1),
+    ok.
 
 
 req1() ->
diff --git a/test/leptus_router_SUITE.erl b/test/leptus_router_SUITE.erl
index a0f5bf7..2425ac0 100644
--- a/test/leptus_router_SUITE.erl
+++ b/test/leptus_router_SUITE.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
@@ -71,7 +69,8 @@ paths(_) ->
      }] = leptus_router:paths([{'_', [{leptus_routes1, []},
                                       {leptus_routes2, aha},
                                       {leptus_routes3, i_see},
-                                      {leptus_routes4, undefined}]}]).
+                                      {leptus_routes4, undefined}]}]),
+    ok.
 
 sort_dispatch(_) ->
     Routes = [
@@ -114,7 +113,8 @@ sort_dispatch(_) ->
        {[a, b, c], [], handler, undefined},
        {[a, b, <<"x">>, d], [], handler, undefined},
        {[a, <<"x">>, c, d], [], handler, undefined}
-      ]}] = leptus_router:sort_dispatch(Dispatch1).
+      ]}] = leptus_router:sort_dispatch(Dispatch1),
+    ok.
 
 static_file_routes(Conf) ->
     Dir = filename:join(?config(data_dir, Conf), "www"),
@@ -124,4 +124,5 @@ static_file_routes(Conf) ->
             {"/", cowboy_static, {file, Index}},
             {"/index.html", cowboy_static, {file, Index}},
             {"/static/css/style.css", cowboy_static, {file, Style}}
-           ]}] = leptus_router:static_file_routes({'_', Dir}).
+           ]}] = leptus_router:static_file_routes({'_', Dir}),
+    ok.
diff --git a/test/leptus_router_SUITE_data/leptus_routes1.erl b/test/leptus_router_SUITE_data/leptus_routes1.erl
index ac92bc8..03844aa 100644
--- a/test/leptus_router_SUITE_data/leptus_routes1.erl
+++ b/test/leptus_router_SUITE_data/leptus_routes1.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
diff --git a/test/leptus_router_SUITE_data/leptus_routes2.erl b/test/leptus_router_SUITE_data/leptus_routes2.erl
index 99f0c0b..b0fc4a1 100644
--- a/test/leptus_router_SUITE_data/leptus_routes2.erl
+++ b/test/leptus_router_SUITE_data/leptus_routes2.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
diff --git a/test/leptus_router_SUITE_data/leptus_routes3.erl b/test/leptus_router_SUITE_data/leptus_routes3.erl
index a1f34a0..e9af74e 100644
--- a/test/leptus_router_SUITE_data/leptus_routes3.erl
+++ b/test/leptus_router_SUITE_data/leptus_routes3.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
diff --git a/test/leptus_router_SUITE_data/leptus_routes4.erl b/test/leptus_router_SUITE_data/leptus_routes4.erl
index 652f60e..bf34779 100644
--- a/test/leptus_router_SUITE_data/leptus_routes4.erl
+++ b/test/leptus_router_SUITE_data/leptus_routes4.erl
@@ -1,6 +1,4 @@
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
diff --git a/test/leptus_utils_SUITE.erl b/test/leptus_utils_SUITE.erl
new file mode 100644
index 0000000..e907917
--- /dev/null
+++ b/test/leptus_utils_SUITE.erl
@@ -0,0 +1,62 @@
+%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
+%%
+%% Permission is hereby granted, free of charge, to any person obtaining a copy
+%% of this software and associated documentation files (the "Software"), to deal
+%% in the Software without restriction, including without limitation the rights
+%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+%% copies of the Software, and to permit persons to whom the Software is
+%% furnished to do so, subject to the following conditions:
+%%
+%% The above copyright notice and this permission notice shall be included in
+%% all copies or substantial portions of the Software.
+%%
+%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+%% THE SOFTWARE.
+
+-module(leptus_utils_SUITE).
+
+-export([all/0]).
+-export([get_uri_authority/1]).
+
+all() ->
+    [get_uri_authority].
+
+get_uri_authority(_Config) ->
+    <<"example.com">> =
+        leptus_utils:get_uri_authority(<<"example.com">>),
+
+    <<"example.com">> =
+        leptus_utils:get_uri_authority(<<"example.com/">>),
+
+    <<"example.com">> =
+        leptus_utils:get_uri_authority(<<"http://example.com">>),
+
+    <<"example.com">> =
+        leptus_utils:get_uri_authority(<<"http://example.com/a/b/">>),
+
+    <<"example.com">> =
+        leptus_utils:get_uri_authority(<<"example.com/a/b/">>),
+
+    <<"example.com:123">> =
+        leptus_utils:get_uri_authority(<<"example.com:123/a/b/">>),
+
+    <<"u:p@example.com:123">> =
+        leptus_utils:get_uri_authority(<<"u:p@example.com:123/a/b/">>),
+
+    <<"example">> =
+        leptus_utils:get_uri_authority(<<"scheme://example">>),
+
+    <<"example">> =
+        leptus_utils:get_uri_authority(<<"scheme://example/">>),
+
+    <<"example">> =
+        leptus_utils:get_uri_authority(<<"://example/">>),
+
+    <<"example:123">> =
+        leptus_utils:get_uri_authority(<<"scheme://example:123/a/b/">>),
+    ok.

Places

File leptus-0.4.2-git.patch of Package leptus (Revision 659694497e730d8f97464590e0f87fc0)

Places