Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-15 08:50:45 -07:00
Code Issues Packages Projects Releases Wiki Activity
784 Commits 314 Branches 70 Tags
5068fcae0380287c8d875754d30fa0d233683a1a
Commit Graph
443 Commits
Author SHA1 Message Date
Justin Li 5068fcae03 Bump version to 3.0.5 2015-07-23 17:04:50 -04:00
Florian Weingarten ebbfb54de4 Bump version 2015-07-17 11:20:01 -04:00
Florian Weingarten 8f84ddb5ce Fix chained access to multi-dimensional hash 2015-07-17 11:19:38 -04:00
Justin Li 09de50dcb1 Bump version to 3.0.3 2015-05-28 16:39:10 -04:00
Justin Li 49f2af4209 Merge pull request #570 from Shopify/fix-strict-conditions 
Fix condition parse order in strict mode
 2015-05-28 16:37:43 -04:00
Florian WeingartenandFlorian Weingarten 291b58bc91 Merge pull request #489 from alex-ross/patch-1 
Fixes syntax error in documentation for unless tag
 2015-04-24 11:27:42 -04:00
Florian Weingarten 8c193e203f bump version 2015-04-24 11:25:16 -04:00
Justin LiandFlorian Weingarten 47dbcd93a5 Merge pull request #551 from Shopify/expose-variable-name 
Merge pull request 551
 2015-04-24 11:23:35 -04:00
Dylan Thacker-Smith 000d0c911b Merge pull request #519 from Shopify/remove-filter-method-blacklist 
Allow filters to redefine Object methods to make them invokable.
 2015-02-04 18:09:51 -05:00
Arthur Neves 95b340a7cf Bump to version 3.0.1 2015-01-23 10:45:47 -05:00
Florian WeingartenandArthur Neves cbc163ba1c Merge pull request #506 from Shopify/fix_capture_with_hyphen 
Use VariableSignature as Syntax for Capture tag to allow hyphens in variable names
 2015-01-23 10:37:52 -05:00
Arthur Nogueira Neves 9faf8f9a56 Merge pull request #504 from alfredxing/duplicate-keys 
Remove duplicate `index0` key in TableRow tag
 2015-01-23 10:14:19 -05:00
Florian Weingarten d6db28c854 Revert "Merge pull request #463 from Shopify/stricter-identifiers" 
This reverts commit a056f6521c, reversing
changes made to 7843bcca8d.
 2014-11-07 01:49:01 +00:00
Florian Weingarten 475ea51f1f Revert "Merge pull request #466 from Shopify/remove-expression-cache" 
This reverts commit d9ae36ec40, reversing
changes made to 2da9d49478.
 2014-11-07 01:48:51 +00:00
Florian Weingarten 9c33e9601b Revert "Merge pull request #476 from Shopify/missing-variable-name-error" 
This reverts commit 4dc682313f, reversing
changes made to a8f60ff6b1.
 2014-11-07 01:48:16 +00:00
Florian Weingarten b242a7273a Revert "Merge pull request #478 from Shopify/numbers-in-identifiers" 
This reverts commit 263e90e772, reversing
changes made to 4dc682313f.
 2014-11-07 01:48:05 +00:00
Florian Weingarten 4b1835e3c0 Revert "Merge pull request #458 from Shopify/block-body" 
This reverts commit 12d526a05c, reversing
changes made to 263e90e772.

Conflicts:
	lib/liquid/block_body.rb
 2014-11-07 01:47:47 +00:00
Florian Weingarten 2fe3a21a5d Revert "Merge pull request #479 from Shopify/tweaks-for-c" 
This reverts commit aa182f64b4, reversing
changes made to 70c45f8cd8.
 2014-11-07 01:46:59 +00:00
Justin Li e5fd4d929f Coerce regex @blank output to a boolean 2014-11-05 20:44:06 -05:00
Justin Li 098c89b5f5 Convenience methods for raising terminator syntax errors 2014-11-04 18:38:08 +00:00
Dylan Thacker-SmithandJustin Li 15e1d46125 Avoid storing options instance variable in BlockBody. 
There is no need to pass parse options to the BlockBody initializer, since
it does all the parsing in the parse method, unlike tags which parse the
tag markup in the initializer.
 2014-11-03 17:07:42 -05:00
Dylan Thacker-SmithandJustin Li 73fcd42403 Create a BlockBody class to decouple block body parsing from tags. 2014-11-03 17:07:42 -05:00
Justin Li 81770f094d Remove unnecessary + 2014-10-29 13:39:43 -04:00
Justin Li dd5ee81089 Disallow number and dash identifier prefixes 2014-10-29 12:08:00 -04:00
Justin Li a07e382617 Use a single token for identifiers 2014-10-29 11:28:41 -04:00
Justin Li 5616ddf00e Remove obsolete comment 2014-10-27 13:44:14 -04:00
Justin Li fcb23a4cd2 Disallow filters with no variable in strict mode 2014-10-27 13:34:27 -04:00
Justin Li a206c8301d Fix test leaking error_mode, fix equality check for VariableLookup 2014-10-22 15:40:41 -04:00
Justin Li 5d68e8803f Ensure nil works as a variable name 2014-10-21 14:03:10 -04:00
Justin Li dedd1d3dc0 Fix case where a variable name is falsy 2014-10-21 12:09:26 -04:00
Dylan Thacker-Smith b9ac3fef8f Remove the quotes from the partial string in the profiler timing objects. 2014-10-18 16:26:18 -04:00
Dylan Thacker-Smith f5faa4858c Remove parsed expression cache. 2014-10-18 15:03:40 -04:00
Dylan Thacker-Smith bc5e444d04 Use Expression.parse and Context#evaluate in the Include class. 2014-10-18 15:03:40 -04:00
Dylan Thacker-Smith 3a4b63f37e Use Expression.parse and Context#evaluate in the TableRow class. 2014-10-18 15:03:40 -04:00
Dylan Thacker-Smith a1a128db19 Refactor Condition so that it takes a parsed expression. 2014-10-18 15:03:40 -04:00
Dylan Thacker-Smith d502b9282a Use Expression.parse and Context#evaluate in the For class. 2014-10-18 15:03:36 -04:00
Dylan Thacker-Smith fee8e41466 Use Expression.parse and Context#evaluate in the Cycle class. 2014-10-18 14:27:58 -04:00
Dylan Thacker-Smith 37260f17ff Use Expression.parse and Context#evaluate in the Condition class. 2014-10-18 14:27:58 -04:00
Florian Weingarten 7196a2d58e Avoid parallel assignments 2014-10-18 13:58:32 +00:00
Justin Li de16db9b72 Don't allow - to end a variable name 2014-10-17 13:38:07 -04:00
Justin Li b4ea483c4e Separate ? and - into special tokens 2014-10-17 13:30:54 -04:00
Justin Li 7843bcca8d Merge pull request #443 from Shopify/completely-parse-variables 
Parse expressions in Liquid::Variable#parse.
 2014-10-17 13:12:46 -04:00
Florian Weingarten f9318e8c93 flat_map 2014-10-17 16:11:12 +00:00
Florian Weingarten 0fa075b879 Use pop over shift to avoid reverse 2014-10-15 19:26:39 +00:00
Dylan Thacker-Smith a67e2a0a00 Remove unused Block#end_tag method. 
Although the method is called, it is defined with an empty body and not
overridden to do anything else.
 2014-10-14 02:58:11 -04:00
Dylan Thacker-Smith f387508666 Parse expressions in Liquid::Variable#parse. 2014-10-08 21:06:59 -04:00
Florian Weingarten 584b492e70 Line numbers for all parse errors 2014-10-03 21:00:31 +00:00
Dylan Thacker-Smith cf5ccede50 Avoid modifying the default resources limits hash. 2014-10-01 18:51:06 -05:00
Evan Huus eeb061ef44 Address code review comments 
- clean up comment wording
- fix potentially leaky tests
 2014-09-16 17:23:26 +00:00
Evan Huus 1d151885be Auto-untaint variables passed through 'escape' 2014-09-16 17:23:26 +00:00