Merge branch 'master' of github.com:EiffelWebFramework/EWF

library/server/wsf/extension/wsf_method_handlers.e

@@ -24,7 +24,12 @@ inherit
 
 	WSF_METHOD_HANDLER
 		rename
-			do_method as do_put
+			do_method as do_post
+		end
+
+	WSF_METHOD_HANDLER
+		rename
+			do_method as do_delete
 		end
 
 	WSF_METHOD_HANDLER

library/server/wsf/router/documentation/wsf_router_self_documentation_handler.e

@@ -26,14 +26,27 @@ create
 feature {NONE} -- Initialization
 
 	make (a_router: WSF_ROUTER)
+			-- Initialize `router'.
+		require
+			a_router_attached: a_router /= Void
 		do
 			router := a_router
+		ensure
+			router_aliased: router = a_router
+			not_hidden: not is_hidden
 		end
 
 	make_hidden (a_router: WSF_ROUTER)
+			-- Initialize `router'.
+			-- Do not display documentation for `a_router'.
+		require
+			a_router_attached: a_router /= Void
 		do
 			make (a_router)
 			is_hidden := True
+		ensure
+			router_aliased: router = a_router
+			hidden: is_hidden	
 		end
 
 	router: WSF_ROUTER
@@ -46,6 +59,7 @@ feature {NONE} -- Initialization
 feature -- Documentation
 
 	mapping_documentation (m: WSF_ROUTER_MAPPING; a_request_methods: detachable WSF_REQUEST_METHODS): WSF_ROUTER_MAPPING_DOCUMENTATION
+			-- <Precursor>
 		do
 			create Result.make (m)
 			Result.set_is_hidden (is_hidden)
@@ -76,4 +90,8 @@ feature -- Execution
 			res.send (m)
 		end
 
+invariant
+
+	router_attached: router /= Void
+
 end

library/server/wsf/router/documentation/wsf_self_documented_handler.e

@@ -12,7 +12,12 @@ feature -- Documentation
 	mapping_documentation (m: WSF_ROUTER_MAPPING; a_request_methods: detachable WSF_REQUEST_METHODS): WSF_ROUTER_MAPPING_DOCUMENTATION
 			-- Documentation associated with Current handler, in the context of the mapping `m' and methods `a_request_methods'.
 			--| `m' and `a_request_methods' are useful to produce specific documentation when the handler is used for multiple mapping.
+		require
+			m_attached: m /= Void
+			a_request_methods_attached: a_request_methods /= Void
 		deferred
+		ensure
+			mapping_documentation_attached: Result /= Void
 		end
 
 end

library/server/wsf/router/support/starts_with/wsf_starts_with_handler.e

@@ -15,12 +15,19 @@ inherit
 feature -- Execution
 
 	execute (a_start_path: READABLE_STRING_8; req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Handle `req' responding into `res'.
+		require
+			a_start_path_attached: a_start_path /= Void
+			req_attached: req /= Void
+			res_attached: res /= Void
+			path_start_with_a_start_path: req.path_info.starts_with (a_start_path)
 		deferred
 		end
 
 feature {WSF_ROUTER} -- Mapping
 
 	new_mapping (a_uri: READABLE_STRING_8): WSF_ROUTER_MAPPING
+			-- <Precursor>
 		do
 			create {WSF_STARTS_WITH_MAPPING} Result.make (a_uri, Current)
 		end

library/server/wsf/router/support/starts_with/wsf_starts_with_mapping_i.e

@@ -33,7 +33,12 @@ feature -- Access
 feature -- Change
 
 	set_handler	(h: like handler)
+			-- Set `handler' to `h'.
+		require
+			h_attached: h /= Void
 		deferred
+		ensure
+			h_aliased: handler = h
 		end
 
 feature -- Documentation
@@ -72,14 +77,23 @@ feature -- Status
 feature {NONE} -- Execution
 
 	execute_handler (h: like handler; a_start_path: like uri; req: WSF_REQUEST; res: WSF_RESPONSE)
-			-- Execute handler `h' with `req' and `res' for Current mapping
+			-- Execute handler `h' with `req' and `res' for Current mapping.
+		require
+			h_attached: h /= Void
+			a_start_path_attached: a_start_path /= Void
+			req_attached: req /= Void
+			res_attached: res /= Void
+			path_start_with_a_start_path: req.path_info.starts_with (a_start_path)
 		deferred
 		end
 
 feature {NONE} -- Implementation
 
 	based_uri (a_uri: like uri; a_router: WSF_ROUTER): like uri
-			-- `uri' prefixed by the `WSF_ROUTER.base_url' if any
+			-- `a_uri' prefixed by the `WSF_ROUTER.base_url' if any
+		require
+			a_uri_attached: a_uri /= Void
+			a_router_attached: a_router /= Void
 		local
 			s: STRING_8
 		do
@@ -90,8 +104,14 @@ feature {NONE} -- Implementation
 			else
 				Result := a_uri
 			end
+		ensure
+			based_uri_attached: Result /= Void
 		end
 
+invariant
+
+	uri_attached: uri /= Void
+
 note
 	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"

library/server/wsf/router/wsf_handler.e

@@ -11,6 +11,8 @@ feature -- Status report
 
 	is_valid_context (req: WSF_REQUEST): BOOLEAN
 			-- Is `req' valid context for current handler?
+		require
+			req_attached: req /= Void
 		do
 			Result := True
 		end
@@ -19,6 +21,8 @@ feature {WSF_ROUTER} -- Mapping
 
 	on_mapped (a_mapping: WSF_ROUTER_MAPPING; a_rqst_methods: detachable WSF_REQUEST_METHODS)
 			-- Callback called when a router map a route to Current handler
+		require
+			a_mapping_attached: a_mapping /= Void
 		do
 		end