vendors/haml/HamlParser.class.php vendors/haml/SassParser.class.php views/newz/index.haml @@ -39,8 +39,15 @@ class Controller { public function __destruct() { $file = Inflector::underscore($this->controller) . DS . Inflector::underscore($this->action); - if($this->View->autoRender()) - $this->View->render($file . '.phtml'); + if($this->View->autoRender()) { + try { + $this->View->render($file . '.haml'); + } catch(Exception $e) { + $this->View->render($file . '.phtml'); + } + + } + } private function runAction($action, $id=null) include/controller.php @@ -8,12 +8,14 @@ define('CONTROLLER_DIR', ROOT_DIR . DS . 'controllers'); define('MODEL_DIR', ROOT_DIR . DS . 'models'); define('CONFIG_DIR', ROOT_DIR . DS . 'config'); define('VENDOR_DIR', ROOT_DIR . DS . 'vendors'); +define('TMP_DIR', ROOT_DIR . DS . 'tmp'); + require CONFIG_DIR . DS . 'hella.config.php'; require INCLUDE_DIR . DS . 'inflector.class.php'; require INCLUDE_DIR . DS . 'model.php'; require INCLUDE_DIR . DS . 'view.php'; require INCLUDE_DIR . DS . 'controller.php'; -#require VENDOR_DIR . DS . 'haml' . DS . 'HamlParser.class.php'; - +require VENDOR_DIR . DS . 'haml' . DS . 'HamlParser.class.php'; +require VENDOR_DIR . DS . 'haml' . DS . 'SassParser.class.php'; #require 'FirePHPCore/fb.php'; \ No newline at end of file include/setup.php @@ -2,18 +2,28 @@ class View { private $auto_render = true; + private $Haml; + + public function __construct() + { + $this->Haml = new HamlParser(TMP_DIR . DS . 'cache' . DS . 'haml_c'); + } public function render($file) { $this->setAutoRender(); if($this->vars) extract($this->vars); - - include(VIEW_DIR . DS . $file); + if(preg_match('/^.*\.haml$/', $file, $matches) > 0) { + $this->Haml->display(VIEW_DIR . DS . $file); + } else { + include(VIEW_DIR . DS . $file); + } ob_end_flush(); } public function __set($prop, $val) { + $this->Haml->assign($prop, $val); $this->vars[$prop] = $val; } include/view.php fb1a10a8bc5a0f75307ecbdf05572983e5def397 Buck Robinson buck2769@gmail.com http://github.com/buck2769/hellaphone/commit/fd080fd18f95ab4199cf977e9004976408b99adf fd080fd18f95ab4199cf977e9004976408b99adf 2009-01-20T20:42:23-08:00 2009-01-20T20:42:23-08:00 implementing haml 3b4ed76060a465f4531de998b83b89a58f266a5f Buck Robinson buck2769@gmail.com