Dylan Thacker-Smith
0e25e5d5e8
seperator -> separator
2015-07-09 17:03:42 -04:00
Dylan Thacker-Smith
77bdccf5ec
Try to make the regexes more readable.
2015-07-09 16:14:36 -04:00
Dylan Thacker-Smith
87e3234b58
Add a lax warning mode to see where we can make the lax parser stricter.
2015-07-09 16:14:32 -04:00
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
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
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
Dylan Thacker-Smith
338287df5e
Merge pull request #613 from Shopify/taint-context-warning
...
Add taint warnings to the context rather than the template.
2015-07-07 16:23:10 -04:00
Dylan Thacker-Smith
c4c398174b
Use early returns rather than large if in Variable#taint_check
2015-07-07 15:56:03 -04:00
Dylan Thacker-Smith
80b6ac3bc7
Add taint warnings to the context rather than the template.
2015-07-07 15:53:02 -04:00
Dylan Thacker-Smith
15974d9168
Merge pull request #612 from Shopify/fix-block-body-naming
...
Use node to refer to objects from the nodelist rather than token.
2015-07-07 15:49:58 -04:00
Dylan Thacker-Smith
f22ab4358b
Merge pull request #611 from Shopify/no-escape-rescue
...
Remove standard exception rescue in escape filter.
2015-07-07 15:49:43 -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
Dylan Thacker-Smith
fad3b8275c
Use node to refer to objects from the nodelist rather than token.
2015-07-04 20:57:35 -04:00
Dylan Thacker-Smith
5a071cb7f2
Remove standard exception rescue in escape filter.
2015-07-04 13:48:25 -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
Gaurav Chande
3c23cfc167
Add Liquid::Tag#tag_name
2015-07-02 20:18:09 +00: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
Florian Weingarten
4920ec50e4
update changelog
2015-06-19 07:41:39 -04:00
David Cornu
e395229283
Merge pull request #601 from Shopify/safe-to-integer
...
Use to_integer instead of to_i on arguments
2015-06-16 11:31:20 -04:00
David Cornu
9470fba0c8
Exclude lib/liquid/standardfilters.rb from ModuleLength
2015-06-16 15:19:06 +00:00
David Cornu
ac180e8402
Use to_integer instead of to_i on arguments
2015-06-16 15:08:29 +00:00
Carson Reinke
7c5d54aced
Ignore Rubocop Metrics/ModuleLength for now
2015-06-15 15:07:25 -04:00
Carson Reinke
5fbb312a67
"Trailing whitespace detected."
2015-06-15 14:27:48 -04:00
Carson Reinke
8385099960
Added "compact" filter
2015-06-15 14:14:28 -04:00
Florian Weingarten
504b6fb3c7
Merge pull request #596 from Shopify/liquid_c_tests
...
Run tests with latest liquid/c gem
2015-06-08 22:52:57 +02:00
Florian Weingarten
01420e8014
fix gem platforms
2015-06-08 18:38:40 +00:00
Florian Weingarten
dde35a2907
shut up rubocop
2015-06-08 18:38:40 +00:00
Florian Weingarten
e2323332cd
Run tests with latest liquid/c gem
2015-06-08 18:38:35 +00:00
Florian Weingarten
7b4398d0c4
Merge pull request #595 from Shopify/uniq_on_strings
...
Fix uniq filter with string input
2015-06-05 16:27:05 +02:00
Florian Weingarten
1e23036b2d
Fix uniq filter with string input
2015-06-04 22:55:03 -04:00
Florian Weingarten
13716fa68b
Merge pull request #594 from boobooninja/rake_console
...
add rake console
2015-06-05 04:21:01 +02:00
Loren Hale
232e8bb4cd
add rake console
...
add Rake console task to load irb with liquid
2015-06-05 10:17:55 +08:00
