Commit Graph

  • 9c33e9601b Revert "Merge pull request #476 from Shopify/missing-variable-name-error" Florian Weingarten 2014-11-07 01:48:16 +00:00
  • b242a7273a Revert "Merge pull request #478 from Shopify/numbers-in-identifiers" Florian Weingarten 2014-11-07 01:48:05 +00:00
  • 4b1835e3c0 Revert "Merge pull request #458 from Shopify/block-body" Florian Weingarten 2014-11-07 01:47:47 +00:00
  • 2fe3a21a5d Revert "Merge pull request #479 from Shopify/tweaks-for-c" Florian Weingarten 2014-11-07 01:46:59 +00:00
  • 76ef675eb2 Merge pull request #481 from Shopify/fix-nil-blank Justin Li 2014-11-06 13:03:15 -05:00
  • e5fd4d929f Coerce regex @blank output to a boolean Justin Li 2014-11-05 20:44:06 -05:00
  • 2e42c7be1f Merge pull request #480 from Shopify/number_variables Justin Li 2014-11-05 12:05:21 -05:00
  • 95b031ee04 Add quirks test for extra dots in ranges Justin Li 2014-11-05 11:41:12 -05:00
  • 4d97a714a9 Add quirks test for variables with number prefixes Justin Li 2014-11-05 10:56:58 -05:00
  • aa182f64b4 Merge pull request #479 from Shopify/tweaks-for-c Justin Li 2014-11-04 14:02:14 -05:00
  • 4e870302b1 Add env var for saving stackprof graphviz output Justin Li 2014-11-03 14:53:16 -05:00
  • 098c89b5f5 Convenience methods for raising terminator syntax errors Justin Li 2014-11-03 14:53:16 -05:00
  • 70c45f8cd8 Use SVG badge URLs Justin Li 2014-11-03 17:41:42 -05:00
  • 12d526a05c Merge pull request #458 from Shopify/block-body Justin Li 2014-11-03 17:34:39 -05:00
  • 2fd8ad08c0 Remove unused local variable that was accidentally added. Dylan Thacker-Smith 2014-10-15 16:14:12 -04:00
  • 15e1d46125 Avoid storing options instance variable in BlockBody. Dylan Thacker-Smith 2014-10-15 00:24:44 -04:00
  • 73fcd42403 Create a BlockBody class to decouple block body parsing from tags. Dylan Thacker-Smith 2014-07-28 12:04:27 -07:00
  • 263e90e772 Merge pull request #478 from Shopify/numbers-in-identifiers Justin Li 2014-10-30 21:59:26 -04:00
  • 81770f094d Remove unnecessary + Justin Li 2014-10-29 13:39:43 -04:00
  • dd5ee81089 Disallow number and dash identifier prefixes Justin Li 2014-10-29 12:08:00 -04:00
  • a07e382617 Use a single token for identifiers Justin Li 2014-10-29 11:28:41 -04:00
  • 4dc682313f Merge pull request #476 from Shopify/missing-variable-name-error Justin Li 2014-10-27 13:56:11 -04:00
  • 5616ddf00e Remove obsolete comment Justin Li 2014-10-27 13:44:14 -04:00
  • fcb23a4cd2 Disallow filters with no variable in strict mode Justin Li 2014-10-27 13:34:27 -04:00
  • a8f60ff6b1 Merge pull request #472 from Shopify/fix-leaky-test Justin Li 2014-10-23 10:12:41 -04:00
  • 5153ad1a78 Add test for spaces in square brackets allow-whitespace-square-brackets Justin Li 2014-10-22 15:47:12 -04:00
  • a206c8301d Fix test leaking error_mode, fix equality check for VariableLookup Justin Li 2014-10-22 15:40:41 -04:00
  • ee0de01480 Merge pull request #469 from Shopify/falsy-variable-fix Justin Li 2014-10-21 15:06:34 -04:00
  • 887b05e6ed Clarify test name Justin Li 2014-10-21 14:06:30 -04:00
  • 5d68e8803f Ensure nil works as a variable name Justin Li 2014-10-21 14:03:10 -04:00
  • dedd1d3dc0 Fix case where a variable name is falsy Justin Li 2014-10-21 12:09:26 -04:00
  • d9ae36ec40 Merge pull request #466 from Shopify/remove-expression-cache Dylan Thacker-Smith 2014-10-20 13:57:17 -04:00
  • b9ac3fef8f Remove the quotes from the partial string in the profiler timing objects. Dylan Thacker-Smith 2014-10-18 16:25:50 -04:00
  • f5faa4858c Remove parsed expression cache. Dylan Thacker-Smith 2014-10-16 23:06:25 -04:00
  • bc5e444d04 Use Expression.parse and Context#evaluate in the Include class. Dylan Thacker-Smith 2014-10-16 23:02:41 -04:00
  • 3a4b63f37e Use Expression.parse and Context#evaluate in the TableRow class. Dylan Thacker-Smith 2014-10-16 22:44:39 -04:00
  • a1a128db19 Refactor Condition so that it takes a parsed expression. Dylan Thacker-Smith 2014-10-16 22:20:07 -04:00
  • d502b9282a Use Expression.parse and Context#evaluate in the For class. Dylan Thacker-Smith 2014-09-12 18:03:48 -04:00
  • fee8e41466 Use Expression.parse and Context#evaluate in the Cycle class. Dylan Thacker-Smith 2014-09-12 17:33:43 -04:00
  • 37260f17ff Use Expression.parse and Context#evaluate in the Condition class. Dylan Thacker-Smith 2014-07-23 01:18:45 -04:00
  • 2da9d49478 Merge pull request #465 from Shopify/avoid_multi_assigns Florian Weingarten 2014-10-18 16:19:02 +02:00
  • 7196a2d58e Avoid parallel assignments Florian Weingarten 2014-10-17 23:15:04 +00:00
  • a056f6521c Merge pull request #463 from Shopify/stricter-identifiers Justin Li 2014-10-17 13:45:48 -04:00
  • de16db9b72 Don't allow - to end a variable name Justin Li 2014-10-17 13:38:07 -04:00
  • b4ea483c4e Separate ? and - into special tokens Justin Li 2014-10-17 13:30:54 -04:00
  • 7843bcca8d Merge pull request #443 from Shopify/completely-parse-variables Justin Li 2014-10-17 13:12:46 -04:00
  • 76ea5596ff Merge pull request #462 from Shopify/flat_map Florian Weingarten 2014-10-17 18:32:00 +02:00
  • f9318e8c93 flat_map Florian Weingarten 2014-10-17 16:11:12 +00:00
  • 71253ec6f9 Merge pull request #459 from Shopify/pop_vs_shift Florian Weingarten 2014-10-15 21:42:53 +02:00
  • 0fa075b879 Use pop over shift to avoid reverse Florian Weingarten 2014-10-15 19:26:39 +00:00
  • 6d080afd22 Merge pull request #446 from Shopify/remove-end-tag Dylan Thacker-Smith 2014-10-14 03:03:31 -04:00
  • a67e2a0a00 Remove unused Block#end_tag method. Dylan Thacker-Smith 2014-07-25 13:09:08 -04:00
  • f387508666 Parse expressions in Liquid::Variable#parse. Dylan Thacker-Smith 2014-09-12 01:14:35 -04:00
  • 632b1fb702 Merge pull request #455 from Shopify/parse_error_line_numbers Florian Weingarten 2014-10-04 17:53:30 +02:00
  • d84870d7a5 Test line number of errors in nested blocks. Dylan Thacker-Smith 2014-10-03 16:22:50 -05:00
  • 584b492e70 Line numbers for all parse errors Florian Weingarten 2014-10-03 21:00:31 +00:00
  • b79c9cb9bf Merge pull request #453 from Shopify/no-modify-default-resource-limit Dylan Thacker-Smith 2014-10-01 19:02:09 -05:00
  • cf5ccede50 Avoid modifying the default resources limits hash. Dylan Thacker-Smith 2014-10-01 18:51:06 -05:00
  • 23622a9739 Merge pull request #440 from Shopify/drop-tainting Evan Huus 2014-09-22 13:43:35 -04:00
  • 7ba5a6ab75 Merge pull request #450 from Shopify/additional_test_for_includes Florian Weingarten 2014-09-18 21:05:37 +02:00
  • be3d261e11 Regression test for including assignments Florian Weingarten 2014-09-18 10:37:44 +00:00
  • eeb061ef44 Address code review comments Evan Huus 2014-09-15 13:32:21 +00:00
  • 67b2c320a1 Add tainting tests Evan Huus 2014-09-12 17:35:10 +00:00
  • 1d151885be Auto-untaint variables passed through 'escape' Evan Huus 2014-09-12 17:34:53 +00:00
  • e836024dd9 Check and handle when a tainted variable is used Evan Huus 2014-09-12 17:34:33 +00:00
  • 638455ed92 Merge pull request #448 from Shopify/remove-unused-filter-not-found-error Dylan Thacker-Smith 2014-09-15 17:43:33 -04:00
  • b2a74883e9 Remove Liquid::FilterNotFoundError since it is never raised. Dylan Thacker-Smith 2014-09-15 16:18:01 -04:00
  • 6875e5e16f Merge pull request #449 from Shopify/fix-flaky-total-render-time-test Dylan Thacker-Smith 2014-09-15 17:41:41 -04:00
  • a5717a3f8d Fix flaky test which assumes total_render_time can't be 0. Dylan Thacker-Smith 2014-09-15 17:26:55 -04:00
  • 804fcfebd1 Merge pull request #444 from Shopify/remove-block-children Dylan Thacker-Smith 2014-09-15 09:56:08 -04:00
  • b37ee5684a Merge pull request #445 from Shopify/prefer-super-over-render-all Dylan Thacker-Smith 2014-09-15 09:53:54 -04:00
  • 0573b63b4c Use super rather than render_all in single block render classes. Dylan Thacker-Smith 2014-02-27 21:38:49 -05:00
  • 29c21d7867 Avoid keeping track of two lists of nodes during parsing. Dylan Thacker-Smith 2014-07-25 13:04:42 -04:00
  • d7234cb346 Benchmark marshal load and render against parse and render. benchmark-load-render Dylan Thacker-Smith 2014-09-12 02:10:54 -04:00
  • 5077463ec6 Fixed tests and include tag code to use register's file_system include_parsing_at_parse_time James Reid-Smith 2014-09-12 02:06:45 +00:00
  • b765343ee2 Merge branch 'parse_partials_at_template_parse_time' into remove_context_from_read_template_file James Reid-Smith 2014-09-12 01:37:48 +00:00
  • cbd1a07c1c Removed context from read_template_file, fixed tests to match new arity James Reid-Smith 2014-09-11 23:27:08 +00:00
  • a5c1f7b6f5 Moved parsing of partials to parse time of include tags if it's possible (eg. context not required to know template name) parse_partials_at_template_parse_time James Reid-Smith 2014-09-11 23:07:54 +00:00
  • 478eb893a9 Merge pull request #439 from Shopify/default-resource-limits Dylan Thacker-Smith 2014-09-11 14:27:52 -04:00
  • eae29f8c48 Make it easy to set default resource limits. Dylan Thacker-Smith 2014-09-11 13:42:49 -04:00
  • 4004cb63a5 Merge pull request #419 from Shopify/liquid_error_line_numbers Florian Weingarten 2014-09-08 23:15:53 +02:00
  • aafdf4adb0 Fix JRuby builds Jason Hiltz-Laforge 2014-09-08 20:41:22 +00:00
  • debac5dd0b Revert "move line number check" Florian Weingarten 2014-09-06 10:15:25 -04:00
  • ce06ed4bb1 merge conflicts Florian Weingarten 2014-09-05 14:16:20 +00:00
  • 939365c234 move line number check Florian Weingarten 2014-08-21 14:35:57 +00:00
  • c60fd0715d remove unnecessary nil Florian Weingarten 2014-08-20 17:45:24 +00:00
  • c83e1c7b6d prefix for Liquid::Error instances Florian Weingarten 2014-08-20 17:36:48 +00:00
  • aabbd8f1a1 remove unnecessary method Florian Weingarten 2014-08-20 17:15:14 +00:00
  • 60d8a213a5 Clean up Liquid::Error#render Florian Weingarten 2014-08-20 17:12:34 +00:00
  • 17cc8fdbb3 put line number in parentheses Florian Weingarten 2014-08-20 16:45:11 +00:00
  • 27c1019385 Add line numbers to warnings Tristan Hume 2014-08-14 16:23:38 -04:00
  • 3a0ee6ae91 Remove parser switching duplication Tristan Hume 2014-08-14 15:06:54 -04:00
  • 5eff375094 Optional line numbers for liquid errors Florian Weingarten 2014-08-14 16:11:21 +00:00
  • 2df643ba18 Merge pull request #425 from Shopify/pass-options-include Tristan Hume 2014-08-26 13:40:06 -04:00
  • 68af2d6e2a Pass options to include tags Tristan Hume 2014-08-21 11:37:09 -04:00
  • dfb6c20493 Merge pull request #423 from bogdan/contains-with-integer Arthur Nogueira Neves 2014-08-18 14:58:08 -04:00
  • 4e9d414fde Fixed condition constains operator with wrong data type Bogdan Gusiev 2014-08-18 16:18:55 +03:00
  • c0ec0652ae Merge pull request #421 from djreimer/url-encode-filter Florian Weingarten 2014-08-15 20:05:39 +02:00
  • f8c3cea09b Add url_encode filter to history Derrick Reimer 2014-08-15 11:03:06 -07:00
  • 0b847e553c Add url_encode standard filter Derrick Reimer 2014-08-15 08:45:40 -07:00