Commit Graph

760 Commits

Author SHA1 Message Date
Florian Weingarten
96b30a89a9 Fix map filter on Hash inputs 2013-10-08 08:18:03 -04:00
Florian Weingarten
81d3733f57 Regression test for change of blank? default behaviour (2efe809e11) 2013-09-23 09:38:45 -04:00
Florian Weingarten
2efe809e11 Make blank? default to false for all tags to maintain backwards compatible 2013-09-23 08:43:26 -04:00
Simon Hørup Eskildsen
322ecca145 Merge pull request #261 from Shopify/fix-i18n-regex-warning
Fix i18n regex warning in Ruby 1.8
2013-09-16 11:36:47 -07:00
Simon Eskildsen
6ce0b9d705 Fix i18n regex warning in Ruby 1.8 2013-09-16 14:35:33 -04:00
Florian Weingarten
736998df64 Merge pull request #257 from Shopify/fix_comment_tags_second_try
Fix unknown tags in comment tags, second try
2013-09-11 13:33:26 -07:00
Florian Weingarten
5b172a4c05 Fix unknown tags in comment tags, second try 2013-09-11 12:31:54 -04:00
Florian Weingarten
bd20595f1a Add regression test for comment tag 2013-09-11 12:14:27 -04:00
Florian Weingarten
f938756a58 Revert "Merge pull request #256 from Shopify/unknown_tags_in_comments"
This reverts commit 1ae8c0e90a, reversing
changes made to 01d352bc51.
2013-09-11 12:13:55 -04:00
Florian Weingarten
1ae8c0e90a Merge pull request #256 from Shopify/unknown_tags_in_comments
Fix handling of unknown tags in comments
2013-09-11 07:59:44 -07:00
Florian Weingarten
45795f8766 Fix handling of unknown tags in comments 2013-09-11 10:40:33 -04:00
Florian Weingarten
01d352bc51 Move stuff in test around 2013-09-11 14:40:11 +02:00
Ishibashi Hideto
70513fccaf remove include Liquid from the class CustomInclude and substitute QuotedFragment with Liquid::QuotedFragment 2013-09-11 03:25:06 +09:00
Ishibashi Hideto
a5285d3d09 test for the Jekyll's issue: [Liquid doesn't render my partial · Issue #1519 · mojombo/jekyll](https://github.com/mojombo/jekyll/issues/1519) 2013-09-10 22:58:56 +09:00
James Tucker
fbfd5712df Merge pull request #3 from dntj/master
Add a test for corrected if-nodelist
2013-09-07 18:30:55 -07:00
Nicholas Jones
90593d3f18 Add a test for corrected if-nodelist 2013-09-07 11:15:49 -07:00
Tristan Hume
beded415cd Merge pull request #253 from trishume/fix-range-parsing
Fix bad range parsing.
2013-09-07 05:17:30 -07:00
James Tucker
13c826933c Update against failed cherry-pick 2013-09-07 01:42:41 +00:00
Tristan Hume
7c5b3e0c3b Fix bad range parsing. 2013-09-04 18:13:31 -04:00
Nick Jones
ca5bc5d75b Correct if-statement nodelist.
The nodelist returned by all tags is a list of containing nodes, except for the if tag.  This correct that inconsistency
2013-08-31 19:03:50 +00:00
James Tucker
d4679cd550 Strainer test now works on 1.8 2013-08-31 18:57:09 +00:00
James Tucker
9b2d5b7dd3 Add a class cache to avoid runtime extend calls
* Strainer has a class cache that creates Strainer subclasses for each filter
   set that is used on .create calls.
 * Context now creates a list of filters and passes this to Strainer.create to
   utilize the class cache in almost all use cases.
 * If add_filter was called after a render, then the method cache may still be
   invalidated.

Conflicts:

	lib/liquid/strainer.rb
2013-08-31 18:56:35 +00:00
Tristan Hume
e8b41c8856 Fix error v2.5.2 2013-08-30 16:06:48 -04:00
Tristan Hume
4c22bacbba Merge branch 'master' of https://github.com/Shopify/liquid 2013-08-30 15:56:13 -04:00
Tristan Hume
09a5b57ebe Fix variable closing error message 2013-08-30 15:55:43 -04:00
Florian Weingarten
8059da4938 Update History.md 2013-08-30 15:28:33 -04:00
Tristan Hume
af50f71224 Guard against state that shouldn't happen but does 2013-08-30 15:26:26 -04:00
Simon Hørup Eskildsen
136b6763e6 Merge pull request #241 from Shopify/i18n-error
Add I18n syntax error translation
2013-08-30 09:55:05 -07:00
Simon Eskildsen
ad184fbfc9 Remove superplus translations 2013-08-30 12:31:58 -04:00
Simon Eskildsen
380828f807 Rename outdated test 2013-08-30 12:31:57 -04:00
Simon Eskildsen
fc8c45ebe6 Fix use of 1.9 hash syntax 2013-08-30 12:31:57 -04:00
Simon Eskildsen
072c12dc47 Localize errors in Liquid 2013-08-30 12:31:57 -04:00
Simon Eskildsen
29cdabc30e Move I18n to options 2013-08-30 12:31:57 -04:00
Simon Eskildsen
df5980f23f Change interpolation syntax to %{key} 2013-08-30 12:31:57 -04:00
Simon Eskildsen
5ee4f960e8 Move localization option to register 2013-08-30 12:31:57 -04:00
Simon Eskildsen
0343f6dc94 Add escaping of symbols 2013-08-30 12:31:57 -04:00
Simon Eskildsen
40fba9ee6c Add locale to context registers 2013-08-30 12:31:57 -04:00
Simon Eskildsen
0a2f21386d Add fixture helper 2013-08-30 12:31:57 -04:00
Simon Eskildsen
e7bcf04d1d Remove delegate require from localization 2013-08-30 12:31:57 -04:00
Simon Eskildsen
0dac6fe88a Change to absolute path in localization test 2013-08-30 12:31:57 -04:00
Simon Eskildsen
f37a984fd7 Add sketch of I18n error translation 2013-08-30 12:31:57 -04:00
Tristan Hume
0e41c2c6e9 Merge pull request #235 from Shopify/recursive-parsing
Add a Real Parser. Closes #229 and closes #225.
2013-08-30 07:12:38 -07:00
Tristan Hume
7b52dfcb95 Clean up lexer logic 2013-08-27 16:36:22 -04:00
Tristan Hume
1fa029ab67 Simplify lexer logic. 2013-08-27 11:35:03 -04:00
Tristan Hume
26eb9a0817 Merge pull request #244 from Shopify/proper-parse-warnings
Add Better Parse Warnings To recursive-parser Branch
2013-08-27 06:53:34 -07:00
Tristan Hume
e305edc3b8 Remove extra comment 2013-08-27 09:53:06 -04:00
Tristan Hume
c94b5e87c9 Use attr_reader for warnings. 2013-08-22 16:16:28 -04:00
Tristan Hume
dd3196b22e Consistency in warnings. 2013-08-22 16:15:12 -04:00
Tristan Hume
86ba2f4174 Fix error message 1.8 compatibility 2013-08-22 13:23:44 -04:00
Tristan Hume
5bdfb62bf2 Remove old warning method 2013-08-22 12:57:16 -04:00