Simplified interface of "router" library classes

library/server/request/rest/src/rest_request_handler.e

@@ -15,32 +15,74 @@ inherit
 
 feature -- Access
 
-	authentication_required: BOOLEAN
+	authentication_required (req: WGI_REQUEST): BOOLEAN
 			-- Is authentication required
 			-- might depend on the request environment
 			-- or the associated resources
 		deferred
 		end
 
+	description: detachable STRING
+			-- Optional descriptiong		
+
+feature -- Element change
+
+	set_description (s: like description)
+			-- Set `description' to `s'
+		do
+			description := s
+		end
+
 feature -- Execution
 
-	execute (a_hdl_context: C; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
+	execute (ctx: C; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
 			-- Execute request handler	
+		local
+			rescued: BOOLEAN
 		do
-			if authentication_required and then not a_hdl_context.authenticated then
-				execute_unauthorized (a_hdl_context, req, res)
+			if not rescued then
+				if request_method_name_supported (req.request_method) then
+					if authentication_required (req) and then not ctx.authenticated then
+						execute_unauthorized (ctx, req, res)
+					else
+						pre_execute (ctx, req, res)
+						execute_application (ctx, req, res)
+						post_execute (ctx, req, res)
+					end
+				else
+					execute_request_method_not_allowed (req, res, supported_request_method_names)
+				end
 			else
-				Precursor (a_hdl_context, req, res)
+				rescue_execute (ctx, req, res)
 			end
+		rescue
+			rescued := True
+			retry
 		end
 
-	execute_unauthorized (a_hdl_context: C; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
+	execute_application (ctx: C; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
+		deferred
+		end
+
+	pre_execute (ctx: C; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
+		do
+		end
+
+	post_execute (ctx: C; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
+		do
+		end
+
+	rescue_execute (ctx: C; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
+		do
+			post_execute (ctx, req, res)
+		end
+
+	execute_unauthorized (ctx: C; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
 		do
 			res.set_status_code ({HTTP_STATUS_CODE}.unauthorized)
-			res.write_header ({HTTP_STATUS_CODE}.unauthorized, <<["WWW-Authenticate", "Basic realm=%"Eiffel auth%""]>>)
+			res.write_header ({HTTP_STATUS_CODE}.unauthorized, Void)
 			res.write_string ("Unauthorized")
 		end
-
 feature {NONE} -- Implementation
 
 	supported_formats: INTEGER
@@ -152,6 +194,116 @@ feature -- Element change: formats
 			supported_formats := supported_formats | f
 		end
 
+feature {NONE} -- Implementation
+
+	supported_request_methods: INTEGER
+			-- Support request method such as GET, POST, ...
+
+feature {NONE} -- Status report
+
+	request_method_id_supported (a_id: INTEGER): BOOLEAN
+		do
+			Result := (supported_request_methods & a_id) = a_id
+		end
+
+	request_method_name_supported (n: STRING): BOOLEAN
+			-- Is request method `n' supported?
+		do
+			Result := request_method_id_supported (request_method_constants.method_id (n))
+		end
+
+	request_method_constants: HTTP_REQUEST_METHOD_CONSTANTS
+		once
+			create Result
+		end
+
+feature -- Status report
+
+	supported_request_method_names: LIST [STRING]
+			-- Support request method such as GET, POST, ...
+		do
+			create {LINKED_LIST [STRING]} Result.make
+			if method_get_supported then
+				Result.extend (request_method_constants.method_get_name)
+			end
+			if method_post_supported then
+				Result.extend (request_method_constants.method_post_name)
+			end
+			if method_put_supported then
+				Result.extend (request_method_constants.method_put_name)
+			end
+			if method_delete_supported then
+				Result.extend (request_method_constants.method_delete_name)
+			end
+			if method_head_supported then
+				Result.extend (request_method_constants.method_head_name)
+			end
+		end
+
+	method_get_supported: BOOLEAN
+		do
+			Result := request_method_id_supported ({HTTP_REQUEST_METHOD_CONSTANTS}.method_get)
+		end
+
+	method_post_supported: BOOLEAN
+		do
+			Result := request_method_id_supported ({HTTP_REQUEST_METHOD_CONSTANTS}.method_post)
+		end
+
+	method_put_supported: BOOLEAN
+		do
+			Result := request_method_id_supported ({HTTP_REQUEST_METHOD_CONSTANTS}.method_put)
+		end
+
+	method_delete_supported: BOOLEAN
+		do
+			Result := request_method_id_supported ({HTTP_REQUEST_METHOD_CONSTANTS}.method_delete)
+		end
+
+	method_head_supported: BOOLEAN
+		do
+			Result := request_method_id_supported ({HTTP_REQUEST_METHOD_CONSTANTS}.method_head)
+		end
+
+feature -- Element change: request methods		
+
+	reset_supported_request_methods
+		do
+			supported_request_methods := 0
+		end
+
+	enable_request_method_get
+		do
+			enable_request_method ({HTTP_REQUEST_METHOD_CONSTANTS}.method_get)
+		end
+
+	enable_request_method_post
+		do
+			enable_request_method ({HTTP_REQUEST_METHOD_CONSTANTS}.method_post)
+		end
+
+	enable_request_method_put
+		do
+			enable_request_method ({HTTP_REQUEST_METHOD_CONSTANTS}.method_put)
+		end
+
+	enable_request_method_delete
+		do
+			enable_request_method ({HTTP_REQUEST_METHOD_CONSTANTS}.method_delete)
+		end
+
+	enable_request_method_head
+		do
+			enable_request_method ({HTTP_REQUEST_METHOD_CONSTANTS}.method_head)
+		end
+
+	enable_request_method (m: INTEGER)
+		do
+			supported_request_methods := supported_request_methods | m
+		end
+
+
+
 note
 	copyright: "Copyright (c) 1984-2011, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"