specs/runner.php
specs/templates/emails/base.html
specs/templates/emails/campaign1.html
specs/templates/emails/campaign2.html
specs/templates/emails/campaign3.html
specs/templates/shared/terms_and_conditions.html
@@ -14,12 +14,26 @@ H2O is markup language for PHP that taken a lot of inspiration from django.
* Bundled rich set of filters and tags for string formatting, HTML helpers and
internationalization.
+
Requirement
------------------------
- PHP 5.1 +
+News
+------------------------
+
+ - version 0.4
+ 1. **Breaking changes** autoescape is now turned on by default
+ 2. Improved searchpath and file loading handling
+ 3. Improved Handling on PHP overloaded objects
+ 4. Plenty of bug fixes
+ - version 0.3
+ 1. Support internationalized templates and translation parsing toolkit
+ 2. Performance optimization on context lookup
+ 3. Fixed operator pasing
+
Getting started
------------------------
@@ -66,7 +80,7 @@ With SVN
<?php
require 'h2o/h2o.php';
- $h2o = new h2o('index.html');
+ $h2o = new h2o('templates/index.html');
echo $h2o->render(array('name'=>'Peter Jackson'));
?>
README.md
@@ -8,7 +8,6 @@
require '../../h2o.php';
$template = new H2o('index.html', array(
- 'cache' => false,
'cache_dir' => dirname(__FILE__)
));
example/simple/index.php
@@ -34,7 +34,8 @@ class H2o {
'cache_prefix' => 'h2o_',
'cache_ttl' => 3600, // file | apc | memcache
'searchpath' => false,
-
+ 'autoescape' => true,
+
// Enviroment setting
'BLOCK_START' => '{%',
'BLOCK_END' => '%}',
@@ -66,7 +67,7 @@ class H2o {
$this->searchpath = realpath($options['searchpath']).DS;
else
$this->searchpath = dirname(realpath($file)).DS;
- $this->loader = new $loaderClass($this->searchpath, $this->options);
+ $this->loader = new $loaderClass($this->searchpath, $this->options);
}
if (isset($options['i18n'])) {
@@ -134,8 +135,8 @@ class H2o {
return $this->stream->close();
}
- static function parseString($source) {
- $instance = new H2o(null, array('loader' => false));
+ static function parseString($source, $options = array()) {
+ $instance = new H2o(null, array_merge($options, array('loader' => false)));
$instance->nodelist = $instance->parse($source);
return $instance;
}
@@ -253,9 +254,9 @@ function h2o($name, $options = array()) {
$is_file = '/([^\s]*?)(\.[^.\s]*$)/';
if (!preg_match($is_file, $name)) {
- return H2o::parseString($name);
+ return H2o::parseString($name, $options);
}
-
+
$instance = new H2o($name, $options);
return $instance;
}
h2o.php
@@ -5,10 +5,11 @@
* encapsulate context, resolve name
*/
class H2o_Context implements ArrayAccess {
- var $safeClass = array('stdClass', 'BlockContext');
- var $scopes;
- var $options;
- var $autoescape = true;
+ public $safeClass = array('stdClass', 'BlockContext');
+ public $scopes;
+ public $options;
+ public $autoescape = true;
+
private $arrayMethods = array('first'=> 0, 'last'=> 1, 'length'=> 2, 'size'=> 3);
static $lookupTable = array();
@@ -20,6 +21,9 @@ class H2o_Context implements ArrayAccess {
if (isset($options['safeClass']))
$this->safeClass = array_merge($this->safeClass, $options['safeClass']);
+ if (isset($options['autoescape']))
+ $this->autoescape = $options['autoescape'];
+
$this->options = $options;
}
h2o/context.php
@@ -1,5 +1,4 @@
<?php
-
/**
*
* @author taylor.luk
@@ -7,21 +6,21 @@
*/
class H2o_Loader {
public $parser;
+ public $runtime;
+ public $cached = false;
+ private $cache = false;
+ public $searchpath = false;
+
function read($filename) {}
function cache_read($file, $object, $ttl = 3600) {}
}
class H2o_File_Loader extends H2o_Loader {
- public $parser;
- public $runtime;
- private $cache = false;
- public $searchpath;
-
+
function __construct($searchpath, $options = array()) {
if (is_file($searchpath)) {
$searthpath = dirname($searchpath).DS;
}
-
if (!is_dir($searchpath))
throw new TemplateNotFound($filename);
@@ -36,28 +35,30 @@ class H2o_File_Loader extends H2o_Loader {
}
function read($filename) {
-
- if (!file_exists($filename))
- $filename = $this->searchpath . $filename;
-
- if (!file_exists($filename))
- throw new TemplateNotFound($filename);
+ if (!is_file($filename))
+ $filename = $this->searchpath . $filename;
- $source = file_get_contents($filename);
- return $this->runtime->parse($source);
+ if (is_file($filename)) {
+ $source = file_get_contents($filename);
+ return $this->runtime->parse($source);
+ } else {
+ throw new TemplateNotFound($filename);
+ }
}
function read_cache($filename) {
if (!$this->cache)
return $this->read($filename);
+
if (!is_file($filename))
- $file_path = $this->searchpath . $filename;
+ $filename = $this->searchpath . $filename;
+
$filename = realpath($filename);
-
$cache = md5($filename);
$object = $this->cache->read($cache);
+ $this->cached = $object && !$this->expired($object);
- if (!$object || $object && $this->expired($object)) {
+ if (!$this->cached) {
$nodelist = $this->read($filename);
$object = (object) array(
'filename' => $filename,
@@ -69,7 +70,7 @@ class H2o_File_Loader extends H2o_Loader {
$this->cache->write($cache, $object);
} else {
foreach($object->included as $ext => $file) {
- include_once(h2o::$extensions[$ext] = $file);
+ include_once (h2o::$extensions[$ext] = $file);
}
}
return unserialize($object->content);
@@ -80,9 +81,14 @@ class H2o_File_Loader extends H2o_Loader {
}
function expired($object) {
+ if (!$object) return false;
+
$files = array_merge(array($object->filename), $object->templates);
foreach ($files as $file) {
- if (filemtime($this->searchpath.$file) > $object->created)
+ if (!is_file($file))
+ $file = $this->searchpath.$file;
+
+ if ($object->created < filemtime($file))
return true;
}
return false;
@@ -94,10 +100,7 @@ function file_loader($file) {
}
class H2o_Hash_Loader {
- public $parser;
- public $runtime;
- public $searchpath = false;
-
+
function __construct($scope, $options = array()) {
$this->scope = $scope;
}
@@ -119,12 +122,10 @@ function hash_loader($hash = array()) {
return new H2o_Hash_Loader($hash);
}
-
/**
* Cache subsystem
*
*/
-
function h2o_cache($options = array()) {
$type = $options['cache'];
$className = "H2o_".ucwords($type)."_Cache";
@@ -144,9 +145,9 @@ class H2o_File_Cache {
$path = $options['cache_dir'];
} else {
$path = dirname($tmp = tempnam(uniqid(rand(), true), ''));
+
if (file_exists($tmp)) unlink($tmp);
}
-
if (isset($options['cache_ttl'])) {
$this->ttl = $options['cache_ttl'];
}
h2o/loaders.php
@@ -40,7 +40,7 @@ class NodeList extends H2o_Node implements IteratorAggregate {
return count($this->list);
}
- public function getIterator() {
+ function getIterator() {
return new ArrayIterator( $this->list );
}
}
h2o/nodes.php
@@ -79,6 +79,13 @@ class Describe_context_lookup_basic_data_types extends SimpleSpec {
expects(h2o('{{ a }}')->render($c))->should_be('<script>danger</script>');
expects(h2o('{{ b|safe }}')->render($c))->should_be('<h1>Welcome</h1>');
+ # disable autoescape as option
+ expects(h2o('{{ a }}', array('autoescape' => false))->render(compact('a','b')))->should_be($a);
+
+ # disable autoescape on context object
+ $c->autoescape = false;
+ expects(h2o('{{ a }}')->render($c))->should_be($a);
+
}
}
specs/context_spec.php
@@ -2,18 +2,67 @@
require_once 'spec_helper.php';
class Describe_file_loader extends SimpleSpec {
- function prepare() {
+
+ function should_be_able_to_read_template() {
+ chdir(dirname(__FILE__));
+
+ $h2o = h2o('templates/a.html');
+ expects($h2o->nodelist)->should_be_a('Nodelist');
+
+ $h2o = h2o('templates/b.html');
+ expects($h2o->nodelist)->should_be_a('Nodelist');
+
+ $h2o = h2o('templates/emails/base.html');
+ expects($h2o->nodelist)->should_be_a('Nodelist');
}
- function should_be_able_to_read_template() {}
+ function should_read_from_alternitive_working_path() {
+ $h2o = h2o('emails/base.html', array(
+ 'searchpath' => dirname(__FILE__).DS.'templates'
+ ));
+ expects($h2o->render())->should_match('/Dear Customer/');
+ }
- function should_load_subtemplate_upon_extends_tag() {}
+ function should_load_subtemplate_upon_extends_tag() {
+ $h2o = h2o('emails/campaign1.html', array(
+ 'searchpath' => dirname(__FILE__).DS.'templates'
+ ));
+ expects($h2o->render())->should_match('/Dear Customer/');
+
+ $h2o->loadTemplate('emails/campaign2.html');
+ expects($h2o->render())->should_match('/Hello Customer/');
+ }
- function should_load_subtemplate_upon_include_tag() {}
+ function should_load_subtemplate_upon_include_tag() {
+ $h2o = h2o('emails/campaign3.html', array(
+ 'searchpath' => dirname(__FILE__).DS.'templates'
+ ));
+ expects($h2o->render())->should_match('/abcWidgets Logo are registered trademarks/');
+ }
- function shouble_cache_main_template() {}
+ function shouble_cache_main_template() {
+ $h2o = h2o('templates/a.html', array('cache' => false));
+ expects($h2o->cached)->should_be(false);
+
+ $h2o = h2o('template/a.html', array('cache'=>true));
+ expects($h2o->cached)->should_be(true);
+ }
function should_invalidate_cache_if_any_subtemplates_has_updated() {
+ $opt = array('searchpath' => dirname(__FILE__).DS.'templates');
+
+ # Load template twice to make sure its cached
+ $h2o = h2o('emails/campaign1.html', $opt);
+ $h2o->loadTemplate('emails/campaign1.html');
+ expects($h2o->loader->cached)->should_be(true);
+
+ # Touch parent template
+ sleep(1);
+ touch(dirname(__FILE__).DS.'templates/emails/base.html');
+
+ $h2o->loadTemplate('emails/campaign1.html');
+ expects($h2o->loader->cached)->should_be(false);
+ $h2o->loader->flush_cache();
}
}
specs/loader_spec.php
@@ -37,7 +37,7 @@
* @license Free for all
*/
-class SimpleSpec extends UnitTestCase implements ArrayAccess {
+class SimpleSpec extends UnitTestCase {
public $target;
private $negate;
private $matcher;
@@ -139,17 +139,6 @@ function expects($subject) {
return $object->expect($subject);
}
-class SpecProxy {
- function __construct($class) {
- $this->object = new $class;
- }
-
- function __call($method, $args) {
- return user_call_func_array(array($this->object, $method), $args);
- }
-}
-
-
class Have_Matcher {
function __construct($subject, $count, $runtime) {
$this->subject = $subject;
specs/spec.php
@@ -1,12 +1,10 @@
<?php
+
function_exists('simpletest_autorun') or require 'simpletest/autorun.php';
class_exists('H2o') or require dirname(dirname(__FILE__)).'/h2o.php';
class_exists('SimpleSpec') or require dirname(__FILE__).'/spec.php';
require 'Krumo/class.krumo.php';
-function n($name) {
- return array('name'=>$name);
-}
?>
\ No newline at end of file
specs/spec_helper.php
e8a4845e08bbe6e5680de620c2d84dcecdf51513
speedmax
subjective@gmail.com
http://github.com/speedmax/h2o-php/commit/194310e970f98df15d82c281af06e7aa2218ad5c
194310e970f98df15d82c281af06e7aa2218ad5c
2009-04-15T01:03:52-07:00
2009-04-15T01:03:52-07:00
preparing for version 0.4 release
- Improve searchpath and file loading when h2o is used on non current path, or customized searchpath
- Improve test coverage on file loading
- Adding autoescape as initialize option
- Refactor cache invalidation
93304007070adde4ac848aee1fed11b0fc5f099c
speedmax
subjective@gmail.com