Skip to content

Commit

Permalink
Relaxed constraints on where views must be placed, made RecessView th…
Browse files Browse the repository at this point in the history
…e default view provider.

Changed Controllers default view provider to RecessView
  • Loading branch information
unknown authored and unknown committed Apr 14, 2009
1 parent 9cd7ffc commit bf2d791
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
5 changes: 3 additions & 2 deletions recess/recess/framework/DefaultPolicy.class.php
@@ -1,6 +1,7 @@
<?php
Library::import('recess.framework.controllers.Controller');
Library::import('recess.framework.views.View');
Library::import('recess.framework.views.RecessView');
Library::import('recess.framework.views.NativeView');
Library::import('recess.framework.interfaces.IPolicy');

class DefaultPolicy implements IPolicy {
Expand Down Expand Up @@ -51,7 +52,7 @@ public function getControllerFor(Request &$request, array $applications, RtNode
}

public function getViewFor(Response &$response) {
$view = Library::importAndInstantiate($response->meta->viewClass);
$view = new $response->meta->viewClass;
$response->meta->viewDir = $response->meta->app->getViewsDir() . $response->meta->viewPrefix;
return $view;
}
Expand Down
2 changes: 1 addition & 1 deletion recess/recess/framework/controllers/Controller.class.php
Expand Up @@ -150,7 +150,7 @@ function wrappedServe(Request $request) {

$shortWiredResponse = $this->init();
if($shortWiredResponse instanceof Response) {
$shortWiredResponse->meta->viewClass = 'recess.framework.views.NativeView';
$shortWiredResponse->meta->viewClass = 'RecessView';
$shortWiredResponse->meta->viewPrefix = '';
return $shortWiredResponse;
}
Expand Down
Expand Up @@ -7,6 +7,8 @@ class ViewAnnotation extends Annotation {

protected $prefix = '';

protected $viewClass = 'RecessView';

public function usage() {
return '!View ViewProvider [, Prefix: pathWithinViews/]';
}
Expand All @@ -23,7 +25,13 @@ protected function validate($class) {
}

protected function expand($class, $reflection, $descriptor) {
$descriptor->viewClass = 'recess.framework.views.' . $this->values[0] . 'View';
if(isset($this->values[0])) {
$this->viewClass = $this->values[0];
if(strpos($this->viewClass, 'View') === false) {
$this->viewClass .= 'View';
}
}
$descriptor->viewClass = $this->viewClass;
$descriptor->viewPrefix = $this->prefix;
}

Expand Down

0 comments on commit bf2d791

Please sign in to comment.