From a3037832048fba199f1812b6471dcf1171ca4648 Mon Sep 17 00:00:00 2001
From: Colin Adams <colinpauladams@gmail.com>
Date: Fri, 15 Mar 2013 14:06:37 +0000
Subject: [PATCH] Fifth round of contracts for non-Void-safe users

---
 .../wsf/extension/wsf_method_handlers.e       |  7 +++++-
 .../starts_with/wsf_starts_with_handler.e     |  7 ++++++
 .../starts_with/wsf_starts_with_mapping_i.e   | 24 +++++++++++++++++--
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/library/server/wsf/extension/wsf_method_handlers.e b/library/server/wsf/extension/wsf_method_handlers.e
index 06e828c1..b786a31e 100644
--- a/library/server/wsf/extension/wsf_method_handlers.e
+++ b/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
diff --git a/library/server/wsf/router/support/starts_with/wsf_starts_with_handler.e b/library/server/wsf/router/support/starts_with/wsf_starts_with_handler.e
index 98621841..b1d6d422 100644
--- a/library/server/wsf/router/support/starts_with/wsf_starts_with_handler.e
+++ b/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
diff --git a/library/server/wsf/router/support/starts_with/wsf_starts_with_mapping_i.e b/library/server/wsf/router/support/starts_with/wsf_starts_with_mapping_i.e
index 6346e9dc..7618171c 100644
--- a/library/server/wsf/router/support/starts_with/wsf_starts_with_mapping_i.e
+++ b/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)"