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
1,350 Commits 314 Branches 70 Tags
038d0585cfc43ab2dbc3cee540de4d5a10347968
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dylan Thacker-Smith 038d0585cf Move some assign score increment tests to the tag that increments 2020-10-21 10:21:00 -04:00
Dylan Thacker-SmithandGitHub c9ad9d338c Extract method for raising a syntax error in the assign tag for liquid-c (#1321) 2020-10-20 16:59:52 -04:00
Dylan Thacker-SmithandGitHub ae6bd9f6b0 Allow an empty variable tag during strict parsing for liquid-c compat (#1320) 2020-10-20 14:11:48 -04:00
Dylan Thacker-SmithandGitHub 866e437c05 Test tag disabling using custom tags (#1318) 
Since I don't think we have any use case to disable the `raw` or
`echo` tags, so I would like liquid-c to not have to support that
 2020-10-19 16:32:02 -04:00
Dylan Thacker-SmithandGitHub 784db053f2 Merge pull request #1317 from Shopify/strict-parse-dynamic-find-var 
Fix strict parsing of find variable with a name expression
 2020-10-19 13:43:26 -04:00
Dylan Thacker-SmithandGitHub ff1c6bd26e Actually remove test file with no extension moved into another test file (#1316) 2020-10-19 12:40:02 -04:00
Dylan Thacker-Smith 46fd63da5f Fix strict parsing of find variable with a name expression 2020-10-19 12:17:25 -04:00
Dylan Thacker-Smith 420a1c79e1 Refactor variable lookup strict parsing to reduce coupling on dot lookup 2020-10-19 12:10:32 -04:00
Dylan Thacker-Smith 6d39050e1e Use a case statement in Liquid::Parser#expression 2020-10-19 12:10:11 -04:00
Dylan Thacker-SmithandGitHub 077bf2a409 Test reporting of liquid error for filter call with wrong number of arguments (#1311) 2020-10-08 11:55:40 -04:00
Dylan Thacker-SmithandGitHub 1a3e38c018 Merge pull request #1310 from Shopify/only-integration-test-liquid-c 
Fix liquid-c integration testing
 2020-10-08 11:52:50 -04:00
Dylan Thacker-Smith e495f75cc2 Remove support for ruby 2.4, which is no longer supported upstream 2020-10-08 09:48:16 -04:00
Dylan Thacker-Smith e781449c36 Remove root directory from library search path for tests 
It isn't in the gemspec's require_path, so we shouldn't add any dependence
on it.
 2020-10-08 01:53:11 -04:00
Dylan Thacker-Smith 7eb03ea198 Only test liquid-c integration using the integration tests 2020-10-08 01:52:40 -04:00
Dylan Thacker-SmithandGitHub d250a7f502 Set Context#initialize instance variables before squashing assigns (#1307) 2020-10-06 21:00:08 -04:00
Dylan Thacker-SmithandGitHub a818dd9d19 Fix test with missing extension (#1302) 2020-09-30 13:44:28 -04:00
Dylan Thacker-SmithandGitHub efef03d944 Merge pull request #1294 from Shopify/changes-for-liquid-c-vm-variable 
Refactor to support liquid-c VM compilation of variables
 2020-09-29 21:02:26 -04:00
Dylan Thacker-Smith 33760f083a Extract rescue code from BlockBody#render_node for re-use in liquid-c 2020-09-25 11:24:39 -04:00
Dylan Thacker-Smith 013802c877 Move some unit tests without internal coupling to integration tests 
since I would like to continue supporting these tests in liquid-c
in the foreseeable future.
 2020-09-25 11:24:39 -04:00
Dylan Thacker-Smith 3dcad3b3cd Move test/integration/parse_tree_visitor_test.rb to test/unit 
The ParseTreeVisitor exposes the liquid internals that won't be
kept compatible with liquid-c, so move it out of the integration
tests directory so that we can easily ignore it when testing liquid-c
 2020-09-25 11:24:39 -04:00
Dylan Thacker-Smith db065315ba Allow creating symbols that are garbage collected in a test 2020-09-25 11:24:39 -04:00
Dylan Thacker-SmithandGitHub a03f02789b Only use MethodLiteral in condition expressions (#1300) 2020-09-25 11:10:33 -04:00
Dylan Thacker-SmithandGitHub ca4b9b43af Port liquid-c bug compatible whitespace trimming (#1291) 2020-09-16 16:07:36 -04:00
Dylan Thacker-SmithandGitHub 77084930e9 Bring back silencing of errors in blank nodes for backwards compatibility (#1292) 2020-09-15 10:35:18 -04:00
Dylan Thacker-SmithandGitHub fb77921b15 Merge pull request #1290 from Shopify/document-unknown-tag-refactor 
Pass the tag markup and tokenizer to Document#unknown_tag
 2020-09-11 09:34:16 -04:00
Dylan Thacker-Smith 0d02dea20b Rename Liquid::Block#unknown_tag parameters for clarity 2020-09-11 09:33:12 -04:00
Dylan Thacker-Smith 86b47ba28b Pass the tag markup and tokenizer to Document#unknown_tag 
The parse_context no longer needs to be passed in because it is available
through through an attr_reader on the instance. However, the markup and
tokenizer weren't made available.  This refactor also makes the parameters
given to Document#unknown_tag consistent with Block#unknown_tag.
 2020-09-11 09:33:12 -04:00
Dylan Thacker-SmithandGitHub 95ff0595c6 Merge pull request #1289 from Shopify/refactor-for-c-block-body 
Avoid direct coupling to BlockBody instances for liquid-c replacement
 2020-09-11 09:15:58 -04:00
Dylan Thacker-Smith bbc56f35ec Add ParseContext#new_block_body to centralize the liquid-c override point 2020-09-09 12:25:35 -04:00
Dylan Thacker-Smith dfbbf87ba9 Use BlockBody from Document using composition rather than inheritence 
This way liquid-c can more cleanly use a Liquid::C::BlockBody object
for the block body by overriding Liquid::Document#new_body.
 2020-09-08 14:00:52 -04:00
Dylan Thacker-Smith 037b603603 Turn some Liquid::BlockBody methods into class methods for liquid-c 
So they can be used from a Liquid::C::BlockBody
 2020-09-08 14:00:48 -04:00
Dylan Thacker-Smith bd33df09de Provide Block#new_body so that liquid-c can override it 
This way liquid-c can return a body of a different class that wraps
a C implementation.
 2020-09-08 13:59:48 -04:00
Dylan Thacker-SmithandGitHub 6ca5b62112 Merge pull request #1285 from Shopify/fix-render-length-resource-limit 
Fix render length resource limit so it doesn't multiply nested output
 2020-09-08 13:57:30 -04:00
Dylan Thacker-Smith e1a2057a1b Update assign_score during capturing 
To stop long captures before they grow the heap more then they should.
 2020-09-03 11:13:08 -04:00
Dylan Thacker-Smith ae9dbe0ca7 Fix render length resource limit so it doesn't multiply nested output 2020-09-03 11:13:04 -04:00
Dylan Thacker-SmithandGitHub 3b486425b0 Handle BlockBody#blank? at parse time (#1287) 2020-09-03 11:07:13 -04:00
Dylan Thacker-SmithandGitHub b08bcf00ac Push interrupts from Continue and Break tags rather than from BlockBody (#1286) 2020-09-03 06:55:24 -04:00
Dylan Thacker-SmithandGitHub 0740e8b431 Remove unused quirk allowing liquid tags to close a block it is nested in (#1284) 2020-09-03 06:51:56 -04:00
Dylan Thacker-SmithandGitHub 5532df880f Handle disabled tags errors like other liquid errors (#1275) 2020-08-18 11:39:54 -04:00
Dylan Thacker-SmithandGitHub 2b11efc3ae Fix performance regression from introduction of Template#disable_tags (#1274) 2020-08-18 11:25:51 -04:00
Dylan Thacker-SmithandGitHub 1ced4eaf10 Merge pull request #1268 from Shopify/remove-taint-checking 
Remove support for taint checking
 2020-07-25 21:27:46 -04:00
Dylan Thacker-Smith 4970167726 Bump rake development dependency 
Gets rid of a deprecation warning when running the tests.
 2020-07-23 16:23:18 -04:00
Dylan Thacker-Smith 065ccbc4aa Remove support for taint checking 2020-07-23 16:22:46 -04:00
Dylan Thacker-SmithandGitHub bd0e53bd2e Merge pull request #1239 from Shopify/remove-bad-arity-assumption 
Fix ParseTreeVisitorTest for ruby-head
 2020-05-21 14:02:04 -04:00
Dylan Thacker-Smith c2f67398d0 Allow ruby-head failures 
Ignore an object allocation test failure on ruby-head for now.
 2020-03-31 10:53:49 -04:00
Dylan Thacker-Smith 81149344a5 Fix ParseTreeVisitorTest for ruby-head 2020-03-31 10:53:46 -04:00
Dylan Thacker-SmithandGitHub e9b649b345 Fix Liquid::Template inheritance (#1227) 
self.class.default_resource_limits would return `nil` in a subclass, since
the attribute isn't set on subclasses.
 2020-01-21 15:09:22 -05:00
Dylan Thacker-SmithandGitHub 48a155a213 Initialize Liquid::Template class attributes eagerly instead of lazily (#1223) 2020-01-10 17:42:01 -05:00
Dylan Thacker-SmithandGitHub c69a9a77c6 Merge pull request #1215 from Shopify/nested-liquid-tag 
Fix liquid tag nested in outer block
 2020-01-09 19:24:52 -05:00
Dylan Thacker-Smith ef79fa3898 style: Avoid deep nesting for parsing the liquid tag in the block body 2020-01-09 19:13:13 -05:00
Dylan Thacker-Smith f7ad602bfc Fix liquid tag nested in outer block 2020-01-09 19:13:13 -05:00
Dylan Thacker-SmithandGitHub ffd6049ba2 Merge pull request #1222 from Shopify/bump-ci-ruby 
Test against the latest ruby in CI
 2020-01-09 18:12:36 -05:00
Dylan Thacker-Smith b3ad54c0c2 Test against the latest ruby in CI 2020-01-09 13:15:34 -05:00
Dylan Thacker-Smith 67eca3f58d Upgrade rubocop and style guide for ruby 2.7 compatibility 2020-01-09 13:15:34 -05:00
Dylan Thacker-SmithandGitHub 8074565c3e Merge pull request #1216 from Shopify/unsupported-taint-mode 
Remove support for taint_mode on ruby versions that don't support it
 2020-01-07 10:12:36 -05:00
Dylan Thacker-Smith 22dbf90b7d Try to stay compatible with ruby-head 2019-12-19 11:12:55 -05:00
Dylan Thacker-Smith 40c68c9c83 Remove support for taint_mode on ruby versions that don't support it 2019-12-19 11:12:51 -05:00
Dylan Thacker-SmithandGitHub 5f0b64cebc Merge pull request #1005 from christopheraue/render_refactor 
Refactored and optimized rendering
 2018-04-19 16:44:57 -04:00
Dylan Thacker-SmithandGitHub 4369fe6c85 Improve the unexpected end delimiter message for block tags. (#1003) 2018-04-05 11:18:13 -04:00
Dylan Thacker-Smith 04d552fabb Gemfile: Use https rather than git protocol to fetch liquid-c 2018-02-01 07:08:19 -05:00
Dylan Thacker-SmithandGitHub 5106466a2d Add a regression test for a liquid-c trim mode bug (#972) 2018-01-25 10:55:01 -05:00
Dylan Thacker-SmithandGitHub 6c117fd7dd refactor: Reduce maximum block nesting in Liquid::BlockBody#parse (#944) 2017-10-19 10:12:40 -04:00
Dylan Thacker-SmithandGitHub 27c91203ab Use replacement string for replace filters literally (#924) 2017-08-28 11:51:20 -04:00
Dylan Thacker-SmithandGitHub 48a6d86ac2 Use stackprof to test to lack of object allocations (#896) 2017-05-12 09:20:51 -04:00
Dylan Thacker-SmithandGitHub 3bb29d5456 Replace assert_equal nil, with a assert_nil (#895) 2017-05-11 14:05:03 -04:00
Dylan Thacker-SmithandGitHub 9c72ccb82f Limit how much blocks can be nested during parsing (#894) 2017-05-11 09:37:53 -04:00
Dylan Thacker-SmithandGitHub 62d4625468 Use a loop to strictly parse binary comparisons to avoid recursion (#892) 
Using recursion allows a malicious template to cause a SystemStackError
 2017-05-10 10:41:52 -04:00
Dylan Thacker-SmithandGitHub 8928454e29 Use a loop to evaluate binary comparisions to avoid recursion (#891) 
Using recursion allows a malicious template to cause a SystemStackError
 2017-05-10 10:41:24 -04:00
Dylan Thacker-SmithandGitHub 27d5106dc9 Merge pull request #860 from Shopify/handle-string-node-render-exc 
Avoid calling line_number on String node when rescuing a render error.
 2017-02-10 14:13:11 -05:00
Dylan Thacker-Smith 7334073be2 Avoid duck typing to detect whether to call render on a node. 2017-02-10 13:49:26 -05:00
Dylan Thacker-Smith 5dcefd7d77 Avoid calling line_number on String node when rescuing a render error. 2017-02-07 15:34:10 -05:00
Dylan Thacker-SmithandGitHub 0c58328a40 test: Equality comparison of two hashes (#850) 2017-01-16 15:56:38 -05:00
Dylan Thacker-SmithandGitHub 2bb3552033 Fix internal liquid error when comparing hash with incompatible type (#849) 2017-01-16 13:13:17 -05:00
Dylan Thacker-SmithandGitHub 869dbc7ebf feature: Allow a default exception renderer to be specified (#837) 
This could be used to preserve the old default of rendering
non-Liquid::Error messages or for providing default behaviour like error
reporting which could be missed if the exception renderer needed to be
specified on each render.
 2016-12-12 10:29:09 -05:00
Dylan Thacker-SmithandGitHub fae3a2de7b Add version constraint to rake to fix CI (#836) 2016-12-09 14:01:15 -05:00
Dylan Thacker-SmithandGitHub f27bd619b9 change: Render an opaque internal error by default for non-Liquid::Error (#835) 
These errors may contain sensitive information, so is safer to
render a more vague message by default.

This is done by replacing non-Liquid::Error exceptions with a
Liquid::InternalError exception with the non-Liquid::Error accessible on
through the cause method. This also allows the template name and line
number to be attached to the template errors.

The exception_handler render option has been changed to exception_renderer
since now it should raise an exception to re-raise on a liquid rendering
error or return a string to be rendered where the error occurred.
 2016-12-07 17:34:29 -05:00
Dylan Thacker-Smith a9b84b7806 test: Use ruby 2.1 in Circle CI 2016-12-05 15:36:42 -05:00
Dylan Thacker-SmithandGitHub 6cc2c567c5 Merge pull request #832 from Shopify/drop-ruby-2.0 
Drop support for ruby 2.0
 2016-12-05 13:56:15 -05:00
Dylan Thacker-Smith 812e3c51b9 test: Add ruby 2.3.3 to CI 
Travis doesn't have a ruby 2.3 alias, so the latest 2.3.x version is
specified instead.
 2016-12-05 13:53:02 -05:00
Dylan Thacker-Smith 9dd0801f5c Drop support for ruby 2.0 
It is no longer maintained upstream
 2016-12-05 13:51:49 -05:00
Dylan Thacker-SmithandGitHub b146b49f46 fix: Clear the strainer cache when a global filter is added (#826) 2016-11-24 10:32:11 -05:00
Dylan Thacker-Smith 3ea84f095f Merge pull request #734 from Shopify/concat-liquid-error 
Raise a Liquid::Error when a non-array is passed into the concat filter.
 2016-03-31 15:47:43 -04:00
Dylan Thacker-Smith 4239c899a4 Raise a Liquid::Error when a non-array is passed into the concat filter. 2016-03-31 15:47:06 -04:00
Dylan Thacker-Smith 99b5e86f0a Merge pull request #680 from jcheatham/master 
Ensure truncate is operating on a string
 2015-12-23 18:41:39 -05:00
Dylan Thacker-Smith 5f8086572b Merge pull request #667 from Shopify/remove-empty-string-check 
Remove nil and empty string check in invoke_drop.
 2015-11-10 10:43:11 -05:00
Dylan Thacker-Smith bdb9a4a47f Remove nil and empty string check in invoke_drop. 2015-11-09 15:03:36 -05:00
Dylan Thacker-Smith c38eec0293 Merge pull request #665 from tanelj/escape_filter_nil_fix 
Fixed issue where "nil" value for "escape" filter breaks rendering
 2015-11-06 10:54:48 -05:00
Dylan Thacker-Smith d8bda2c892 Merge pull request #653 from Shopify/fix-rubocop-offenses 
Fix offenses from the new version of rubocop.
 2015-09-25 19:48:09 -04:00
Dylan Thacker-Smith 4f81c0a658 Lock rubocop version to avoid CI failures from new releases. 2015-09-25 19:42:35 -04:00
Dylan Thacker-Smith 704937bc00 Fix offenses from the new version of rubocop. 2015-09-25 19:34:44 -04:00
Dylan Thacker-Smith fa187665b3 Merge pull request #631 from Shopify/fix-tz-test-failure 
Fix a timezone test failure.
 2015-07-23 16:34:48 -04:00
Dylan Thacker-Smith cd0c5e954c Fix a timezone test failure. 2015-07-23 16:19:59 -04:00
Dylan Thacker-Smith 14416b3c49 Move the syntax error rescue for adding error line numbers. 2015-07-09 11:25:05 -04:00
Dylan Thacker-Smith bde14a650d Merge pull request #617 from Shopify/rename-options-iv 
Rename options instance variable in Variable and Tag.
 2015-07-08 20:50:20 -04:00
Dylan Thacker-Smith c535af021a Rename options instance variable in Variable and Tag. 2015-07-08 19:59:44 -04:00
Dylan Thacker-Smith 9c9345869b Merge pull request #614 from Shopify/remove-token-class 
Implement line numbers without the Liquid::Token class.
 2015-07-08 19:48:55 -04:00
Dylan Thacker-Smith 73834a7e52 Use reject rather than dup and delete. 2015-07-08 19:27:24 -04:00
Dylan Thacker-Smith c45310170b Use parse_context or options instead of @options. 2015-07-08 19:21:59 -04:00
Dylan Thacker-Smith 920e1df643 Rescue and re-raise syntax errors in Template#parse to add line numbers. 
This can be done now that the parse context has the line number
information, so it doesn't need to be added on closer to the original
exception.  This has the advantage of not having to rescue and re-raise the
exception multiple times, and simplifies liquid-c which would otherwise
have to rescue the exception in BlockBody#parse.
 2015-07-08 19:21:59 -04:00
Dylan Thacker-Smith cebf75b8d7 Implement line numbers without the Liquid::Token class. 2015-07-08 19:21:59 -04:00