Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-19 10:52:48 -07:00
Code Issues Packages Projects Releases Wiki Activity
1,441 Commits 317 Branches 71 Tags
bf64239ea677652710d2a409b7e02eae787a0913
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dylan Thacker-SmithandGitHub 4fba61a802 Merge pull request #1402 from Shopify/rubocop-shopify 
Use the rubocop-shopify gem and autocorrect
 2021-03-16 17:39:09 -04:00
Dylan Thacker-SmithandGitHub 6b6baece25 Merge pull request #1406 from ADTC/patch-2 
Add a line to Sign the CLA as the first step in Workflow
 2021-02-26 09:03:40 -05:00
Dylan Thacker-Smith 9dac68cce1 Use the rubocop-shopify gem 2021-02-21 12:22:03 -05:00
Dylan Thacker-Smith c50509b741 Commit rubocop remote configuration update 2021-02-21 12:02:55 -05:00
Dylan Thacker-Smith cd66572514 Rubocop autocorrections to prepare for rubocop config updates 2021-02-21 12:01:59 -05:00
Dylan Thacker-SmithandGitHub dcb5a67089 performance: Use split limit in truncatewords (#1361) 2021-02-19 13:11:35 -05:00
Dylan Thacker-SmithandGitHub 8625e66453 CI: Test with ruby 3.0 as the latest ruby version (#1398) 2021-02-10 10:10:27 -05:00
Dylan Thacker-SmithandGitHub 260c863e23 Build the tokenizer through the parse context for liquid-c (#1386) 2021-01-07 14:51:41 -05:00
Dylan Thacker-SmithandGitHub 7ba0fc7952 Merge pull request #1376 from Shopify/support-app-liquid-context 
Use the same context class for isolated subcontexts for the require tag
 2020-12-14 12:12:46 -05:00
Dylan Thacker-Smith 40a9b72b3c Allow a block to finish context init before squashing instance assigns 
Liquid::Context#squash_instance_assigns_with_environments can result in
Proc objects in the environment to be eagerly evaluated. So it should be
possible to finish initializing the context object before this is done.
Allowing a block to be used for this purpose avoids the need to add
additional parameters for this purpose.
 2020-12-11 14:52:09 -05:00
Dylan Thacker-Smith 4ff26cd707 Use the same context class for isolated subcontexts for the require tag 2020-12-11 14:52:09 -05:00
Dylan Thacker-SmithandGitHub 462919a28f Merge pull request #1375 from Shopify/update-rubocop 
Update rubocop and related configuration
 2020-12-11 14:47:56 -05:00
Dylan Thacker-Smith f3e2be9f85 Update rubocop 2020-12-11 14:14:15 -05:00
Dylan Thacker-Smith 4d40f83457 Update .rubocop_todo.yml to ignore Lint/MissingSuper offenses in drops 
I don't think we can rely on the application to call `super` in their
drop's initializers at the moment, so doing that consistently in liquid
would prevent this from being properly tested.
 2020-12-11 14:14:15 -05:00
Dylan Thacker-Smith 00be1e4dd4 Update inherited rubocop shopify style guide configuration 2020-12-11 14:14:15 -05:00
Dylan Thacker-Smith f7d67b946e rubocop autocorrect Style/MethodCallWithArgsParentheses 2020-12-11 13:51:00 -05:00
Dylan Thacker-SmithandGitHub 6dec172743 Merge pull request #1366 from Shopify/profile-render-node 
Create top-level profile timing nodes for multiple template renders
 2020-12-09 10:07:31 -05:00
Dylan Thacker-Smith da581d988a Create top-level profile timing nodes for multiple template renders 2020-12-09 10:06:02 -05:00
Dylan Thacker-Smith 7960826552 Rename render_profiling_test.rb to profiler_test.rb 
so it corresponds to the class name being tested
 2020-12-09 10:06:02 -05:00
Dylan Thacker-SmithandGitHub 84059691b8 Merge pull request #1365 from Shopify/profiling-multiple-renders 
Support using a profiler for multiple renders
 2020-12-09 10:05:48 -05:00
Dylan Thacker-Smith 896288eff1 Move start of profiling to a Document#render_to_output_buffer patch 2020-12-09 10:04:34 -05:00
Dylan Thacker-Smith b3f132efd1 Fix total_render_time if a Profiler gets used for multiple renders 2020-12-09 10:04:34 -05:00
Dylan Thacker-SmithandGitHub 60214b957c Store the profiler in the context instead of a thread-local variable (#1364) 2020-12-09 10:04:20 -05:00
Dylan Thacker-SmithandGitHub 7361220af6 Merge pull request #1363 from Shopify/profiler-context-template-name 
Fix template name in profile result for render tag timing objects
 2020-12-09 10:03:42 -05:00
Dylan Thacker-Smith cb2ad71a31 Remove the Profiler#initialize argument which is effectively now unused 
The @root_timing Timing object that it was used with never exposed that
name.
 2020-12-09 10:01:16 -05:00
Dylan Thacker-Smith 900e3a6491 Fix template name in profile result for render tag timing objects 2020-12-09 10:01:16 -05:00
Dylan Thacker-SmithandGitHub f18084203d Use monotonic time to measure durations in Liquid::Profiler (#1362) 2020-12-09 10:00:44 -05:00
Dylan Thacker-SmithandGitHub 1850511334 Use an atomic subgroup in range regex to avoid pathological backtracking (#1360) 2020-11-16 10:29:36 -05:00
Dylan Thacker-SmithandGitHub 8f7f8761d1 Use Array#each instead of Array#inject to avoid an object allocation (#1341) 2020-10-29 11:24:19 -04:00
Dylan Thacker-SmithandGitHub ea6e326b9c Fix FrozenError for blank case tag with multiple expression when tag (#1340) 2020-10-28 13:37:17 -04:00
Dylan Thacker-SmithandGitHub 7754d5aef5 Attempt to strict parse variables before lax parsing in lax error mode (#1338) 2020-10-28 10:37:00 -04:00
Dylan Thacker-SmithandGitHub 1d63d5db5f Fix a leaky test that set Tempate.error_mode without resetting it (#1339) 2020-10-28 10:36:33 -04:00
Dylan Thacker-SmithandGitHub f23c2a83f2 Fix lax parsing expressions surrounded by spaces (#1335) 
to make it compatible with strict parsing and liquid-c
 2020-10-27 14:53:57 -04:00
Dylan Thacker-SmithandGitHub 10ea6144e0 Add Liquid::ParseContext#parse_expression for liquid-c node disabling (#1333) 
We would like to be able to disable liquid-c VM rendering at runtime,
but right now expression parsing is done using Expression.parse, which
isn't aware of the parse context.  That prevents us from conditionally
compiling to VM code based on a parse option.
 2020-10-27 11:00:04 -04:00
Dylan Thacker-SmithandGitHub 4c6166f989 Add parsing quirk test for lookup on variable with literal name (#1325) 2020-10-21 16:30:17 -04:00
Dylan Thacker-SmithandGitHub f6532de1fd Merge pull request #1323 from Shopify/assign-score-hash 
Avoid allocating arrays of key value pairs in assign_score_of
 2020-10-21 11:18:35 -04:00
Dylan Thacker-Smith 001fde7694 Avoid allocating arrays of key value pairs for hashes in assign_score_of 2020-10-21 10:36:00 -04:00
Dylan Thacker-Smith b872eac2b9 More comprehensively test assign_score_of 2020-10-21 10:35:56 -04:00
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