Fixed various issue with URI template, added corresponding tests

library/protocol/uri_template/src/uri_template_match_result.e

@@ -24,22 +24,75 @@ feature {NONE} -- Initialization
 			make (create {like path_variables}.make (0), create {like query_variables}.make (0))
 		end
 
-feature -- Access
 
-	variable (n: STRING): detachable STRING
-			-- Value related to variable name `n'
-		do
-			Result := query_variables.item (n)
-			if Result = Void then
-				Result := path_variables.item (n)
-			end
-		end
+feature -- Access
 
 	path_variables: HASH_TABLE [STRING, STRING]
 			-- Variables being part of the path segments
 
 	query_variables: HASH_TABLE [STRING, STRING]
-			-- Variables being part of the query segments (i.e: after the ? )
+			-- Variables being part of the query segments (i.e: after the ?)
+
+feature -- Query
+
+	path_variable (n: STRING): detachable STRING
+			-- Value related to query variable name `n'
+		do
+			Result := path_variables.item (n)
+		end
+
+	query_variable (n: STRING): detachable STRING
+			-- Value related to path variable name `n'
+		do
+			Result := query_variables.item (n)
+		end
+
+	variable (n: STRING): detachable STRING
+			-- Value related to variable name `n'
+		do
+			Result := query_variable (n)
+			if Result = Void then
+				Result := path_variable (n)
+			end
+		end
+
+feature -- Query: url-decoded
+
+	url_decoded_query_variable (n: STRING): detachable STRING_32
+			-- Unencoded value related to variable name `n'
+		do
+			if attached query_variable (n) as v then
+				Result := url_decoded_string (v)
+			end
+		end
+
+	url_decoded_path_variable (n: STRING): detachable STRING_32
+			-- Unencoded value related to variable name `n'
+		do
+			if attached path_variable (n) as v then
+				Result := url_decoded_string (v)
+			end
+		end		
+
+	url_decoded_variable (n: STRING): detachable STRING_32
+			-- Unencoded value related to variable name `n'
+		do
+			if attached variable (n) as v then
+				Result := url_decoded_string (v)
+			end
+		end
+
+feature {NONE} -- Implementation
+
+	url_decoded_string (s: READABLE_STRING_GENERAL): STRING_32
+		do
+			Result := url_encoder.decoded_string (s.as_string_8)
+		end
+
+	url_encoder: URL_ENCODER
+		once
+			create Result
+		end
 
 ;note
 	copyright: "2011-2011, Eiffel Software and others"