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
27c1019385
Add line numbers to warnings
2014-09-05 14:12:30 +00:00
Tristan Hume
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
68af2d6e2a
Pass options to include tags
2014-08-26 10:50:25 -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
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
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
Dylan Thacker-Smith
2aa9bbbac2
Separate expression parsing and rendering from Context#resolve.
2014-08-11 14:15:58 -07:00
Tristan Hume
2809ec780a
Pass through options on assign tag
2014-08-11 10:38:36 -04:00
Jean Boussier
df6b442816
Cast input to string before spliting
2014-08-07 14:01:44 -04:00
Florian Weingarten
fb6f9c1c13
Slice filter for arrays.
2014-08-05 17:59:31 +00:00
Florian Weingarten
66ae7f3ec0
Merge pull request #406 from Shopify/slice_filter
...
slice filter
2014-08-05 17:14:01 +02:00
Florian Weingarten
0bea31d2ef
Use Integer() instead of to_i
2014-08-05 15:13:15 +00:00
Florian Weingarten
e5b0487fef
Merge pull request #312 from Shopify/uniq_filter
...
uniq filter
2014-08-05 16:22:48 +02:00
Florian Weingarten
9117722740
Use symbols in respond_to?
2014-08-05 14:22:11 +00:00
Florian Weingarten
baea0a6bf7
slice filter
2014-08-04 16:47:08 +00:00
Tom Burns
794ca9f604
make the conditions around stack creation easier to read
2014-07-30 15:42:24 +00:00
Tom Burns
15f6cabf83
avoid a hash comparison
2014-07-30 15:12:22 +00:00
Tom Burns
e53d102a2c
use 'unless' instead of 'if !' for simple conditional
2014-07-30 14:59:56 +00:00
Florian Weingarten
33e7b8e373
uniq filter
2014-07-29 13:09:34 +00:00
Tom Burns
f5e67a12f9
remove added newline in liquid.rb
2014-07-28 14:24:29 +00:00
Tom Burns
6b56bdd74f
remove variables used for counting empty stacks
2014-07-28 14:23:16 +00:00
Tom Burns
ba6e3e3da6
lazily create stacks
2014-07-28 14:12:11 +00:00
Jason Hiltz-Laforge
052ef9fcb8
Reorder constructor to avoid referencing uninitialized variable when environment contains a self-referencing proc
2014-07-24 18:58:23 +00:00
Arthur Nogueira Neves
32e4f2d3b1
Merge pull request #240 from Shopify/remove_flatten
...
remove .flatten on standard filters
2014-07-24 10:54:28 -04:00
Florian Weingarten
6c6350f18b
Exception handling for humans
...
Ability to pass exception_handler as a block to #render
and provide whatever behavior you want on handling exceptions
https://github.com/Shopify/liquid/pull/254
2014-07-24 14:44:02 +00:00
Florian Weingarten
eae24373e6
remove unnecessary flatten filter
2014-07-24 02:56:57 +00:00
Jason Hiltz-Laforge
034a47a6cf
Merge pull request #395 from Shopify/fix_block_delimiter
...
Forgot an error message case
2014-07-23 22:35:13 -04:00
Jason Hiltz-Laforge
51c1165f26
Forgot an error message case
2014-07-24 02:27:26 +00:00
Florian Weingarten
0b45ffeada
add more legacy tests
2014-07-24 00:33:39 +00:00
Arthur Neves
b7b243a13d
Fix regression on map
2014-07-23 17:16:21 -04:00
Arthur Neves
18e8ce1eb0
add flatten filter
2014-07-23 17:16:20 -04:00
Florian Weingarten
994f309465
Fix broken standardfilter test
2014-07-23 17:15:39 -04:00
Arthur Neves
02d42a1475
Array is a Enumerable
2014-07-23 17:14:27 -04:00
Arthur Neves
d099878385
add a input iterator to standard filter
2014-07-23 17:14:27 -04:00
Arthur Neves
6a061cbe81
remove .flatten on standard filters
2014-07-23 17:14:26 -04:00
Arthur Nogueira Neves
c864a75903
Merge pull request #341 from curebit/comparation_argument_error
...
Raise Liquid::ArugmentError when condition has wrong usage
2014-07-23 17:03:31 -04:00
Jason Hiltz-Laforge
55597b8398
Fixing regression from block delimiter enhancement
2014-07-23 19:18:02 +00:00
