81 Commits

Author SHA1 Message Date
James MacAulay
ffd48880e2 Gem v2.1.1 v2.1.1 2010-07-09 09:11:49 -04:00
James MacAulay
6b79f25c87 rake release 2010-07-09 09:11:41 -04:00
James MacAulay
ff829e7996 fix if tag parsing with expressions starting with and/or 2010-07-07 16:48:23 -04:00
James MacAulay
d53a4e1834 rake default task is 'test' 2010-07-06 16:01:15 -04:00
James MacAulay
5ff699bb8a Gem version 2.1.0. Don't use Hoe. v2.1.0 2010-07-06 13:19:38 -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
97548d4f01 shopify performance tests: add 'compact' size to product_img_url filter 2010-02-04 10:57:14 -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
7ff4352de2 Added convenience task rake profile:grind to load up KCacheGind 2009-06-15 10:35:49 -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
Tobias Lütke
37e913f755 added 3 more themes to add veriety to the profiler run 2009-06-14 18:09:40 -04:00
Tobias Lütke
5e0ad75ff5 remove benchmark dir 2009-06-14 18:05:18 -04:00
Tobias Lütke
1b3b3e4958 added rake profile for easier invokation 2009-06-14 18:04:07 -04:00
Tobias Lütke
31a5606d42 fixed a bug with mock paginate tag 2009-06-14 17:42:28 -04:00
Tobias Lütke
f65ce254c7 added full profiler suite to liquid based on real-world code form Shopify and vision 2009-06-14 17:32: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
Brian Candler
678fdfdb8a Add test case for presetting assigns 2009-06-06 15:47:52 +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
37580976db regenerated gemspec
Signed-off-by: Tobias Lütke <tobi@leetsoft.com>
2009-04-17 06:33:21 +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
e3fd003a74 Ignore pkg directory 2009-04-06 08:10:13 -06:00
Tobias Lütke
26faf512a1 bump v2.0.0 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
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