Commit Graph

49 Commits

Author SHA1 Message Date
Dennis Theisen
13f98de7f3 Change behavior of capture tag to use existing variables if they already have been initialized in an outer scope. 2010-08-06 06:02:37 +08:00
James MacAulay
ff829e7996 fix if tag parsing with expressions starting with and/or 2010-07-07 16:48:23 -04:00
Jesse Storimer
d87500bfe3 Liquid strip_html strips out the content of <script> tags. [#173 state:resolved] 2010-02-08 11:35:45 -05:00
James MacAulay
fce8bcb1e7 Change behaviour of arithmetic filters to cast arguments to numbers 2010-02-04 11:45:55 -05:00
James MacAulay
cbf8986745 fix variable output with quoted strings containing pipe ("|") characters 2009-09-23 15:54:25 -04:00
James MacAulay
11dc18bfdf A better fix for "and"/"or" in strings
(now with less side effects)
2009-09-23 15:44:29 -04:00
James MacAulay
f42ce88456 fixed conditions with strings containing "and"/"or" 2009-09-14 15:01:26 -04:00
James MacAulay
d1d6febfc1 'contains' operator returns false if either operand is nil 2009-08-19 19:38:31 -04:00
James MacAulay
0150067c40 Revert "Raise FilterNotFound on use of non-existent filter"
This reverts commit 01c25a11a3.

Conflicts:

	test/context_test.rb
2009-08-19 19:24:33 -04:00
James MacAulay
2d0532e041 QuotedStrings can be empty 2009-08-19 18:37:40 -04:00
James MacAulay
167825aa92 further differentiate between environments and only evaluate Procs once 2009-08-07 11:24:15 -04:00
James MacAulay
c792c29066 Templates and Contexts differentiate between different sources of assigns 2009-08-06 18:33:41 -04:00
James MacAulay
a4d7c80ce0 now able to set file_system for include tag through registers 2009-08-06 18:24:27 -04:00
Tobias Lütke
a65bd76e72 Merge branch 'master' of git@github.com:tobi/liquid
Conflicts:
	lib/liquid.rb
	lib/liquid/context.rb
	lib/liquid/variable.rb
	test/standard_tag_test.rb
2009-06-15 09:00:30 -04:00
Tobias Lütke
8ac4d6a92a cycle test coverage 2009-06-15 08:55:50 -04:00
Brian Candler
01c25a11a3 Raise FilterNotFound on use of non-existent filter 2009-06-06 16:32:20 +01:00
Brian Candler
cfe3e6f3be Allow Hash with default value or default proc to be used 2009-06-06 16:16:06 +01:00
Brian Candler
09c0b3b391 Allow template to be re-used without persisting assigns 2009-06-06 16:15:37 +01:00
Brian Candler
678fdfdb8a Add test case for presetting assigns 2009-06-06 15:47:52 +01:00
Jakub Kuźma
8d27864845 Ruby 1.9.1 bugfixes
Signed-off-by: Tobias Lütke <tobi@leetsoft.com>
2009-04-17 06:33:25 +08:00
Tobias Lütke
075341d01c Fix for parsing spaces in fragments 2009-04-06 08:37:39 -06:00
Tobias Lütke
edcc14f148 Reverted james filter in tags branch
This reverts commit 282786d7e2.

Conflicts:

	lib/liquid.rb
	lib/liquid/variable.rb
	test/if_else_test.rb
2009-04-06 08:30:19 -06:00
Tobias Lütke
26faf512a1 bump 2009-03-10 17:23:17 -04:00
Tobias Lütke
70ca647e1e Had the tests in the wrong file 2009-01-16 09:55:03 -05:00
Tobias Lütke
13ddc6d96b Added append/prepend filters 2009-01-15 16:59:18 -05:00
Tobias Lütke
88309cf415 Fixed some parse errors thanks to Daniel Sheppard [Closes #6] 2008-12-22 11:47:26 -05:00
Tobias Lütke
7b9b5f31fb Merge branch 'experimental' of git://github.com/jamesmacaulay/liquid into jamesmacaulay/experimental
Conflicts:

	lib/liquid.rb
	lib/liquid/variable.rb
2008-11-02 10:11:08 -08:00
Tobias Lütke
b165599495 Merge branch 'master' of git://github.com/josephholsten/liquid into josephholsten/master 2008-11-02 10:08:55 -08:00
Tobias Lütke
96c998a944 Merge branch 'master' of git://github.com/mhw/liquid into mhw/master 2008-11-02 10:06:02 -08:00
Tobias Lütke
7031d8a49a Fix test not failing while in PST timezone 2008-11-02 10:05:10 -08:00
Tobias Lütke
7959664c9d Merge branch 'master' of git://github.com/EmmanuelOga/liquid into EmmanuelOga/master 2008-11-02 10:04:01 -08:00
Joseph Anthony Pasquale Holsten
c15a683063 Fixed Strainer#respond_to? to accept two parameters 2008-11-02 06:24:07 -06:00
James MacAulay
36860eab57 added array sorting and mapping on properties 2008-10-28 10:36:05 -04:00
James MacAulay
3d8efe04a7 filtered variables in for loops 2008-10-24 14:50:59 -04:00
James MacAulay
edf7b5577b filtered variables for assign, case, and cycle 2008-10-15 17:02:26 -04:00
James MacAulay
282786d7e2 if blocks work with filtered variables 2008-10-15 17:02:26 -04:00
James MacAulay
69bc84b777 Added filters for basic arithmetic 2008-10-15 11:02:25 -04:00
Mark H. Wilkinson
7eeb895192 Remove trailing whitespace. 2008-08-18 20:32:30 +01:00
Mark H. Wilkinson
50edd0f5b9 Add some failing tests for Context.
Using an attribute should only cause the corresponding method to be invoked
once. Replacing a lambda with its return value should work for arrays.
Array index syntax shouldn't allow calls to special methods.
2008-07-09 18:46:38 +01:00
Mark H. Wilkinson
819b70204f Fix syntax in doc comment; test same syntax. 2008-07-09 18:34:41 +01:00
Mark H. Wilkinson
eb609ee4aa Strip trailing whitespace. 2008-07-09 18:34:41 +01:00
Emmanuel Oga
3eddf5fb9e adjusted parsing regex for syntax quirk 2008-07-08 12:54:52 -03:00
Nathaniel Bibler
4c30922d8e The if tag now raises Liquid::SyntaxError rather than a generic RuntimeError for syntax problems. 2008-05-21 23:58:12 -04:00
Tobias Lütke
ed75a6d948 Make before_method work more like method_missing 2008-05-08 17:22:07 -04:00
Tobias Lütke
63f9a05223 Implemented reversed flag on for loops {% for a in b reversed %} 2008-05-08 17:17:41 -04:00
Tobias Lütke
8f45647aa3 Parse time errors should propagate to calling site 2008-05-08 12:35:17 -04:00
Tobias Lütke
4c0cfae0b7 Changed implementation of For in such a way that it only depends on the existence of a each method. This allows drops to simply implement each for enumeration 2008-05-08 12:30:48 -04:00
Tobias Lütke
7f58cbf82d Merged last set of changes from original SVN location 2008-05-08 11:34:43 -04:00
Tobias Lütke
1d647361e1 Initial github import of liquid 2008-05-08 11:28:13 -04:00