Evan Huus
23622a9739
Merge pull request #440 from Shopify/drop-tainting
...
Variable tainting
2014-09-22 13:43:35 -04:00
Florian Weingarten
7ba5a6ab75
Merge pull request #450 from Shopify/additional_test_for_includes
...
Regression test for including assignments
2014-09-18 21:05:37 +02:00
Florian Weingarten
be3d261e11
Regression test for including assignments
2014-09-18 10:37:44 +00: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
67b2c320a1
Add tainting 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
Evan Huus
e836024dd9
Check and handle when a tainted variable is used
2014-09-16 17:23:26 +00:00
Dylan Thacker-Smith
638455ed92
Merge pull request #448 from Shopify/remove-unused-filter-not-found-error
...
Remove Liquid::FilterNotFoundError since it is never raised.
2014-09-15 17:43:33 -04:00
Dylan Thacker-Smith
b2a74883e9
Remove Liquid::FilterNotFoundError since it is never raised.
2014-09-15 17:42:07 -04:00
Dylan Thacker-Smith
6875e5e16f
Merge pull request #449 from Shopify/fix-flaky-total-render-time-test
...
Fix flaky test which assumes total_render_time can't be 0.
2014-09-15 17:41:41 -04:00
Dylan Thacker-Smith
a5717a3f8d
Fix flaky test which assumes total_render_time can't be 0.
...
jruby has millisecond precision for Time.now, so total_render_time can be 0
due to this lack of precision.
2014-09-15 17:26:55 -04:00
Dylan Thacker-Smith
804fcfebd1
Merge pull request #444 from Shopify/remove-block-children
...
Avoid keeping track of two lists of nodes during parsing.
2014-09-15 09:56:08 -04:00
Dylan Thacker-Smith
b37ee5684a
Merge pull request #445 from Shopify/prefer-super-over-render-all
...
Use super rather than render_all in single block render classes.
2014-09-15 09:53:54 -04:00
Dylan Thacker-Smith
0573b63b4c
Use super rather than render_all in single block render classes.
2014-09-12 16:58:07 -04:00
Dylan Thacker-Smith
29c21d7867
Avoid keeping track of two lists of nodes during parsing.
2014-09-12 16:43:00 -04:00
Dylan Thacker-Smith
478eb893a9
Merge pull request #439 from Shopify/default-resource-limits
...
Make it easy to set default resource limits.
2014-09-11 14:27:52 -04:00
Dylan Thacker-Smith
eae29f8c48
Make it easy to set default resource limits.
2014-09-11 13:54:30 -04:00
Florian Weingarten
4004cb63a5
Merge pull request #419 from Shopify/liquid_error_line_numbers
...
Optional line numbers for liquid errors
2014-09-08 23:15:53 +02:00
Jason Hiltz-Laforge
aafdf4adb0
Fix JRuby builds
2014-09-08 20:41:22 +00:00
Florian Weingarten
debac5dd0b
Revert "move line number check"
...
This reverts commit 939365c234
2014-09-06 10:21:17 -04:00
Florian Weingarten
ce06ed4bb1
merge conflicts
2014-09-05 14:16:20 +00:00
Florian Weingarten
939365c234
move line number check
2014-09-05 14:12:30 +00:00
Florian Weingarten
c60fd0715d
remove unnecessary nil
2014-09-05 14:12:30 +00:00
Florian Weingarten
c83e1c7b6d
prefix for Liquid::Error instances
2014-09-05 14:12:30 +00:00
Florian Weingarten
aabbd8f1a1
remove unnecessary method
2014-09-05 14:12:30 +00:00
Florian Weingarten
60d8a213a5
Clean up Liquid::Error#render
2014-09-05 14:12:30 +00:00
Florian Weingarten
17cc8fdbb3
put line number in parentheses
2014-09-05 14:12:30 +00:00
Tristan Hume and Florian Weingarten
27c1019385
Add line numbers to warnings
2014-09-05 14:12:30 +00:00
Tristan Hume and Florian Weingarten
3a0ee6ae91
Remove parser switching duplication
2014-09-05 14:12:29 +00:00
Florian Weingarten
5eff375094
Optional line numbers for liquid errors
2014-09-05 14:12:29 +00:00
Tristan Hume
2df643ba18
Merge pull request #425 from Shopify/pass-options-include
...
Pass options through on include
2014-08-26 13:40:06 -04:00
Tristan Hume
68af2d6e2a
Pass options to include tags
2014-08-26 10:50:25 -04:00
Arthur Nogueira Neves
dfb6c20493
Merge pull request #423 from bogdan/contains-with-integer
...
Fixed condition constains operator with wrong data type
2014-08-18 14:58:08 -04:00
Bogdan Gusiev
4e9d414fde
Fixed condition constains operator with wrong data type
...
"contains" operator on wrong data type should not cause NoMethodError.
2014-08-18 17:32:29 +03:00
Florian Weingarten
c0ec0652ae
Merge pull request #421 from djreimer/url-encode-filter
...
Add url_encode standard filter
2014-08-15 20:05:39 +02:00
Derrick Reimer
f8c3cea09b
Add url_encode filter to history
2014-08-15 11:03:06 -07:00
Derrick Reimer
0b847e553c
Add url_encode standard filter
2014-08-15 08:45:40 -07:00
Florian Weingarten
c2663258be
Merge pull request #364 from collectiveidea/instrument-rendering-with-hooks
...
Profiling the rendering of a liquid template
2014-08-13 23:04:29 +02:00
Tristan Hume
d4654d0062
Merge pull request #417 from Shopify/simplify-regex
...
Simplify Variable Parsing Regexes
2014-08-13 12:07:35 -04:00
Tristan Hume
ffd4f9d959
Simplify secondary filter regex
2014-08-13 09:36:02 -04:00
Tristan Hume
292161865d
Simplify filter parse regex
2014-08-13 09:28:01 -04:00
Florian Weingarten
35808390ee
Merge pull request #414 from Shopify/to_liquid_context
...
Call to_liquid in Context invoke
2014-08-12 22:05:52 +02:00
Florian Weingarten
1678c07548
Call to_liquid in Context invoke
2014-08-12 19:54:12 +00:00
Jason Roelofs
173a58d36a
Profile liquid rendering
...
Add a simple profiling system to liquid rendering. Each
liquid tag ({{ }} and {% %}) is processed through this profiling,
keeping track of the partial name (in the case of {% include %}), line
number, and the time it took to render the tag. In the case of {%
include %}, the profiler keeps track of the name of the partial and
properly links back tag rendering to the partial and line number for
easy lookup and dive down. With this, it's now possible to track down
exactly how long each tag takes to render.
These hooks get installed and uninstalled on an as-need basis so by
default there is no impact on the overall liquid execution speed.
2014-08-12 15:37:21 -04:00
Tristan Hume
f31e309770
Merge pull request #416 from Shopify/filter-quirks
...
Make Filter Quirks Tests Actual Integration Tests
2014-08-12 10:08:05 -04:00
Tristan Hume
ffe1036e15
Make tests actual integration tests
2014-08-12 09:27:46 -04:00
Dylan Thacker-Smith
d3b113d2e1
Merge pull request #391 from Shopify/extract-context-parse
...
Separate expression parsing and rendering from Context#[]
2014-08-11 14:17:54 -07:00
Dylan Thacker-Smith
2aa9bbbac2
Separate expression parsing and rendering from Context#resolve.
2014-08-11 14:15:58 -07:00
Tristan Hume
d5e57a8ea4
Merge pull request #412 from Shopify/assign-strict
...
Pass through options on assign tag
2014-08-11 15:37:49 -04:00
Florian Weingarten
5c0e0be639
Merge pull request #402 from Shopify/benchmark-ips
...
benchmark/ips
2014-08-11 21:22:43 +02:00
Evan Huus