Commit Graph
871 Commits
Author SHA1 Message Date
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
Justin Li 070639daba Push to for_stack at the beginning of For#render 2015-05-15 23:13:15 -04:00
Justin Li dad98cfc89 Merge pull request #562 from Shopify/use-find_variable-for-parentloop
Use custom stack for forloop references
2015-05-15 21:48:57 -04:00
Florian Weingarten 1d3c0b3dab Merge pull request #568 from Shopify/remove_liquid_methods
Remove support for `liquid_methods` Module extension
2015-05-14 22:19:02 +02:00
Justin Li 648a4888af Pop the for_stack register in an ensure 2015-05-14 15:02:20 -04:00
Justin Li b4e5017c79 Add truth table test for multiple if conditions 2015-05-14 14:11:03 -04:00
Justin Li f1bc9f27df Include message in assert_template_result 2015-05-14 14:10:45 -04:00
Florian Weingarten f4724f0db3 Remove support for liquid_methods Module extension 2015-05-14 14:44:19 +00:00
Florian Weingarten df74955ac4 Merge pull request #564 from Shopify/rubocop
Rubocop
2015-05-14 16:41:32 +02:00
Florian Weingarten 3372ca8136 Rubocop 2015-05-14 14:37:18 +00:00
Jean Boussier 8cf524e91c Merge pull request #565 from Shopify/file-dirname
Modernize code base with __dir__ and require_relative
2015-05-13 15:45:22 -04:00
Jean Boussier 5e38626309 Force circle in ruby 2.0 2015-05-13 15:40:34 -04:00
Jean Boussier b31df0fb3d Mordernize code base with __dir__ and require_relative 2015-05-13 15:33:00 -04:00
Florian Weingarten 9e815ec594 Merge pull request #563 from Shopify/webscale_exceptions
Prefer Class.new() where possible
2015-05-13 06:06:35 +02:00
Florian Weingarten 93b29b67ef Prefer Class.new() where possible 2015-05-13 02:47:43 +00:00
Justin Li 863e8968f0 Use extra stack for forloop references 2015-05-12 17:04:34 -04:00
Justin Li 4c9d2009f9 Add find_own_variable method to look up internal context variables 2015-05-12 16:49:39 -04:00
Justin Li 239cfa5a44 Use find_variable for parentloop 2015-05-12 16:11:32 -04:00
Justin Li 8a8996387b Update history to reflect merge of #554
[ci skip]
2015-05-12 13:20:06 -04:00
Justin Li 9310640bdd Merge pull request #554 from arthanzel/529-sort_natural
Merge pull request 554
2015-05-12 13:19:24 -04:00
Justin Li 4c3381a523 Update history to reflect merge of #559
[ci skip]
2015-05-12 10:59:58 -04:00
Justin Li 261aa2e726 Merge pull request #559 from Shopify/fix-include-var
Merge pull request 559
2015-05-12 10:50:13 -04:00
Justin Li 247c51ac70 Call Context#find_variable directly 2015-05-11 18:22:15 -04:00
Justin Li 37dbec3610 Remove unnecessary parse 2015-05-11 18:10:38 -04:00
Justin Li ff253a04c6 Lazily evaluate template name for context variable injection 2015-05-11 18:01:24 -04:00
Justin Li 25ef0df671 Add tests for #461 2015-05-11 17:59:05 -04:00
Martin Hanzel 32460c255b Removed a few superfluous comments 2015-05-08 11:48:33 -04:00
Justin Li 724d625f47 Update history to reflect merge of #555 [ci skip] 2015-05-07 14:03:38 -04:00
Justin Li f658dcee8b Merge pull request #555 from boobooninja/date_filter
Merge pull request 555
2015-05-07 13:59:22 -04:00
Loren Hale fa6cd6287e date filter gracefully accepts empty string 2015-05-07 17:04:21 +08:00
Justin Li 76c24db039 Remove ruby-head from allowed failures 2015-05-05 12:49:04 -04:00
Martin Hanzel 068791d698 Added method parens 2015-05-05 11:49:14 -04:00