Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-10-03 00:55:11 -07:00
Code Issues Packages Projects Releases Wiki Activity
950 Commits 318 Branches 71 Tags
77bdccf5ec3e1d7e039d2a97974bb5150ad4dc8b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Li b42d35ff36 Merge pull request #620 from Shopify/accept-invalid-range-args 
Add param to accept invalid input in to_integer
 2015-07-09 13:24:28 -04:00
Justin Li b4e133e26f Fix regression in range lookup 2015-07-09 13:21:46 -04:00
Justin Li 1f9bd1d809 Add param to accept invalid input in to_integer 2015-07-09 13:18:06 -04:00
Justin Li e88be60818 Merge pull request #618 from Shopify/move-reraise-for-line-number 
Move the syntax error rescue for adding error line numbers.
 2015-07-09 11:42:41 -04:00
Justin Li afda01adbb Merge pull request #616 from Shopify/handle-non-int-range-args 
Handle non-int range lookup arguments
 2015-07-08 17:47:27 -04:00
Justin Li 959cd6d2a2 Temporarily disable rubinius in CI 
It takes much longer than the others and is currently broken
 2015-07-08 17:47:05 -04:00
Justin Li 4c1b89e20e Add regression test for ranges on non-integer types 2015-07-08 17:41:18 -04:00
Justin Li 83b6dd0268 Use to_integer for range lookup arguments 2015-07-08 17:37:07 -04:00
Justin Li 6fb402e60d Move to_integer, to_date, and to_number to Liquid::Utils 2015-07-08 17:33:05 -04:00
Justin Li 9cf0d264e1 Require RuboCop v0.32.0 or later 2015-07-06 15:58:36 -04:00
Justin Li 575e3cae7a Remove class length metric cop 2015-07-06 15:52:11 -04:00
Justin Li 8cb2364179 Merge pull request #608 from Shopify/tag-tag_name 
Add Liquid::Tag#tag_name
 2015-07-02 16:28:37 -04:00
Justin Li 8a8de46c6a Merge pull request #603 from Shopify/format-history 
Format changelog attribution to include one name only
 2015-06-23 07:40:05 -07:00
Justin Li 58c7f226cc Format changelog attribution to include one name only 2015-06-19 11:45:37 -04:00
Justin Li adfcd0ab13 Update history to reflect merge of #600 
[ci skip]
 2015-06-19 11:38:59 -04:00
Justin Li 30ef7d14b0 Merge pull request #600 from carsonreinke/filter-compact 
Merge pull request 600
 2015-06-19 11:38:14 -04:00
Justin Li 9b98c436c4 Merge pull request #582 from Shopify/require-empty-raw-tag 
Ensure raw tag has no arguments
 2015-06-02 15:58:15 -04:00
Justin Li 889019f53a Keep old test as well 2015-06-02 15:21:51 -04:00
Justin Li c290375aec Remove unnecessary regex options 2015-06-02 15:17:36 -04:00
Justin Li 719a98a25e Ensure raw tag has no arguments 2015-06-02 14:32:39 -04:00
Justin Li 86d8b552da Merge pull request #581 from Shopify/require-closed-raw-tag 
Raise SyntaxError if raw tag is unclosed
 2015-06-02 11:38:45 -04:00
Justin Li b1ee9129e7 Raise SyntaxError if raw tag is unclosed 2015-06-02 10:56:51 -04:00
Justin Li be2e41e4d5 Merge pull request #579 from Shopify/ast-match 
Ensure For@reversed is a boolean
 2015-05-28 16:45:09 -04:00
Justin Li 20ca2b9632 Update history to reflect merge of #570 
[ci skip]
 2015-05-28 16:43:22 -04:00
Justin Li 6c058823ad Merge pull request #570 from Shopify/fix-strict-conditions 
Fix condition parse order in strict mode
 2015-05-28 16:33:54 -04:00
Justin Li a639a13380 Use cleaner recursive solution 2015-05-28 16:16:30 -04:00
Justin Li 05a0fe56c8 Ensure For@reversed is a boolean 2015-05-28 16:09:26 -04:00
Justin Li a9c7df931f Strict parse conditions in reverse order 2015-05-19 11:51:01 -04:00
Justin Li 070639daba Push to for_stack at the beginning of For#render 2015-05-15 23:13:15 -04:00
Justin Li dad98cfc89 Merge pull request #562 from Shopify/use-find_variable-for-parentloop 
Use custom stack for forloop references
 2015-05-15 21:48:57 -04:00
Justin Li 648a4888af Pop the for_stack register in an ensure 2015-05-14 15:02:20 -04:00
Justin Li b4e5017c79 Add truth table test for multiple if conditions 2015-05-14 14:11:03 -04:00
Justin Li f1bc9f27df Include message in assert_template_result 2015-05-14 14:10:45 -04:00
Justin Li 863e8968f0 Use extra stack for forloop references 2015-05-12 17:04:34 -04:00
Justin Li 4c9d2009f9 Add find_own_variable method to look up internal context variables 2015-05-12 16:49:39 -04:00
Justin Li 239cfa5a44 Use find_variable for parentloop 2015-05-12 16:11:32 -04:00
Justin Li 8a8996387b Update history to reflect merge of #554 
[ci skip]
 2015-05-12 13:20:06 -04:00
Justin Li 9310640bdd Merge pull request #554 from arthanzel/529-sort_natural 
Merge pull request 554
 2015-05-12 13:19:24 -04:00
Justin Li 4c3381a523 Update history to reflect merge of #559 
[ci skip]
 2015-05-12 10:59:58 -04:00
Justin Li 261aa2e726 Merge pull request #559 from Shopify/fix-include-var 
Merge pull request 559
 2015-05-12 10:50:13 -04:00
Justin Li 247c51ac70 Call Context#find_variable directly 2015-05-11 18:22:15 -04:00
Justin Li 37dbec3610 Remove unnecessary parse 2015-05-11 18:10:38 -04:00
Justin Li ff253a04c6 Lazily evaluate template name for context variable injection 2015-05-11 18:01:24 -04:00
Justin Li 25ef0df671 Add tests for #461 2015-05-11 17:59:05 -04:00
Justin Li 724d625f47 Update history to reflect merge of #555 [ci skip] 2015-05-07 14:03:38 -04:00
Justin Li f658dcee8b Merge pull request #555 from boobooninja/date_filter 
Merge pull request 555
 2015-05-07 13:59:22 -04:00
Justin Li 76c24db039 Remove ruby-head from allowed failures 2015-05-05 12:49:04 -04:00
Justin Li 6390652c3f Update changelog with backported patches 2015-04-24 16:09:37 -04:00
Justin Li f266aee2e5 Slightly more concise issue# reference in changelog 2015-04-21 23:40:42 -04:00
Justin Li df0649a031 Update changelog 2015-04-21 23:36:54 -04:00
Justin Li 78a5972487 Merge pull request #541 from Shopify/history-sync 
Sync History.md for Liquid 4
 2015-04-21 23:34:29 -04:00
Justin Li 298ae3357c Merge pull request #551 from Shopify/expose-variable-name 
Merge pull request 551
 2015-04-21 23:33:13 -04:00
Justin Li f1f3f57647 Remove command_lookups reader 2015-04-21 00:25:51 -04:00
Justin Li e5dd63e1fc Expose name, lookups, and command flags from VariableLookup 2015-04-20 17:36:04 -04:00
Justin Li 881f86d698 Merge pull request #550 from Shopify/minitest-fail-workaround 
Disable minitest expectation interface due to reckless modification of Object
 2015-04-20 10:22:19 -04:00
Justin Li a1b209d212 Disable minitest expectation interface due to reckless modification of Object 2015-04-20 10:15:19 -04:00
Justin Li b8365af07d Add changes for 4.0.0 2015-03-25 14:53:43 -04:00
Justin Li 53842a471e Create history section for 4.0.0 2015-03-25 14:40:19 -04:00
Justin Li 86a82d3039 Merge pull request #540 from Shopify/array-concat 
Add array concat filter
 2015-03-25 01:42:22 -04:00
Justin Li 2b78e74b4e Add test for concat filter with non-array input 2015-03-25 01:34:47 -04:00
Justin Li 3213db54d6 Merge pull request #520 from Shopify/forloop-parentloop 
Add forloop.parentloop as a reference to the parent loop
 2015-03-25 01:22:35 -04:00
Justin Li 97a3f145a1 Merge pull request #499 from kreynolds/to_date_downcase_regression 
Fix case sensitivity regression in date standard filter
 2015-03-25 01:22:04 -04:00
Justin Li 205bd19d3f Add forloop.parentloop as a reference to the parent loop 2015-02-04 12:43:09 -05:00
Justin Li e2f8b28f56 Merge pull request #492 from Shopify/resource-counting-perf 
Resource counting perf
 2014-12-11 16:05:41 -05:00
Justin Li 3080f95a4f Make render_length tests stricter 2014-12-11 10:41:47 -05:00
Justin Li cc57908c03 Add test for render_length persisting between block bodies 2014-12-11 10:38:47 -05:00
Justin Li 4df4f218cf Use same template instance 2014-12-09 17:25:15 -05:00
Justin Li c2f71ee86b Reset resource consumption before each render 2014-12-09 17:23:07 -05:00
Justin Li 9f7e601110 Convert render output to strings in BlockBody 2014-12-05 15:17:09 -05:00
Justin Li 3755031c18 Merge pull request #485 from Shopify/lazy-load-profiler-hooks 
Defer loading profiler hooks
 2014-12-05 15:10:16 -05:00
Justin Li b628477af1 Disambiguate checking if Liquid::Profiler is defined 2014-12-04 17:51:54 -05:00
Justin Li dd455a6361 Force user to require the profiler themselves 2014-12-04 17:48:26 -05:00
Justin Li 8c70682d6b Don't automatically load hooks 2014-12-04 17:39:41 -05:00
Justin Li 742b3c69bb Remove commented code 2014-12-04 16:30:37 -05:00
Justin Li 1593b784a7 Simplify interface for setting template resource limits 2014-12-04 16:18:21 -05:00
Justin Li db00ec8b32 Move resource limit tracking to its own class 2014-12-04 16:18:09 -05:00
Justin Li 3ca40b5dea Merge pull request #491 from Shopify/drop-ruby-1-9 
Drop Ruby 1.9 from CI, add Ruby head
 2014-12-03 12:52:10 -05:00
Justin Li 378775992f Drop Ruby 1.9 from CI, add Ruby head 2014-12-02 14:33:51 -05:00
Justin Li a0710f4c70 Merge pull request #486 from Shopify/fix-exponential-warnings 
Fix #warnings taking exponential time to compute
 2014-11-12 17:22:16 -05:00
Justin Li 737be1a0c1 Use Timeout#timeout for warnings tests 2014-11-12 17:03:48 -05:00
Justin Li 1673098126 Handle potential case where warnings returns nil 2014-11-12 16:46:10 -05:00
Justin Li 422bafd66a Fix #warnings taking exponential time to compute 2014-11-12 16:12:00 -05:00
Justin Li c0aab820ed Lazily load profiler hooks 2014-11-12 00:05:01 -05: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
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