Merge remote-tracking branch 'jocelynEWF/master'

2011-09-08 07:44:27 -03:00
parent ef85c07603 10db3c28a5
commit 7bd5cdc232
73 changed files with 1475 additions and 2373 deletions
--- a/examples/hello_routed_world/hello-safe.ecf
+++ b/examples/hello_routed_world/hello-safe.ecf
@@ -8,16 +8,17 @@
 			<exclude>/\.svn$</exclude>
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
+			<assertions precondition="true" postcondition="true" invariant="true" supplier_precondition="true"/>
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="default_nino" location="..\..\library\server\ewsgi\default\ewsgi_nino-safe.ecf" readonly="false"/>
 		<library name="connector_nino" location="..\..\library\server\ewsgi\connectors\nino\nino-safe.ecf" readonly="false"/>
+		<library name="default_nino" location="..\..\library\server\ewsgi\default\ewsgi_nino-safe.ecf" readonly="false"/>
+		<library name="encoder" location="..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<library name="ewsgi" location="..\..\library\server\ewsgi\ewsgi-safe.ecf" readonly="false"/>
+		<library name="http" location="..\..\library\protocol\http\http-safe.ecf" readonly="false"/>
 		<library name="router" location="..\..\library\server\request\router\router-safe.ecf" readonly="false"/>
 		<library name="uri_template" location="..\..\library\protocol\uri_template\uri_template-safe.ecf" readonly="false"/>
-		<library name="encoder" location="..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
-		<library name="http" location="..\..\library\protocol\http\http-safe.ecf" readonly="false"/>
 		<cluster name="src" location="src\" recursive="true"/>
 	</target>
 </system>
--- a/examples/hello_routed_world/src/framework/routed_application_helper.e
+++ b/examples/hello_routed_world/src/framework/routed_application_helper.e
@@ -17,11 +17,11 @@ inherit

 feature -- Helper

-	execute_content_type_not_allowed (req: EWSGI_REQUEST; res: EWSGI_RESPONSE_BUFFER; a_content_types: detachable ARRAY [STRING]; a_uri_formats: detachable ARRAY [STRING])
+	execute_content_type_not_allowed (req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER; a_content_types: detachable ARRAY [STRING]; a_uri_formats: detachable ARRAY [STRING])
 		local
 			s, uri_s: detachable STRING
 			i, n: INTEGER
-			h: GW_HEADER
+			h: EWF_HEADER
 		do
 			create h.make
 			h.put_status ({HTTP_STATUS_CODE}.unsupported_media_type)
@@ -60,6 +60,8 @@ feature -- Helper
 					i := i + 1
 				end
 			end
+			res.set_status_code ({HTTP_STATUS_CODE}.unsupported_media_type)
+			res.write_headers_string (h.string)
 			if s /= Void then
 				res.write_string ("Unsupported request content-type, Accept: " + s + "%N")
 			end
@@ -68,7 +70,7 @@ feature -- Helper
 			end
 		end

-	execute_method_not_allowed (req: EWSGI_REQUEST; res: EWSGI_RESPONSE_BUFFER; a_methods: ARRAY [STRING])
+	execute_method_not_allowed (req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER; a_methods: ARRAY [STRING])
 		local
 			s: STRING
 			i, n: INTEGER
@@ -114,7 +116,7 @@ feature -- Context helper
 			end
 		end

-	content_type_to_request_format (a_content_type: detachable STRING): detachable STRING
+	content_type_to_request_format (a_content_type: detachable READABLE_STRING_8): detachable STRING
 			-- `a_content_type' converted into a request format name
 		do
 			if a_content_type /= Void then
--- a/examples/hello_routed_world/src/hello_routed_world.e
+++ b/examples/hello_routed_world/src/hello_routed_world.e
@@ -14,7 +14,7 @@ inherit

 	ROUTED_APPLICATION_HELPER

-	DEFAULT_EWSGI_APPLICATION
+	DEFAULT_WGI_APPLICATION

 create
 	make
@@ -30,6 +30,11 @@ feature {NONE} -- Initialization

 	create_router
 		do
+			debug
+				create {REQUEST_URI_ROUTER} router.make (5)
+				create {REQUEST_URI_TEMPLATE_ROUTER} router.make (5)
+			end
+
 --			create {REQUEST_URI_ROUTER} router.make (5)
 			create {REQUEST_URI_TEMPLATE_ROUTER} router.make (5)
 		end
@@ -48,13 +53,19 @@ feature {NONE} -- Initialization
 			create ra.make (agent handle_anonymous_hello)
 			router.map ("/hello", ra)
 			router.map ("/hello.{format}", ra)
+
+			router.map_agent_with_request_methods ("/method/any", agent handle_method_any, Void)
+			router.map_agent_with_request_methods ("/method/guess", agent handle_method_get_or_post, <<"GET", "POST">>)
+			router.map_agent_with_request_methods ("/method/custom", agent handle_method_get, <<"GET">>)
+			router.map_agent_with_request_methods ("/method/custom", agent handle_method_post, <<"POST">>)
+
 		end

 feature -- Execution

-	execute_default (req: EWSGI_REQUEST; res: EWSGI_RESPONSE_BUFFER)
+	execute_default (req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
 		local
-			h: GW_HEADER
+			h: EWF_HEADER
 			l_url: STRING
 			e: EXECUTION_ENVIRONMENT
 			n: INTEGER
@@ -65,7 +76,7 @@ feature -- Execution
 			n := 3
 			h.put_refresh (l_url, 5, 200)
 			res.set_status_code (200)
-			res.write_string (h.string)
+			res.write_headers_string (h.string)
 			from
 				create e
 			until
@@ -97,7 +108,7 @@ feature -- Execution
 			res.flush
 		end

-	execute_home (ctx: REQUEST_HANDLER_CONTEXT; req: EWSGI_REQUEST; res: EWSGI_RESPONSE_BUFFER)
+	execute_home (ctx: REQUEST_HANDLER_CONTEXT; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
 		do
 			res.write_header (200, <<["Content-Type", "text/html"]>>)
 			res.write_string ("<html><body>Hello World ?!%N")
@@ -111,17 +122,17 @@ feature -- Execution
 			res.write_string ("<li><a href=%""+ req.script_url ("/hello/Joce") + "%">/hello/Joce</a></li>%N")
 			res.write_string ("</ul>%N")

-			if attached req.environment_variable ("REQUEST_COUNT") as rqc then
+			if attached req.parameter ("REQUEST_COUNT") as rqc then
 				res.write_string ("request #"+ rqc + "%N")
 			end
 			res.write_string ("</body></html>%N")
 		end

-	execute_hello (req: EWSGI_REQUEST; res: EWSGI_RESPONSE_BUFFER; a_name: detachable STRING_32; ctx: REQUEST_HANDLER_CONTEXT)
+	execute_hello (req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER; a_name: detachable READABLE_STRING_32; ctx: REQUEST_HANDLER_CONTEXT)
 		local
 			l_response_content_type: detachable STRING
 			msg: STRING
-			h: GW_HEADER
+			h: EWF_HEADER
 			content_type_supported: ARRAY [STRING]
 		do
 			if a_name /= Void then
@@ -152,7 +163,7 @@ feature -- Execution
 				h.put_content_type (l_response_content_type)
 				h.put_content_length (msg.count)
 				res.set_status_code (200)
-				res.write_string (h.string)
+				res.write_headers_string (h.string)
 --				res.write_header (200, <<
 --						["Content-Type", l_response_content_type],
 --						["Content-Length", msg.count.out
@@ -161,16 +172,39 @@ feature -- Execution
 			end
 		end

-	handle_hello (ctx: REQUEST_HANDLER_CONTEXT; req: EWSGI_REQUEST; res: EWSGI_RESPONSE_BUFFER)
+	handle_hello (ctx: REQUEST_HANDLER_CONTEXT; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
 		do
 			execute_hello (req, res, Void, ctx)
 		end

-	handle_anonymous_hello (ctx: REQUEST_HANDLER_CONTEXT; req: EWSGI_REQUEST; res: EWSGI_RESPONSE_BUFFER)
+	handle_anonymous_hello (ctx: REQUEST_HANDLER_CONTEXT; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
 		do
 			execute_hello (req, res, ctx.parameter ("name"), ctx)
 		end

+	handle_method_any (ctx: REQUEST_HANDLER_CONTEXT; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
+		do
+			execute_hello (req, res, req.request_method, ctx)
+		end
+
+	handle_method_get (ctx: REQUEST_HANDLER_CONTEXT; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
+		do
+			execute_hello (req, res, "GET", ctx)
+		end
+
+
+	handle_method_post (ctx: REQUEST_HANDLER_CONTEXT; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
+		do
+			execute_hello (req, res, "POST", ctx)
+		end
+
+	handle_method_get_or_post (ctx: REQUEST_HANDLER_CONTEXT; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
+		do
+			execute_hello (req, res, "GET or POST", ctx)
+		end
+
+
+
 note
 	copyright: "2011-2011, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"