Split up NativeView::render functionality

Signed-off-by: Kris Jordan <krisjordan@gmail.com>(cherry picked from commit 993098d)
KrisJordan · Apr 27, 2009 · bf22ad1 · bf22ad1
1 parent bc9cbc8
commit bf22ad1
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 20 deletions.
diff --git a/recess/recess/framework/views/NativeView.class.php b/recess/recess/framework/views/NativeView.class.php
@@ -12,30 +12,37 @@ class NativeView extends AbstractView {
 	 * @abstract 
 	 */
 	protected function render(Response $response) {
+		$this->renderFormats($response);
+		extract($response->data);
+		$viewsDir = $response->meta->app->getViewsDir();
+
+		include($response->meta->viewDir . $response->meta->viewName . '.php');
+	}
+
+	protected function renderFormats(Response $response) {
 		switch($response->request->format) {
 			case Formats::JSON:
-				foreach($response->data as $key => $value) {
-					if($value instanceof ModelSet) {
-						$response->data[$key] = $value->toArray();
-					}
-					if($value instanceof Form) {
-						unset($response->data[$key]);
-					}
-					if(substr($key,0,1) == '_') {
-						unset($response->data[$key]);
-					}
-				}
-				if(isset($response->data['application'])) unset ($response->data['application']);
-				if(isset($response->data['controller'])) unset ($response->data['controller']);
-				print json_encode($response->data);
-				exit;
+				$this->render_JSON($response);
 			default:
 		}
-
-		extract($response->data);
-		$viewsDir = $response->meta->app->getViewsDir();
-
-		include_once($response->meta->viewDir . $response->meta->viewName . '.php');
+	}
+
+	protected function render_JSON(Response $response) {
+		foreach($response->data as $key => $value) {
+			if($value instanceof ModelSet) {
+				$response->data[$key] = $value->toArray();
+			}
+			if($value instanceof Form) {
+				unset($response->data[$key]);
+			}
+			if(substr($key,0,1) == '_') {
+				unset($response->data[$key]);
+			}
+		}
+		if(isset($response->data['application'])) unset ($response->data['application']);
+		if(isset($response->data['controller'])) unset ($response->data['controller']);
+		print json_encode($response->data);
+		exit;
 	}
 }
 ?>
diff --git a/recess/recess/framework/views/RecessView.class.php b/recess/recess/framework/views/RecessView.class.php
@@ -15,6 +15,7 @@ class RecessView extends NativeView {
 	 * @abstract 
 	 */
 	protected function render(Response $response) {
+		$this->renderFormats($response);
 		$this->loadHelper(
 						'recess.framework.helpers.Layout',
 						'recess.framework.helpers.Part',