@@ -47,7 +47,7 @@ class H2o {
), $options);
}
- function __construct($file = false, $options = array()) {
+ function __construct($file = null, $options = array()) {
# Init a environment
$this->options = $this->getOptions($options);
$loader = $this->options['loader'];
@@ -62,25 +62,24 @@ class H2o {
$loader = "H2o_{$loader}_Loader";
if (!class_exists($loader))
throw new Exception('Invalid template loader');
-
- # Best effort to guess searchpath
+
if (isset($options['searchpath']))
$this->searchpath = realpath($options['searchpath']).DS;
elseif ($file)
$this->searchpath = dirname(realpath($file)).DS;
else
$this->searchpath = getcwd().DS;
+
$this->loader = new $loader($this->searchpath, $this->options);
}
- #i18n
if (isset($options['i18n'])) {
h2o::load('i18n');
$this->i18n = new H2o_I18n($this->searchpath, $options['i18n']);
}
-
+
if ($file) {
- $this->nodelist = $this->loadTemplate($file);
+ $this->nodelist = $this->loadTemplate($file);
}
$this->loader->runtime = $this;
h2o.php
@@ -14,11 +14,18 @@ class Describe_file_loader extends SimpleSpec {
$h2o = h2o('templates/emails/base.html');
expects($h2o->nodelist)->should_be_a('Nodelist');
-
+
+ }
+
+ function should_be_able_to_load_template_lazily() {
$h2o = new H2o('a.html', array('searchpath' => 'templates'));
expects($h2o->render())->should_not_be_empty();
+
+ $h2o = new H2o(null, array('searchpath' => 'templates'));
+ $h2o->loadTemplate('b.html');
+ expects($h2o->render())->should_not_be_empty();
}
-
+
function should_read_from_alternitive_working_path() {
$h2o = h2o('emails/base.html', array(
'searchpath' => dirname(__FILE__).DS.'templates'
spec/loader_spec.php
f00e0cde2241aca7f0d9a58e4759f619bda6cbac
speedmax
subjective@gmail.com
http://github.com/speedmax/h2o-php/commit/fad2cbced9b71ccf8b3e2a02bf8632cb88744c51
fad2cbced9b71ccf8b3e2a02bf8632cb88744c51
2009-05-19T04:49:40-07:00
2009-05-19T04:49:40-07:00
- Fixed failing tests
523e18c26585fe2ecabef34616526131ba1b9b3b
speedmax
subjective@gmail.com