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

Conflicts: draft/application/cms/README.md draft/application/cms/src/cms_session.e draft/src/gewf/license.lic library/network/http_client/src/expectation/http_client_response_expectation.e
2013-07-08 18:08:35 -03:00
parent 42ba1588c6 2676b16425
commit 285e295b5a
50 changed files with 849 additions and 2501 deletions
--- a/library/network/http_client/http_client-safe.ecf
+++ b/library/network/http_client/http_client-safe.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-11-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-11-0 http://www.eiffel.com/developers/xml/configuration-1-11-0.xsd" name="http_client" uuid="628F5A96-021B-4191-926B-B3BF49272866" library_target="http_client">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="http_client" uuid="628F5A96-021B-4191-926B-B3BF49272866" library_target="http_client">
 	<target name="http_client">
 		<root all_classes="true"/>
 		<file_rule>
@@ -7,7 +7,7 @@
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="provisional">
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL-safe.ecf">
--- a/library/network/http_client/src/http_client_request_context.e
+++ b/library/network/http_client/src/http_client_request_context.e
@@ -69,7 +69,7 @@ feature -- Access
 			-- Upload data
 			--| Note: make sure to precise the Content-Type header

-	upload_filename: detachable READABLE_STRING_8
+	upload_filename: detachable IMMUTABLE_STRING_32
 			-- Upload data read from `upload_filename'
 			--| Note: make sure to precise the Content-Type header

@@ -154,11 +154,15 @@ feature -- Element change
 			upload_data := a_data
 		end

-	set_upload_filename (a_fn: like upload_filename)
+	set_upload_filename (a_fn: detachable READABLE_STRING_GENERAL)
 		require
 			has_no_upload_filename: a_fn /= Void implies not has_upload_filename
 		do
-			upload_filename := a_fn
+			if a_fn = Void then
+				upload_filename := Void
+			else
+				create upload_filename.make_from_string_general (a_fn)
+			end
 		end

 	set_write_agent (agt: like write_agent)
--- a/library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e
+++ b/library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e
@@ -61,7 +61,7 @@ feature -- Execution
 			retried: BOOLEAN
 			l_form_data: detachable HASH_TABLE [READABLE_STRING_32, READABLE_STRING_32]
 			l_upload_data: detachable READABLE_STRING_8
-			l_upload_filename: detachable READABLE_STRING_8
+			l_upload_filename: detachable READABLE_STRING_GENERAL
 			l_headers: like headers
 		do
 			if not retried then
@@ -172,7 +172,7 @@ feature -- Execution
 														or request_method.is_case_insensitive_equal ("PUT")
 						end

-						create l_upload_file.make (l_upload_filename)
+						create l_upload_file.make_with_name (l_upload_filename)
 						if l_upload_file.exists and then l_upload_file.is_readable then
 							curl_easy.setopt_integer (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_upload, 1)

@@ -388,7 +388,7 @@ feature {NONE} -- Implementation
 		end

 note
-	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/network/http_client/src/spec/libcurl/libcurl_http_client_session.e
+++ b/library/network/http_client/src/spec/libcurl/libcurl_http_client_session.e
@@ -85,7 +85,7 @@ feature -- Basic operation
 				f.close
 				check ctx /= Void then
 					ctx.set_upload_data (Void)
-					ctx.set_upload_filename (f.name)
+					ctx.set_upload_filename (f.path.name)
 				end
 			end
 			Result := custom ("PUT", a_path, ctx)
@@ -151,7 +151,7 @@ feature {LIBCURL_HTTP_CLIENT_REQUEST} -- Curl implementation


 ;note
-	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/runtime/process/notification_email/notification_external_mailer.e
+++ b/library/runtime/process/notification_email/notification_external_mailer.e
@@ -113,7 +113,7 @@ feature -- Basic operation
 							f.put_string (a_email.message)
 							f.close
 							create args.make (1)
-							args.force (f.name)
+							args.force (f.path.name)
 						end
 					end
 					p := l_factory.process_launcher (executable_path.name, args, Void)
--- a/library/security/openid/consumer/openid-safe.ecf
+++ b/library/security/openid/consumer/openid-safe.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-11-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-11-0 http://www.eiffel.com/developers/xml/configuration-1-11-0.xsd" name="openid" uuid="FCDB4F81-31EC-462B-9183-D506E6798C0B" library_target="openid">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="openid" uuid="FCDB4F81-31EC-462B-9183-D506E6798C0B" library_target="openid">
 	<target name="openid">
 		<root all_classes="true"/>
 		<file_rule>
@@ -7,7 +7,7 @@
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="standard">
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL-safe.ecf" readonly="false"/>
--- a/library/server/wsf/connector/nino-safe.ecf
+++ b/library/server/wsf/connector/nino-safe.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-11-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-11-0 http://www.eiffel.com/developers/xml/configuration-1-11-0.xsd" name="wsf_nino" uuid="BACF0220-900B-4409-8CB2-30A09836A650" library_target="wsf_nino">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="wsf_nino" uuid="BACF0220-900B-4409-8CB2-30A09836A650" library_target="wsf_nino">
 	<target name="wsf_nino">
 		<root all_classes="true"/>
 		<file_rule>
@@ -7,7 +7,7 @@
 			<exclude>/\.git$</exclude>
 			<exclude>/\.svn$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="provisional">
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="connector_nino" location="..\..\ewsgi\connectors\nino\nino-safe.ecf"/>
--- a/library/server/wsf/default/nino-safe.ecf
+++ b/library/server/wsf/default/nino-safe.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-11-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-11-0 http://www.eiffel.com/developers/xml/configuration-1-11-0.xsd" name="default_nino" uuid="ACBEDC97-956C-45F5-97E3-65A6D9987625" library_target="default_nino">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="default_nino" uuid="ACBEDC97-956C-45F5-97E3-65A6D9987625" library_target="default_nino">
 	<target name="default_nino">
 		<root all_classes="true"/>
 		<file_rule>
@@ -7,7 +7,7 @@
 			<exclude>/\.git$</exclude>
 			<exclude>/\.svn$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="provisional">
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="wsf" location="..\wsf-safe.ecf"/>
--- a/library/server/wsf/router/wsf_file_system_handler.e
+++ b/library/server/wsf/router/wsf_file_system_handler.e
@@ -91,8 +91,12 @@ feature -- Access
 	index_disabled: BOOLEAN
 			-- Index disabled?

+	index_ignores_function: detachable FUNCTION [ANY, TUPLE [PATH], BOOLEAN]
+			-- Function to evaluate if a path is ignored or not during autoindex.
+			-- If `index_ignores' is Void and `index_ignores_function' is Void, use default ignore rules.
+
 	directory_index: detachable ARRAY [READABLE_STRING_8]
-			-- File serve if a directory index is requested
+			-- File serve if a directory index is requested.

 	not_found_handler: detachable PROCEDURE [ANY, TUPLE [uri: READABLE_STRING_8; req: WSF_REQUEST; res: WSF_RESPONSE]]

@@ -137,6 +141,44 @@ feature -- Element change
 			access_denied_handler := h
 		end

+	set_default_index_ignores
+			-- Use default auto index ignores behavior.
+		do
+			index_ignores_function := Void
+		end
+
+	set_index_ignores_function (fct: attached like index_ignores_function)
+			-- Use `fct' to compute auto index ignores behavior.
+		do
+			index_ignores_function := fct
+		end
+
+feature -- Status report
+
+	ignoring_index_entry (p: PATH): BOOLEAN
+			-- Ignoring path `p' for auto index?
+		local
+			e: detachable PATH
+			n: READABLE_STRING_32
+		do
+			if attached index_ignores_function as fct then
+				Result := fct.item ([p])
+			else
+				-- default
+				e := p.entry
+				if e = Void then
+					e := p
+				end
+				if e.is_parent_symbol then
+				else
+					n := e.name
+					Result := n.starts_with ({STRING_32} ".")
+						or n.ends_with ({STRING_32} "~")
+						or n.ends_with ({STRING_32} ".swp")
+				end
+			end
+		end
+
 feature -- Execution

 	execute (a_start_path: READABLE_STRING_8; req: WSF_REQUEST; res: WSF_RESPONSE)
@@ -189,6 +231,11 @@ feature -- Execution
 			uri, s: STRING_8
 			d: DIRECTORY
 			l_files: LIST [PATH]
+			p: PATH
+			n: READABLE_STRING_32
+			httpdate: HTTP_DATE
+			pf: RAW_FILE
+			l_is_dir: BOOLEAN
 		do
 			create d.make_with_path (dn)
 			d.open_read
@@ -202,11 +249,16 @@ feature -- Execution
 				s := "[
 					<html>
 						<head>
-							<title>Index for folder: $URI</title>
+							<title>Index of $URI</title>
+							<style>
+								td { padding-left: 10px;}
+							</style>
 						</head>
 						<body>
-							<h1>Index for $URI</h1>
-							<ul>
+							<h1>Index of $URI</h1>
+							<table>
+							<tr><th/><th>Name</th><th>Last modified</th><th>Size</th></tr>
+							<tr><th colspan="4"><hr></th></tr>
 					]"
 				s.replace_substring_all ("$URI", uri)

@@ -216,15 +268,54 @@ feature -- Execution
 				until
 					l_files.after
 				loop
-					s.append ("<li><a href=%"" + uri)
-					url_encoder.append_percent_encoded_string_to (l_files.item.name, s)
-					s.append ("%">")
-					s.append (html_encoder.encoded_string (l_files.item.name))
-					s.append ("</a></li>%N")
+					p := l_files.item
+					if ignoring_index_entry (p) then
+
+					else
+						n := p.name
+						create pf.make_with_path (p)
+						if pf.is_directory then
+							l_is_dir := True
+						else
+							l_is_dir := False
+						end
+
+						s.append ("<tr><td>")
+						if l_is_dir then
+							s.append ("[dir]")
+						else
+							s.append ("&nbsp;")
+						end
+						s.append ("</td>")
+						s.append ("<td><a href=%"" + uri)
+						url_encoder.append_percent_encoded_string_to (n, s)
+						s.append ("%">")
+						if p.is_parent_symbol then
+							s.append ("[Parent Directory] ..")
+						else
+							s.append (html_encoder.encoded_string (n))
+						end
+						if l_is_dir then
+							s.append ("/")
+						end
+
+						s.append ("</td>")
+						s.append ("<td>")
+						create httpdate.make_from_date_time (file_date (pf))
+						httpdate.append_to_rfc1123_string (s)
+						s.append ("</td>")
+						s.append ("<td>")
+						if not l_is_dir then
+							s.append_integer (file_size (pf))
+						end
+						s.append ("</td>")
+						s.append ("</tr>")
+					end
 					l_files.forth
 				end
 				s.append ("[
-							</ul>
+							<tr><th colspan="4"><hr></th></tr>				
+							</table>
 						</body>
 					</html>
 					]"
@@ -480,6 +571,11 @@ feature {NONE} -- Implementation

 feature {NONE} -- implementation: date time

+	file_size (f: FILE): INTEGER
+		do
+			Result := f.count
+		end
+
 	file_date (f: FILE): DATE_TIME
 		do
 			Result := timestamp_to_date (f.date)