backup/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added debug clause to detect in WSF_ROUTER.map_with_request_methods the existing conflicts with similar mapping.

Browse Source 
Added smart handling of HEAD request.
Exported some internal features of WSF_REQUEST and WSF_RESPONSE to respectively WSF_REQUEST_EXPORTER and WSF_RESPONSE_EXPORTER
This commit is contained in:
Jocelyn Fiat
2012-11-26 22:58:48 +01:00
parent bdee22f647
commit 125d44ff67
9 changed files with 213 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
library/server/wsf/router/wsf_router.e
View File

@@ -1,6 +1,10 @@
note
description: "Summary description for {EWF_ROUTER}."
author: ""
description: "[
URL dispatching of request
Map a route to an handler according to the request method and path
]"
date: "$Date$"
revision: "$Revision$"
@@ -10,6 +14,8 @@ class
inherit
ITERABLE [WSF_ROUTER_ITEM]
WSF_REQUEST_EXPORTER
create
make,
make_with_base_url
@@ -53,6 +59,17 @@ feature -- Mapping
map_with_request_methods (a_mapping: WSF_ROUTER_MAPPING; rqst_methods: detachable WSF_ROUTER_METHODS)
-- Map `a_mapping' for request methods `rqst_methods'
do
debug ("router")
-- Display conflict in mapping
if has_item_associated_with_resource (a_mapping.associated_resource, rqst_methods) then
io.error.put_string ("Mapping: " + a_mapping.debug_output + ": conflict with existing mapping")
if attached item_associated_with_resource (a_mapping.associated_resource, rqst_methods) as l_conflicted then
io.error.put_string (": " + l_conflicted.debug_output)
end
io.error.put_string ("%N")
end
end
mappings.extend (create {WSF_ROUTER_ITEM}.make_with_request_methods (a_mapping, rqst_methods))
a_mapping.handler.on_mapped (a_mapping, rqst_methods)
end
@@ -92,10 +109,28 @@ feature -- Access
-- And return the associated handler if mapping found and handler executed.
local
l_req_method: READABLE_STRING_8
head_res: WSF_HEAD_RESPONSE_WRAPPER
do
l_req_method := request_method (req)
is_dispatched := False
Result := dispatch_and_return_handler_for_request_method (req, res, l_req_method)
if Result = Void and l_req_method = {HTTP_REQUEST_METHODS}.method_head then
check is_not_dispatched: not is_dispatched end
create head_res.make_from_response (res)
req.set_request_method ({HTTP_REQUEST_METHODS}.method_GET)
Result := dispatch_and_return_handler_for_request_method (req, head_res, {HTTP_REQUEST_METHODS}.method_GET)
end
end
feature {NONE} -- Dispatch implementation
dispatch_and_return_handler_for_request_method (req: WSF_REQUEST; res: WSF_RESPONSE; a_request_method: READABLE_STRING_8): detachable WSF_HANDLER
-- Dispatch request `req' among the `mappings'
-- And return the associated handler if mapping found and handler executed.
local
m: WSF_ROUTER_MAPPING
do
is_dispatched := False
l_req_method := request_method (req)
across
mappings as c
@@ -103,7 +138,7 @@ feature -- Access
Result /= Void
loop
if attached c.item as l_info then
if is_matching_request_methods (l_req_method, l_info.request_methods) then
if is_matching_request_methods (a_request_method, l_info.request_methods) then
m := l_info.mapping
if attached m.routed_handler (req, res, Current) as r then
is_dispatched := True