Commit Graph
103 Commits
Author SHA1 Message Date
Justin Hileman d7cee29402 Merge branch 'dev' into feature/higher-order-sections
Conflicts:
	Mustache.php
2011-03-05 12:13:27 -05:00
Justin Hileman 76c4eb25b4 Merge branch 'dev' into feature/higher-order-sections 2011-03-05 11:50:53 -05:00
Justin Hileman 25253b3c00 DOT-NOTATION and IMPLICIT-ITERATOR are now part of core spec.
These pragmas have proved useful enough that they're no longer considered pragmas. Enable them by default. Update tests accordingly.

This is a (very) backwards incompatible change, so it won't be released until v0.6.0.
2011-03-05 11:49:43 -05:00
Justin Hileman f0861da000 Merge branch 'dev' into feature/spec-update 2011-03-05 11:17:12 -05:00
Justin Hileman ebfe6495bb Clean up $options code.
* Add a nice descriptive comment to the constructor.
* Add test coverage for `_setOptions`.
* Fix a couple of bugs exposed by said tests.
2011-03-01 13:36:05 -05:00
Woody Gilk 9a866e9721 Mustache::$_otag and Mustache::$_ctag no longer need to be public with _setOptions added 2011-03-01 12:13:44 -05:00
Woody Gilk 8bc3b1558c Added $options to constructor, along with _setOptions method to allow setting some options at runtime 2011-03-01 12:12:19 -05:00
Justin Hileman 392b0a3c57 Check whether context item is an array before using it.
Fixes #24. This will be necessary once implicit iterators make it into production. It will also save people from themselves if they put an iterable array where Mustache expects to find a context.
2011-03-01 11:41:13 -05:00
Luke Morton 5130ff2cbe Fixes #28 2011-02-17 21:19:13 +00:00
Justin Hileman 6a65bcda03 Update (per the lambdas spec) to allow lambdas as "higher-order variables". 2010-12-15 10:47:28 -05:00
Justin Hileman 8db0b86e45 Merge branch 'dev' into feature/higher-order-sections 2010-12-14 17:00:23 -05:00
Luke Morton 7d239849da Fixes #25 2010-12-14 16:50:23 -05:00
Justin Hileman 771373c70d Merge branch 'dev' into feature/higher-order-sections 2010-12-08 08:57:37 -05:00
Justin Hileman 64b5cd0964 Cleanup.
Make RegEx variable capitalization consistent. Add docblocks for prepareFooRegEx functions.
2010-12-08 08:34:27 -05:00
Justin Hileman c5bf83f9a9 Move class constants to their logical places. 2010-12-08 08:28:51 -05:00
Justin Hileman b08f116d7f Merge branch 'dev' into feature/higher-order-sections 2010-11-26 15:51:21 -05:00
Justin Hileman 289cd023d4 Optimize dot notation check
Don't try to traverse dot notation unless there's a dot in the variable name.
2010-11-26 15:45:57 -05:00
Justin Hileman b33b1a7bf2 Remove an extra trim(); 2010-11-26 15:38:45 -05:00
Justin Hileman c1bac31884 Merge branch 'dev' into feature/whitespace-overhaul 2010-11-26 14:33:23 -05:00
Justin Hileman fe91be1fb1 Pre-escape tag type constants (saves us from doing it each time the regex strings are prepared) 2010-11-26 14:07:10 -05:00
Justin Hileman 225a32d5bf Updating _renderTag logic around leftover section tags.
Exceptions are now thrown by _renderSections, so anything left over by the time _renderTag executes should just be discarded.
2010-11-26 14:05:20 -05:00
Justin Hileman 2b8e2f6e84 Capture whitespace before tags, prefix it to partials. 2010-11-24 08:11:09 -05:00
Justin Hileman 3e6b8102b7 Massive overhaul of Mustache.php's whitespace handling.
Move regex preparation into methods, use named subpatterns so the regex makes more sense. Fix the logic around eating newlines adjacent to tags. Update tests to reflect the changes.
2010-11-24 07:45:24 -05:00
Justin Hileman 38accdaf89 More correct sections implementation.
Allows nested sections of the same name, throws exceptions on incorrectly nested sections, e.g.:

    {{#foo}}{{#bar}}{{/foo}}{{/bar}}

Add a set of tests for incorrectly nested sections.
2010-11-24 03:16:18 -05:00
Justin Hileman 35c725089b Revert "Merge branch 'luciferous-master' into dev"
This reverts commit 9202a37cf5, reversing
changes made to 54b5800d42.

Using `is_callable` is problematic as the `__call` magic method interferes with
context all over the place. See http://hile.mn/buBS11 and http://hile.mn/9vy1S6
2010-10-30 18:06:39 -04:00
Justin Hileman 9202a37cf5 Merge branch 'luciferous-master' into dev 2010-10-30 17:16:33 -04:00
Justin Hileman 54b5800d42 Merge branch 'ThePixelDeveloper-master' into dev 2010-10-30 17:13:37 -04:00
Justin Hileman f2d77ad695 Whitespace 2010-10-30 17:13:27 -04:00
Justin Hileman f3cb0877ff Add support for 'less-than' partial notation. 2010-10-30 16:53:14 -04:00
Neuman Vong 65770a03f6 Use is_callable instead of method_exists
To use objects implementing __call().

Closes #18.
2010-10-29 14:07:43 -07:00
Mathew Davies e8f99bb04e Use array_key_exists instead of isset for checking array values. 2010-10-02 21:05:37 +01:00
Justin Hileman 9de188140c Merge branch 'dev' into feature/higher-order-sections 2010-08-18 09:50:01 -04:00
Jeremy Bush 758027bd91 Fixing Issue #11 2010-08-17 15:24:30 -04:00
Justin Hileman eb01f3052c Merge branch 'feature/test-coverage' into dev 2010-08-15 06:56:02 -04:00
Justin Hileman 54d91b667b Adjust _renderTag so xdebug relizes that it actually has full test coverage. This commit marks 100% test coverage of Mustache.php. 2010-08-15 06:33:55 -04:00
Justin Hileman de968a42b4 Initialize local pragmas with empty array. 2010-08-15 06:30:15 -04:00
Matt Button 196f334621 Re-ordering mustache variable precedence 2010-08-13 13:22:35 -04:00
Justin Hileman 18bffdaea0 Only allow anonymous function or class-based callback for higher-order sections. 2010-08-09 10:17:13 -04:00
Justin Hileman 8709a3969d Merge branch 'dev' into feature/higher-order-sections
Conflicts:
	Mustache.php
2010-08-09 09:41:40 -04:00
Justin Hileman ec562fea09 Support for newlines inside mustache tags. 2010-08-03 04:58:15 -04:00
Justin Hileman c1cdea7bc5 Added documentation for IMPLICIT-ITERATOR and DOT-NOTATION pragmas. 2010-07-11 23:17:14 -04:00
Justin Hileman 6cfd2b4be8 Merge branch 'dev' into feature/implicit-iterator 2010-07-11 22:35:38 -04:00
Jeremy Bush c45550e9e5 Fixing #3, Transversable objects should be iterated over. 2010-07-05 23:58:35 -04:00
Justin Hileman 0256d03b5f Merge branch 'dev' into feature/implicit-iterator
Conflicts:
	Mustache.php
2010-07-05 15:55:00 -04:00
Justin Hileman 60d593dcab Higher order functions, see: http://bit.ly/9s0dO4 2010-06-23 03:16:04 -04:00
Justin Hileman b300b31752 prepared regex should escape regex delimiter as well. 2010-06-11 16:36:40 -04:00
Justin Hileman a978b6ba45 Fix for resetting otag/ctag to initial values between successive renders of same template. 2010-06-11 16:29:59 -04:00
Justin Hileman 12096e0b8c Cleaned up regex string preparation. 2010-06-11 16:24:46 -04:00
Justin Hileman 97e6911935 Stopped passing context by reference to _findVariableInContext. Updated documentation. 2010-05-25 13:51:49 -04:00
Justin Hileman fd3dc292a3 Merge branch 'feature/fix-partials' into dev 2010-05-24 10:35:00 -04:00