From 17fe37aeddcd8abfa4a66bbbe6452bb01601df76 Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <git@djoce.net>
Date: Thu, 30 Apr 2015 09:50:47 +0200
Subject: [PATCH] Added {CMS_RESPONSE}.formats: CMS_FORMATS

---
 .../handler/cms_node_type_webform_manager.e   |  6 ++---
 src/modules/cms_debug_module.e                |  2 +-
 src/service/cms_api.e                         |  2 ++
 src/service/response/cms_response.e           | 26 ++++++++++++-------
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/modules/node/handler/cms_node_type_webform_manager.e b/modules/node/handler/cms_node_type_webform_manager.e
index eb64a9f..88161a4 100644
--- a/modules/node/handler/cms_node_type_webform_manager.e
+++ b/modules/node/handler/cms_node_type_webform_manager.e
@@ -87,7 +87,7 @@ feature -- Forms ...
 			elseif a_node /= Void and then attached a_node.format as s_format and then attached response.api.format (s_format) as f_format then
 				f := f_format
 			else
-				f := response.api.formats.default_format
+				f := response.formats.default_format
 			end
 			if b /= Void then
 				a_node.set_content (b, Void, f.name) -- FIXME: summary
@@ -139,7 +139,7 @@ feature -- Forms ...
 			elseif a_node /= Void and then attached a_node.format as s_format and then attached response.api.format (s_format) as f_format then
 				f := f_format
 			else
-				f := response.api.formats.default_format
+				f := response.formats.default_format
 			end
 			if b /= Void then
 				l_node.set_content (b, Void, f.name)
@@ -185,7 +185,7 @@ feature -- Output
 				if attached node_api.cms_api.format (a_node.format) as f then
 					s.append (f.formatted_output (l_content))
 				else
-					s.append (node_api.cms_api.formats.default_format.formatted_output (l_content))
+					s.append (a_response.formats.default_format.formatted_output (l_content))
 				end
 
 				s.append ("</p>")
diff --git a/src/modules/cms_debug_module.e b/src/modules/cms_debug_module.e
index fc23343..c851be6 100644
--- a/src/modules/cms_debug_module.e
+++ b/src/modules/cms_debug_module.e
@@ -69,7 +69,7 @@ feature -- Hooks
 				create dbg.make
 				create s.make_empty
 				dbg.append_information_to (a_response.request, a_response.response, s)
-				create b.make ("debug-info", "Debug", s, a_response.api.formats.plain_text)
+				create b.make ("debug-info", "Debug", s, a_response.formats.plain_text)
 				a_response.add_block (b, "footer")
 			end
 		end
diff --git a/src/service/cms_api.e b/src/service/cms_api.e
index befdb1f..d9bbf54 100644
--- a/src/service/cms_api.e
+++ b/src/service/cms_api.e
@@ -71,11 +71,13 @@ feature -- Access
 feature -- Formats
 
 	formats: CMS_FORMATS
+			-- Available content formats.
 		once
 			create Result
 		end
 
 	format (a_format_name: detachable READABLE_STRING_GENERAL): detachable CONTENT_FORMAT
+			-- Content format name `a_format_name' if any.
 		do
 			Result := formats.item (a_format_name)
 		end
diff --git a/src/service/response/cms_response.e b/src/service/response/cms_response.e
index bbd8382..13db564 100644
--- a/src/service/response/cms_response.e
+++ b/src/service/response/cms_response.e
@@ -59,15 +59,6 @@ feature -- Access
 
 	response: WSF_RESPONSE
 
-	api: CMS_API
-			-- Current CMS API.
-
-	setup: CMS_SETUP
-			-- Current setup
-		do
-			Result := api.setup
-		end
-
 	status_code: INTEGER
 
 	header: WSF_HEADER
@@ -85,6 +76,23 @@ feature -- Access
 	redirection: detachable READABLE_STRING_8
 			-- Location for eventual redirection.
 
+feature -- API
+
+	api: CMS_API
+			-- Current CMS API.
+
+	setup: CMS_SETUP
+			-- Current setup
+		do
+			Result := api.setup
+		end
+
+	formats: CMS_FORMATS
+			-- Available content formats.
+		do
+			Result := api.formats
+		end
+
 feature -- Module
 
 	module_resource_path (a_module: CMS_MODULE; a_resource: PATH): detachable PATH