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
767 Commits 314 Branches 70 Tags
cbc163ba1c48943040cf59f501f9a2f4526a9c39
Commit Graph
767 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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.
v3.0.0 		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 76ef675eb2 Merge pull request #481 from Shopify/fix-nil-blank 
Coerce regex @blank output to a boolean
 2014-11-06 13:03:15 -05:00
Justin Li e5fd4d929f Coerce regex @blank output to a boolean 2014-11-05 20:44:06 -05:00
Justin Li 2e42c7be1f Merge pull request #480 from Shopify/number_variables 
Add quirks test for variables with number prefixes
 2014-11-05 12:05:21 -05:00
Justin Li 95b031ee04 Add quirks test for extra dots in ranges 2014-11-05 11:41:12 -05:00
Justin Li 4d97a714a9 Add quirks test for variables with number prefixes 2014-11-05 10:56:58 -05:00
Justin Li aa182f64b4 Merge pull request #479 from Shopify/tweaks-for-c 
Tweaks for C
 2014-11-04 14:02:14 -05:00
Justin Li 4e870302b1 Add env var for saving stackprof graphviz output 2014-11-04 18:38:14 +00:00
Justin Li 098c89b5f5 Convenience methods for raising terminator syntax errors 2014-11-04 18:38:08 +00:00
Justin Li 70c45f8cd8 Use SVG badge URLs 
[ci skip]
 2014-11-03 17:41:42 -05:00
Justin Li 12d526a05c Merge pull request #458 from Shopify/block-body 
Create a BlockBody class to decouple block body parsing from tags.
 2014-11-03 17:34:39 -05:00
Dylan Thacker-SmithandJustin Li 2fd8ad08c0 Remove unused local variable that was accidentally added. 2014-11-03 17:07:42 -05: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 263e90e772 Merge pull request #478 from Shopify/numbers-in-identifiers 
Use a single token for identifiers
 2014-10-30 21:59:26 -04: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 4dc682313f Merge pull request #476 from Shopify/missing-variable-name-error 
Disallow filters with no variable in strict mode
 2014-10-27 13:56:11 -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 a8f60ff6b1 Merge pull request #472 from Shopify/fix-leaky-test 
Fix test leaking error_mode, fix equality check for VariableLookup
 2014-10-23 10:12:41 -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 ee0de01480 Merge pull request #469 from Shopify/falsy-variable-fix 
Fix case where a variable name is falsy
 2014-10-21 15:06:34 -04:00
Justin Li 887b05e6ed Clarify test name 2014-10-21 14:06:30 -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 d9ae36ec40 Merge pull request #466 from Shopify/remove-expression-cache 
Remove expression cache
 2014-10-20 13:57:17 -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 2da9d49478 Merge pull request #465 from Shopify/avoid_multi_assigns 
Avoid parallel assignments
 2014-10-18 16:19:02 +02:00
Florian Weingarten 7196a2d58e Avoid parallel assignments 2014-10-18 13:58:32 +00:00
Justin Li a056f6521c Merge pull request #463 from Shopify/stricter-identifiers 
Separate ? and - into special tokens
 2014-10-17 13:45:48 -04: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 76ea5596ff Merge pull request #462 from Shopify/flat_map 
nodelist flat_map over map.flatten
 2014-10-17 18:32:00 +02:00