Commit Graph
100 Commits
Author SHA1 Message Date
Justin Hileman 5bc11ef183 Test for the mustache loader. 2011-09-22 09:26:52 -07:00
Justin Hileman 2aaa820965 Add a 'MustacheLoader' filesystem loader. 2011-09-21 23:40:12 -07:00
Justin Hileman a828af2869 Add a test case for Mustache injection. 2011-09-21 22:43:56 -07:00
Justin Hileman 3cdb6612e2 Merge branch 'release/0.8.0' into dev 2011-09-10 14:21:59 -07:00
Justin Hileman 02f8cec3e3 Bump version number. 2011-09-10 14:19:58 -07:00
Justin Hileman ceb0766f66 $leading and $trailing shouldn't be escaped. 2011-09-10 14:17:22 -07:00
Justin Hileman 1fa5d288e7 Remove remnant $key from old spec version code. 2011-09-10 14:11:36 -07:00
Justin Hileman 507f5c631f Merge branch 'feature/higher-order-sections' into dev 2011-09-10 14:04:02 -07:00
Justin Hileman 9f7ab9d362 Merge branch 'dev' into feature/higher-order-sections
Conflicts:
	Mustache.php
2011-09-10 14:03:23 -07:00
Justin Hileman ccf4b33666 Add a SPEC_VERSION constant, since that's super handy too. 2011-06-13 15:23:38 -04:00
Justin Hileman 342b618343 Merge branch 'release/0.7.1' into dev 2011-06-13 15:15:27 -04:00
Justin Hileman fbcea210e3 Version bump 2011-06-13 15:14:29 -04:00
Justin Hileman b7a12665ea Add a VERSION constant.
closes #45
2011-06-13 15:12:43 -04:00
Justin Hileman 28b5a457ce fix merge conflict. 2011-06-13 04:38:24 -04:00
Justin Hileman a086a21b5f clarifying which version tag 2011-06-13 04:33:03 -04:00
Justin Hileman 3a8b4b0ec7 Update manpage links in README
Closes #41
Thanks ddrake
2011-06-13 04:26:35 -04:00
Justin Hileman 5b23991f7c Merge branch 'feature/delimiter-cleanup' into dev 2011-06-13 04:16:36 -04:00
Justin Hileman 0c467311e8 Merge remote-tracking branch 'KevBurnsJr/fixing_delimiters' into feature/delimiter-cleanup
Conflicts:
	Mustache.php
	test/MustacheTest.php
2011-06-13 04:03:38 -04:00
Justin Hileman 1abf854af3 Make section rendering delimiter-chage-aware. Fixes longstanding section/delimiter bug. 2011-06-13 04:00:49 -04:00
Justin Hileman a16d9ed51c add a test that changes delimiters all over the place... inside and outside sections. 2011-06-13 04:00:13 -04:00
Justin Hileman a2f3662b6b update failing test case, test for sticky delims between renders. 2011-06-13 03:54:15 -04:00
Justin Hileman f0dc81b6bd Merge remote-tracking branch 'KevBurnsJr/fixing_delimiters' into feature/delimiter-cleanup 2011-06-13 03:42:49 -04:00
Justin Hileman eff36b5540 Coding style? Conventions? Consistency? Who needs that?. Mebbe I should get some sleep :) 2011-06-13 03:26:27 -04:00
Justin Hileman 2a84c544c3 Merge branch 'release/0.7.0' 2011-06-13 02:20:04 -04:00
Justin Hileman 0a10c5bcfe update known issues in README 2011-06-13 02:16:48 -04:00
Justin Hileman 4b68bf4780 Merge branch 'feature/delimiters-partials-and-sections' into dev 2011-06-13 02:14:22 -04:00
Justin Hileman e452b4cb73 Fix the last couple of regressions with section rendering. 2011-06-13 02:03:00 -04:00
Justin Hileman f95f8c09a8 More efficient return from _findSection. 2011-06-13 01:23:19 -04:00
Justin Hileman 9af6b2033e Work in progress. Fixing double-rendering of sections, mustache injection, etc. 2011-06-13 01:05:48 -04:00
Justin Hileman 61a0b7f2f2 Provide another interpolation failure test case. 2011-06-12 23:57:29 -04:00
Justin Hileman 44e7fc42cd Merge remote-tracking branch 'KevBurnsJr/delimiters_in_partials' into feature/delimiters-partials-and-sections 2011-06-12 23:46:42 -04:00
Justin Hileman 4bb4e970de Fix missing arguments from renderUnescaped 2011-06-12 23:33:07 -04:00
Justin Hileman 6c683a5805 Merge branch 'dev' into feature/higher-order-sections
Conflicts:
	Mustache.php
	test/MustacheSpecTest.php
2011-06-12 23:25:49 -04:00
Justin Hileman f348449fc2 Merge branch 'feature/spec-update-1.1.2' into dev 2011-06-12 23:13:42 -04:00
Justin Hileman 9c16a83e53 Merge branch 'release/0.6.0' 2011-06-12 23:08:26 -04:00
Justin Hileman 49b500f789 Note known whitespace bug with spec tests. 2011-06-12 23:00:54 -04:00
Justin Hileman 9c73e5bb4f Add whitespace bug to known issues. 2011-04-26 18:59:22 -04:00
Justin Hileman 60e7fbbb34 Fix whitespace bugs in partials, interpolation and comments. 2011-04-26 18:56:03 -04:00
Justin Hileman 31ba792e33 update spec to 1.1.2 2011-04-26 18:55:05 -04:00
Justin Hileman cb30ad2389 Make spec test failure messages more readable. 2011-04-26 17:27:14 -04:00
Justin Hileman 14911a158e Per the updated spec, interpolated lambdas should not be cached. 2011-03-05 12:14:02 -05:00
Justin Hileman d7cee29402 Merge branch 'dev' into feature/higher-order-sections
Conflicts:
	Mustache.php
2011-03-05 12:13:27 -05:00
Justin Hileman 2efa705751 Merge branch 'feature/spec-update' into dev 2011-03-05 11:57:24 -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 fd3875a4ac Update spec to v1.1.0 -- dot notation 2011-03-05 11:16: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
Justin Hileman e928cd956a Merge branch 'hotfix/0.5.2' into dev 2011-03-01 11:42:58 -05:00
Justin Hileman 27bed8f10a Merge branch 'hotfix/0.5.2' 2011-03-01 11:41:59 -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
Justin Hileman 0ac8be629b Merge branch 'feature/indentation-fix' of https://github.com/DrPheltRight/mustache.php into DrPheltRight-feature/indentation-fix 2011-03-01 10:42:06 -05:00
Justin Hileman 9640915fb7 Update spec to v1.0.0. Tests break. 2011-03-01 08:20:40 -05:00
Justin Hileman 2cfc9ba827 Update to current spec HEAD.
This makes a lot of tests fail :)
2011-02-17 09:47:29 -05:00
Justin Hileman dd60778124 Update spec test to work with v1.0.0rc2 lambdas spec. 2010-12-27 01:01:18 -05:00
Justin Hileman 8c958a78de Merge branch 'dev' into feature/higher-order-sections 2010-12-27 00:59:51 -05:00
Justin Hileman 8fbca952c6 Update spec submodule to v1.0.0rc2 2010-12-27 00:59:24 -05: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 65d6b5a638 Enable (and fix) lambdas spec test.
This requires the not-yet-committed PHP version of the lambdas spec to actually do anything besides skip some more tests. But trust me, once you see these hot new lambda spec tests, it'll be a *lot* more interesting.
2010-12-15 10:38:11 -05:00
Justin Hileman 8db0b86e45 Merge branch 'dev' into feature/higher-order-sections 2010-12-14 17:00:23 -05:00
Justin Hileman c7a2064344 Merge branch 'hotfix/0.5.1' into dev 2010-12-14 16:53:38 -05:00
Justin Hileman 6eb3ea0c8b Merge branch 'hotfix/0.5.1' 2010-12-14 16:53:10 -05:00
Justin Hileman a448453da3 Merge branch 'release/0.5.0' 2010-12-08 16:05:51 -05:00
Justin Hileman f2d677e5d6 Update README. 2010-12-08 16:04:11 -05:00
Justin Hileman 771373c70d Merge branch 'dev' into feature/higher-order-sections 2010-12-08 08:57:37 -05:00
Justin Hileman 7466cd2551 Comment out lambda tests.
Lambdas aren't currently implemented in Mustache.php, and the parser we're using doesn't like the lambdas yaml file so it's throwing exceptions :(
2010-12-08 08:55:37 -05:00
Justin Hileman 2e335f8687 Merge branch 'feature/whitespace-overhaul' into dev 2010-12-08 08:49:29 -05:00
Justin Hileman 6e070ca476 Merge branch 'dev' into feature/whitespace-overhaul 2010-12-08 08:42:04 -05:00
Justin Hileman 5eeddd5cb5 Merge branch 'feature/mustache-spec' into dev 2010-12-08 08:41:41 -05:00
Justin Hileman 55e3a036f2 Merge branch 'dev' into feature/mustache-spec 2010-12-08 08:40:14 -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 834d612f1e Merge branch 'dev' into feature/whitespace-overhaul 2010-12-08 08:23:13 -05:00
Justin Hileman 7cb2029ec2 Add test for double-rendered sections, prevent mustache injection (see fix for mustache.js: http://hile.mn/fOVoW1 ...) 2010-12-08 08:16:06 -05:00
Justin Hileman 7ffd232c2e Merge branch 'dev' into feature/mustache-spec 2010-11-26 15:53:56 -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 730c3a36e5 Update phpunit config to exclude tests from coverage report. 2010-11-26 14:03:45 -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 e0ec0d0e18 Swap out spyc for sfYaml.
spyc has a parsing bug which causes partials to fail. I mean, they fail for other reasons too. And we're getting to those. But we don't need to debug YAML parsers while we're at it.
2010-11-24 05:07:35 -05:00
Justin Hileman ab29f6eef4 Merge branch 'dev' into feature/mustache-spec 2010-11-24 04:15:42 -05:00
Justin Hileman d026315a2c Even more ludicrous recursive section / implicit iterator tests. 2010-11-24 04:10:37 -05:00
Justin Hileman fef6234954 Test case for recursive sections with implicit iterators. 2010-11-24 04:02:19 -05:00
Justin Hileman 16115f915b Merge branch 'feature/section-stack' into dev 2010-11-24 03:54:14 -05:00
Justin Hileman fa0e7fac80 Merge branch 'dev' into feature/section-stack 2010-11-24 03:52:22 -05:00
Justin Hileman 1282b8104a A broken example for issue #12 - recursive/nested sections. 2010-11-24 03:52:04 -05:00
Justin Hileman bb04ccd05e Add an inverted section test to base test case. 2010-11-24 03:36:41 -05:00
Justin Hileman 943aa8849a Add test groups for easier test breakdown. 2010-11-24 03:36:23 -05:00
Justin Hileman f143f17b40 Add test groups for easier test breakdown. 2010-11-24 03:26:44 -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 a39c6f689e Merge branch 'release/0.4.0' 2010-10-30 18:12:58 -04: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