Commit Graph

68 Commits

Author SHA1 Message Date
DBA
c00a650492 Literal
- added support for literals [closes #6]

Code beautifier
  - indented some files
2010-08-24 08:17:42 +08:00
DBA
4819eb1a92 IF tag
- now properly allows operands to have conditions (eg and, or) [closes #13]
2010-08-24 08:17:41 +08:00
DBA
8579807d29 Conditions
- added test to assert that conditions can contain conditions within its value (eg 'a-and-b')

Tags
  - indented the if tag

Tests
  - added ruby-debug to the test_helper
  - indented some tests
2010-08-24 08:17:41 +08:00
DBA
8a0a8cfd99 FiltersTest
- added test that asserts nonexistent filters are ignored

Liquid
  - Bill's mind blowing liquid patch to support filter separators (|) in quoted strings (svn r7516).
  - This is a consolidation effort based on newrelic's liquid fork commit 88a5b891d009054d56b994c9448725c74e2b1e13
2010-08-23 01:30:05 +08:00
DBA
8304a046c9 Context
- Check arity of proc before calling, to prevent error when using ruby 1.9.1+

Code beautifer
  - context.rb
2010-08-23 01:30:03 +08:00
DBA
c59cde9d17 Code beautifier
- standardfilters.rb
  - standard_filter_test.rb
2010-08-23 01:30:00 +08:00
DBA
29e140b655 StandardFilters
- added escape_once, based on ActionView
2010-08-23 01:30:00 +08:00
DBA
8e4573a7bf Strainer
- respond_to_missing? is now a required method
2010-08-23 01:29:59 +08:00
Tobias Lütke
6831eac902 Released gem 2.1.3 2010-08-05 18:07:05 -04:00
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
Dennis Theisen
e26f509277 Fixed minor typos in inline documentation for assign and capture 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
44f35c0990 Performance improvement for Block parsing. ~ 10% speedup 2009-06-15 10:33:33 -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
f29b9335c5 Allow question-mark at end of variable name only 2009-06-06 16:20:34 +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
Jakub Kuźma
ed1b542abf All tests pass on Ruby 1.9.1
Signed-off-by: Tobias Lütke <tobi@leetsoft.com>
2009-04-17 06:33:28 +08: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
Jakub Kuźma
daadb1a2d6 Ruby 1.9.1 bugfixes
Signed-off-by: Tobias Lütke <tobi@leetsoft.com>
2009-04-17 06:33:20 +08:00
Tobias Lütke
68433a52a3 Some more documentation for regexpes 2009-04-06 08:45:04 -06:00
Tobias Lütke
075341d01c Fix for parsing spaces in fragments 2009-04-06 08:37:39 -06:00
Tobias Lütke
981831bc49 Corrected spelling mistake 2009-04-06 08:33:44 -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
Cody Fauser
56f1aa9b4a Fix LiquidView for Rails 2.2. Fix local assigns for all versions of Rails
Signed-off-by: Tobias Lütke <tobi@leetsoft.com>
2009-01-27 02:18:06 +08: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
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