Loren Hale
232e8bb4cd
add rake console
...
add Rake console task to load irb with liquid
2015-06-05 10:17:55 +08:00
Dylan Thacker-Smith
6968def5dd
Merge pull request #574 from Shopify/template-name-in-errors
...
Include template name with line numbers in render errors.
2015-06-04 15:28:12 -04:00
Dylan Thacker-Smith
ad3748af21
Include template name with line numbers in render errors.
2015-06-04 13:44:01 -04:00
Florian Weingarten
c82e04f4e6
Merge pull request #593 from Shopify/fix_predicate_name
...
Rename 'has_key?' and 'has_interrupt?'
2015-06-04 19:40:14 +02:00
Florian Weingarten
5919626da4
Rename 'has_key?' and 'has_interrupt?'
2015-06-04 13:14:46 -04:00
Florian Weingarten
82269e2509
fix a few more rubocop offenses
2015-06-04 13:09:58 -04:00
Florian Weingarten
b347fac3c0
Merge pull request #592 from Shopify/method_literal
...
blank and empty as variable names
2015-06-04 19:09:48 +02:00
Florian Weingarten
e761a6864e
clean up some rubocop stuff
2015-06-04 12:56:29 -04:00
Florian Weingarten
4c22cef341
blank and empty as variable names
2015-06-04 12:30:50 -04:00
Florian Weingarten
c319240174
run rubocop on CI
2015-06-04 11:57:25 -04:00
Florian Weingarten
6ace095207
Avoid parallel assignments
2015-06-04 11:56:47 -04:00
Florian Weingarten
e36f366c33
gitignore .bundle
2015-06-04 11:56:00 -04:00
Florian Weingarten
02729e89c0
make rubocop happy
2015-06-04 11:56:00 -04:00
Gaurav Chande
6b0f6401d0
Merge pull request #590 from Shopify/allow-template-tags
...
Local Tags
2015-06-04 11:19:24 -04:00
Gaurav Chande
fc8e6c8d3a
Change Tokenizer test to fetch tokens instead of exposing ivar
2015-06-04 15:10:01 +00:00
Gaurav Chande
79d7dd06df
Extract tag fetching into a method (which can be overriden then)
2015-06-04 04:39:54 +00:00
Gaurav Chande
3a907a4db7
Move DEFAULT_OPTIONS related logic to Document
2015-06-04 04:39:54 +00:00
Gaurav Chande
8b98f92c7f
Extract tokenize logic from Template to a RubyTokenizer
2015-06-04 04:39:30 +00:00
Dylan Thacker-Smith
b79c0c611c
Merge pull request #586 from Shopify/string-contains-non-string
...
Avoid an exception from checking if a string contains a non-string.
2015-06-03 10:58:38 -04:00
Dylan Thacker-Smith
8a2947865b
Avoid an exception from checking if a string contains a non-string.
2015-06-03 02:21:51 -04:00
Dylan Thacker-Smith
ea29f8b4b8
Merge pull request #583 from Shopify/slice-nil-offset
...
Raise a Liquid::ArgumentError in slice filter for invalid integers.
2015-06-03 01:43:56 -04:00
Dylan Thacker-Smith
c84f4520cc
Keep input out of error message and add test for slice Integer parsing.
2015-06-03 01:35:01 -04:00
Dylan Thacker-Smith
3dd6433e2f
Merge pull request #584 from Shopify/replace-non-string
...
Convert arguments to replace filters to strings to avoid exceptions.
2015-06-02 16:41:15 -04:00
Dylan Thacker-Smith
ab7109a335
Raise a Liquid::ArgumentError in slice filter for invalid integers.
2015-06-02 16:05:08 -04:00
Dylan Thacker-Smith
94fe050952
Convert arguments to replace filters to strings to avoid exceptions.
2015-06-02 15:59:29 -04:00
Justin Li
9b98c436c4
Merge pull request #582 from Shopify/require-empty-raw-tag
...
Ensure raw tag has no arguments
2015-06-02 15:58:15 -04:00
Justin Li
889019f53a
Keep old test as well
2015-06-02 15:21:51 -04:00
Justin Li
c290375aec
Remove unnecessary regex options
2015-06-02 15:17:36 -04:00
Justin Li
719a98a25e
Ensure raw tag has no arguments
2015-06-02 14:32:39 -04:00
Justin Li
86d8b552da
Merge pull request #581 from Shopify/require-closed-raw-tag
...
Raise SyntaxError if raw tag is unclosed
2015-06-02 11:38:45 -04:00
Justin Li
b1ee9129e7
Raise SyntaxError if raw tag is unclosed
2015-06-02 10:56:51 -04:00
Justin Li
be2e41e4d5
Merge pull request #579 from Shopify/ast-match
...
Ensure For@reversed is a boolean
2015-05-28 16:45:09 -04:00
Justin Li
20ca2b9632
Update history to reflect merge of #570
...
[ci skip]
2015-05-28 16:43:22 -04:00
Justin Li
6c058823ad
Merge pull request #570 from Shopify/fix-strict-conditions
...
Fix condition parse order in strict mode
2015-05-28 16:33:54 -04:00
Dylan Thacker-Smith
27245c9eab
Merge pull request #577 from Shopify/table-row-blank-string-collection
...
Fix exception from using an empty string for the table row collection.
2015-05-28 16:20:42 -04:00
Justin Li
a639a13380
Use cleaner recursive solution
2015-05-28 16:16:30 -04:00
Justin Li
05a0fe56c8
Ensure For@reversed is a boolean
2015-05-28 16:09:26 -04:00
Dylan Thacker-Smith
c1eb694057
Remove the redundant iterable check in the for tag.
...
Just do it in slice_collection for consistency with the tablerow tag.
2015-05-28 16:04:50 -04:00
Dylan Thacker-Smith
f53b31c867
Merge pull request #578 from Shopify/filter-error-handling
...
Handle some more standard filter errors.
2015-05-28 15:00:57 -04:00
Dylan Thacker-Smith
363388e92f
Handle some more standard filter errors.
2015-05-28 14:18:53 -04:00
Dylan Thacker-Smith
873eddbb85
Split a line and use String#empty? for readability
2015-05-28 12:55:04 -04:00
Dylan Thacker-Smith
e790b60f60
Fix exception from using an empty string for the table row collection.
2015-05-28 12:11:39 -04:00
Dylan Thacker-Smith
3264d60425
Merge pull request #576 from Shopify/flexible-exception-handler
...
Allow the exception handler to convert exceptions to hide error messges
2015-05-28 11:38:44 -04:00
Dylan Thacker-Smith
8ff1b8e01f
Test set_line_number_from_token after exception is converted.
2015-05-28 09:22:02 -04:00
Dylan Thacker-Smith
8d5e71f856
Allow the exception handler to convert exceptions to hide error messages.
2015-05-27 18:59:51 -04:00
Dylan Thacker-Smith
89c6e605f8
Merge pull request #575 from Shopify/zero-division-error
...
Raise Liquid::ZeroDivisionError instead of ZeroDivisionError.
2015-05-26 10:43:23 -04:00
Dylan Thacker-Smith
6265c36ec9
Raise Liquid::ZeroDivisionError instead of ZeroDivisionError.
2015-05-25 15:40:17 -04:00
Dylan Thacker-Smith
8af99ff918
Merge pull request #573 from Shopify/optional-error-rendering
...
Make liquid error rendering optional.
2015-05-25 12:11:10 -04:00
Dylan Thacker-Smith
36200ff704
Make liquid error rendering optional.
...
Although the author of the liquid template wants to see these errors, they
probably don't want the visitor to see the liquid errors. Probably the
best fallback when rendering the page for visitors is to render the empty
string for tags with errors.
2015-05-25 11:24:53 -04:00
Justin Li
a9c7df931f
Strict parse conditions in reverse order
2015-05-19 11:51:01 -04:00
