liquid 3.0.6 → 4.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (103) hide show
  1. checksums.yaml +5 -5
  2. data/History.md +154 -58
  3. data/{MIT-LICENSE → LICENSE} +0 -0
  4. data/README.md +33 -0
  5. data/lib/liquid/block.rb +42 -125
  6. data/lib/liquid/block_body.rb +99 -79
  7. data/lib/liquid/condition.rb +52 -32
  8. data/lib/liquid/context.rb +57 -51
  9. data/lib/liquid/document.rb +19 -9
  10. data/lib/liquid/drop.rb +17 -16
  11. data/lib/liquid/errors.rb +20 -24
  12. data/lib/liquid/expression.rb +26 -10
  13. data/lib/liquid/extensions.rb +19 -7
  14. data/lib/liquid/file_system.rb +11 -11
  15. data/lib/liquid/forloop_drop.rb +42 -0
  16. data/lib/liquid/i18n.rb +6 -6
  17. data/lib/liquid/interrupts.rb +1 -2
  18. data/lib/liquid/lexer.rb +12 -8
  19. data/lib/liquid/locales/en.yml +6 -2
  20. data/lib/liquid/parse_context.rb +38 -0
  21. data/lib/liquid/parse_tree_visitor.rb +42 -0
  22. data/lib/liquid/parser_switching.rb +4 -4
  23. data/lib/liquid/profiler/hooks.rb +7 -7
  24. data/lib/liquid/profiler.rb +18 -19
  25. data/lib/liquid/range_lookup.rb +16 -1
  26. data/lib/liquid/resource_limits.rb +23 -0
  27. data/lib/liquid/standardfilters.rb +207 -61
  28. data/lib/liquid/strainer.rb +15 -8
  29. data/lib/liquid/tablerowloop_drop.rb +62 -0
  30. data/lib/liquid/tag.rb +9 -8
  31. data/lib/liquid/tags/assign.rb +25 -4
  32. data/lib/liquid/tags/break.rb +0 -3
  33. data/lib/liquid/tags/capture.rb +1 -1
  34. data/lib/liquid/tags/case.rb +27 -12
  35. data/lib/liquid/tags/comment.rb +2 -2
  36. data/lib/liquid/tags/cycle.rb +16 -8
  37. data/lib/liquid/tags/decrement.rb +1 -4
  38. data/lib/liquid/tags/for.rb +103 -75
  39. data/lib/liquid/tags/if.rb +60 -44
  40. data/lib/liquid/tags/ifchanged.rb +0 -2
  41. data/lib/liquid/tags/include.rb +71 -51
  42. data/lib/liquid/tags/raw.rb +32 -4
  43. data/lib/liquid/tags/table_row.rb +21 -31
  44. data/lib/liquid/tags/unless.rb +3 -4
  45. data/lib/liquid/template.rb +42 -54
  46. data/lib/liquid/tokenizer.rb +31 -0
  47. data/lib/liquid/truffle.rb +5 -0
  48. data/lib/liquid/utils.rb +52 -8
  49. data/lib/liquid/variable.rb +59 -46
  50. data/lib/liquid/variable_lookup.rb +14 -6
  51. data/lib/liquid/version.rb +2 -1
  52. data/lib/liquid.rb +10 -7
  53. data/test/integration/assign_test.rb +8 -8
  54. data/test/integration/blank_test.rb +14 -14
  55. data/test/integration/block_test.rb +12 -0
  56. data/test/integration/context_test.rb +2 -2
  57. data/test/integration/document_test.rb +19 -0
  58. data/test/integration/drop_test.rb +42 -40
  59. data/test/integration/error_handling_test.rb +96 -43
  60. data/test/integration/filter_test.rb +60 -20
  61. data/test/integration/hash_ordering_test.rb +9 -9
  62. data/test/integration/output_test.rb +26 -27
  63. data/test/integration/parse_tree_visitor_test.rb +247 -0
  64. data/test/integration/parsing_quirks_test.rb +19 -13
  65. data/test/integration/render_profiling_test.rb +20 -20
  66. data/test/integration/security_test.rb +23 -7
  67. data/test/integration/standard_filter_test.rb +426 -46
  68. data/test/integration/tags/break_tag_test.rb +1 -2
  69. data/test/integration/tags/continue_tag_test.rb +0 -1
  70. data/test/integration/tags/for_tag_test.rb +135 -100
  71. data/test/integration/tags/if_else_tag_test.rb +75 -77
  72. data/test/integration/tags/include_tag_test.rb +50 -31
  73. data/test/integration/tags/increment_tag_test.rb +10 -11
  74. data/test/integration/tags/raw_tag_test.rb +7 -1
  75. data/test/integration/tags/standard_tag_test.rb +121 -122
  76. data/test/integration/tags/statements_test.rb +3 -5
  77. data/test/integration/tags/table_row_test.rb +20 -19
  78. data/test/integration/tags/unless_else_tag_test.rb +6 -6
  79. data/test/integration/template_test.rb +199 -49
  80. data/test/integration/trim_mode_test.rb +529 -0
  81. data/test/integration/variable_test.rb +27 -13
  82. data/test/test_helper.rb +33 -6
  83. data/test/truffle/truffle_test.rb +9 -0
  84. data/test/unit/block_unit_test.rb +8 -5
  85. data/test/unit/condition_unit_test.rb +94 -77
  86. data/test/unit/context_unit_test.rb +69 -72
  87. data/test/unit/file_system_unit_test.rb +3 -3
  88. data/test/unit/i18n_unit_test.rb +2 -2
  89. data/test/unit/lexer_unit_test.rb +12 -9
  90. data/test/unit/parser_unit_test.rb +2 -2
  91. data/test/unit/regexp_unit_test.rb +1 -1
  92. data/test/unit/strainer_unit_test.rb +96 -1
  93. data/test/unit/tag_unit_test.rb +7 -2
  94. data/test/unit/tags/case_tag_unit_test.rb +1 -1
  95. data/test/unit/tags/for_tag_unit_test.rb +2 -2
  96. data/test/unit/tags/if_tag_unit_test.rb +1 -1
  97. data/test/unit/template_unit_test.rb +14 -5
  98. data/test/unit/tokenizer_unit_test.rb +24 -7
  99. data/test/unit/variable_unit_test.rb +60 -43
  100. metadata +62 -50
  101. data/lib/liquid/module_ex.rb +0 -62
  102. data/lib/liquid/token.rb +0 -18
  103. data/test/unit/module_ex_unit_test.rb +0 -87
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: d261e9933d148ea6cd126089810b2ab38c510d84
4
- data.tar.gz: bab6c47dafec91fb743720a77430e4c662108482
2
+ SHA256:
3
+ metadata.gz: e41c3a6ffee8037dec34a186cf023e2ccb09ac4f94d0c9a812ea02fd50559bf7
4
+ data.tar.gz: ff088908363f5a54e5833c64d32b441fb679503340b5f7511de99eb257fd4289
5
5
  SHA512:
6
- metadata.gz: 2d6e8d2d67a425d95afe16df6e99322fde8792ad51019a94c39d0169c98def33aa862845ffcaef1ec660d0f524985692c23335865d82d5ea6703caa10427c9d8
7
- data.tar.gz: 0b66d763cd81d42c3cf38adad9693df294eb356f880a920c109f504cf827c48729df1bdb9c22104386776dd9140101dfa1db5f9b0d9b0691620f81937cdcc01b
6
+ metadata.gz: 6b726a02e92f8d9fac005e07034aeee32dd2eae3a2b342fb4e9e648dc79da4c086de92e1e1a24bf52054a4a2b0a74af17f89fdd6c3cbbb2982e4b5b5971a23c2
7
+ data.tar.gz: e875f98a0b30f914ec1703781bfb443e737ea11675829c3e98fca96524dfe30a72fb9adf59c7855f85eda8014c2e6a9850d911b22cb96a63d2eac52e91273a42
data/History.md CHANGED
@@ -1,4 +1,100 @@
1
- # Liquid Version History
1
+ # Liquid Change Log
2
+
3
+ ## 4.0.3 / 2019-03-12
4
+
5
+ ### Fixed
6
+ * Fix break and continue tags inside included templates in loops (#1072) [Justin Li]
7
+
8
+ ## 4.0.2 / 2019-03-08
9
+
10
+ ### Changed
11
+ * Add `where` filter (#1026) [Samuel Doiron]
12
+ * Add `ParseTreeVisitor` to iterate the Liquid AST (#1025) [Stephen Paul Weber]
13
+ * Improve `strip_html` performance (#1032) [printercu]
14
+
15
+ ### Fixed
16
+ * Add error checking for invalid combinations of inputs to sort, sort_natural, where, uniq, map, compact filters (#1059) [Garland Zhang]
17
+ * Validate the character encoding in url_decode (#1070) [Clayton Smith]
18
+
19
+ ## 4.0.1 / 2018-10-09
20
+
21
+ ### Changed
22
+ * Add benchmark group in Gemfile (#855) [Jerry Liu]
23
+ * Allow benchmarks to benchmark render by itself (#851) [Jerry Liu]
24
+ * Avoid calling `line_number` on String node when rescuing a render error. (#860) [Dylan Thacker-Smith]
25
+ * Avoid duck typing to detect whether to call render on a node. [Dylan Thacker-Smith]
26
+ * Clarify spelling of `reversed` on `for` block tag (#843) [Mark Crossfield]
27
+ * Replace recursion with loop to avoid potential stack overflow from malicious input (#891, #892) [Dylan Thacker-Smith]
28
+ * Limit block tag nesting to 100 (#894) [Dylan Thacker-Smith]
29
+ * Replace `assert_equal nil` with `assert_nil` (#895) [Dylan Thacker-Smith]
30
+ * Remove Spy Gem (#896) [Dylan Thacker-Smith]
31
+ * Add `collection_name` and `variable_name` reader to `For` block (#909)
32
+ * Symbols render as strings (#920) [Justin Li]
33
+ * Remove default value from Hash objects (#932) [Maxime Bedard]
34
+ * Remove one level of nesting (#944) [Dylan Thacker-Smith]
35
+ * Update Rubocop version (#952) [Justin Li]
36
+ * Add `at_least` and `at_most` filters (#954, #958) [Nithin Bekal]
37
+ * Add a regression test for a liquid-c trim mode bug (#972) [Dylan Thacker-Smith]
38
+ * Use https rather than git protocol to fetch liquid-c [Dylan Thacker-Smith]
39
+ * Add tests against Ruby 2.4 (#963) and 2.5 (#981)
40
+ * Replace RegExp literals with constants (#988) [Ashwin Maroli]
41
+ * Replace unnecessary `#each_with_index` with `#each` (#992) [Ashwin Maroli]
42
+ * Improve the unexpected end delimiter message for block tags. (#1003) [Dylan Thacker-Smith]
43
+ * Refactor and optimize rendering (#1005) [Christopher Aue]
44
+ * Add installation instruction (#1006) [Ben Gift]
45
+ * Remove Circle CI (#1010)
46
+ * Rename deprecated `BigDecimal.new` to `BigDecimal` (#1024) [Koichi ITO]
47
+ * Rename deprecated Rubocop name (#1027) [Justin Li]
48
+
49
+ ### Fixed
50
+ * Handle `join` filter on non String joiners (#857) [Richard Monette]
51
+ * Fix duplicate inclusion condition logic error of `Liquid::Strainer.add_filter` method (#861)
52
+ * Fix `escape`, `url_encode`, `url_decode` not handling non-string values (#898) [Thierry Joyal]
53
+ * Fix raise when variable is defined but nil when using `strict_variables` [Pascal Betz]
54
+ * Fix `sort` and `sort_natural` to handle arrays with nils (#930) [Eric Chan]
55
+
56
+ ## 4.0.0 / 2016-12-14 / branch "4-0-stable"
57
+
58
+ ### Changed
59
+ * Render an opaque internal error by default for non-Liquid::Error (#835) [Dylan Thacker-Smith]
60
+ * Ruby 2.0 support dropped (#832) [Dylan Thacker-Smith]
61
+ * Add to_number Drop method to allow custom drops to work with number filters (#731)
62
+ * Add strict_variables and strict_filters options to detect undefined references (#691)
63
+ * Improve loop performance (#681) [Florian Weingarten]
64
+ * Rename Drop method `before_method` to `liquid_method_missing` (#661) [Thierry Joyal]
65
+ * Add url_decode filter to invert url_encode (#645) [Larry Archer]
66
+ * Add global_filter to apply a filter to all output (#610) [Loren Hale]
67
+ * Add compact filter (#600) [Carson Reinke]
68
+ * Rename deprecated "has_key?" and "has_interrupt?" methods (#593) [Florian Weingarten]
69
+ * Include template name with line numbers in render errors (574) [Dylan Thacker-Smith]
70
+ * Add sort_natural filter (#554) [Martin Hanzel]
71
+ * Add forloop.parentloop as a reference to the parent loop (#520) [Justin Li]
72
+ * Block parsing moved to BlockBody class (#458) [Dylan Thacker-Smith]
73
+ * Add concat filter to concatenate arrays (#429) [Diogo Beato]
74
+ * Ruby 1.9 support dropped (#491) [Justin Li]
75
+ * Liquid::Template.file_system's read_template_file method is no longer passed the context. (#441) [James Reid-Smith]
76
+ * Remove `liquid_methods` (See https://github.com/Shopify/liquid/pull/568 for replacement)
77
+ * Liquid::Template.register_filter raises when the module overrides registered public methods as private or protected (#705) [Gaurav Chande]
78
+
79
+ ### Fixed
80
+
81
+ * Fix variable names being detected as an operator when starting with contains (#788) [Michael Angell]
82
+ * Fix include tag used with strict_variables (#828) [QuickPay]
83
+ * Fix map filter when value is a Proc (#672) [Guillaume Malette]
84
+ * Fix truncate filter when value is not a string (#672) [Guillaume Malette]
85
+ * Fix behaviour of escape filter when input is nil (#665) [Tanel Jakobsoo]
86
+ * Fix sort filter behaviour with empty array input (#652) [Marcel Cary]
87
+ * Fix test failure under certain timezones (#631) [Dylan Thacker-Smith]
88
+ * Fix bug in uniq filter (#595) [Florian Weingarten]
89
+ * Fix bug when "blank" and "empty" are used as variable names (#592) [Florian Weingarten]
90
+ * Fix condition parse order in strict mode (#569) [Justin Li]
91
+ * Fix naming of the "context variable" when dynamically including a template (#559) [Justin Li]
92
+ * Gracefully accept empty strings in the date filter (#555) [Loren Hale]
93
+ * Fix capturing into variables with a hyphen in the name (#505) [Florian Weingarten]
94
+ * Fix case sensitivity regression in date standard filter (#499) [Kelley Reynolds]
95
+ * Disallow filters with no variable in strict mode (#475) [Justin Li]
96
+ * Disallow variable names in the strict parser that are not valid in the lax parser (#463) [Justin Li]
97
+ * Fix BlockBody#warnings taking exponential time to compute (#486) [Justin Li]
2
98
 
3
99
  ## 3.0.5 / 2015-07-23 / branch "3-0-stable"
4
100
 
@@ -10,11 +106,11 @@
10
106
 
11
107
  ## 3.0.3 / 2015-05-28
12
108
 
13
- * Fix condition parse order in strict mode (#569) [Justin Li, pushrax]
109
+ * Fix condition parse order in strict mode (#569) [Justin Li]
14
110
 
15
111
  ## 3.0.2 / 2015-04-24
16
112
 
17
- * Expose VariableLookup private members (#551) [Justin Li, pushrax]
113
+ * Expose VariableLookup private members (#551) [Justin Li]
18
114
  * Documentation fixes
19
115
 
20
116
  ## 3.0.1 / 2015-01-23
@@ -23,38 +119,38 @@
23
119
 
24
120
  ## 3.0.0 / 2014-11-12
25
121
 
26
- * Removed Block#end_tag. Instead, override parse with `super` followed by your code. See #446 [Dylan Thacker-Smith, dylanahsmith]
27
- * Fixed condition with wrong data types, see #423 [Bogdan Gusiev]
28
- * Add url_encode to standard filters, see #421 [Derrick Reimer, djreimer]
29
- * Add uniq to standard filters [Florian Weingarten, fw42]
30
- * Add exception_handler feature, see #397 and #254 [Bogdan Gusiev, bogdan and Florian Weingarten, fw42]
31
- * Optimize variable parsing to avoid repeated regex evaluation during template rendering #383 [Jason Hiltz-Laforge, jasonhl]
32
- * Optimize checking for block interrupts to reduce object allocation #380 [Jason Hiltz-Laforge, jasonhl]
33
- * Properly set context rethrow_errors on render! #349 [Thierry Joyal, tjoyal]
34
- * Fix broken rendering of variables which are equal to false, see #345 [Florian Weingarten, fw42]
35
- * Remove ActionView template handler [Dylan Thacker-Smith, dylanahsmith]
36
- * Freeze lots of string literals for new Ruby 2.1 optimization, see #297 [Florian Weingarten, fw42]
37
- * Allow newlines in tags and variables, see #324 [Dylan Thacker-Smith, dylanahsmith]
38
- * Tag#parse is called after initialize, which now takes options instead of tokens as the 3rd argument. See #321 [Dylan Thacker-Smith, dylanahsmith]
39
- * Raise `Liquid::ArgumentError` instead of `::ArgumentError` when filter has wrong number of arguments #309 [Bogdan Gusiev, bogdan]
40
- * Add a to_s default for liquid drops, see #306 [Adam Doeler, releod]
41
- * Add strip, lstrip, and rstrip to standard filters [Florian Weingarten, fw42]
42
- * Make if, for & case tags return complete and consistent nodelists, see #250 [Nick Jones, dntj]
43
- * Prevent arbitrary method invocation on condition objects, see #274 [Dylan Thacker-Smith, dylanahsmith]
44
- * Don't call to_sym when creating conditions for security reasons, see #273 [Bouke van der Bijl, bouk]
45
- * Fix resource counting bug with respond_to?(:length), see #263 [Florian Weingarten, fw42]
46
- * Allow specifying custom patterns for template filenames, see #284 [Andrei Gladkyi, agladkyi]
47
- * Allow drops to optimize loading a slice of elements, see #282 [Tom Burns, boourns]
48
- * Support for passing variables to snippets in subdirs, see #271 [Joost Hietbrink, joost]
49
- * Add a class cache to avoid runtime extend calls, see #249 [James Tucker, raggi]
50
- * Remove some legacy Ruby 1.8 compatibility code, see #276 [Florian Weingarten, fw42]
51
- * Add default filter to standard filters, see #267 [Derrick Reimer, djreimer]
52
- * Add optional strict parsing and warn parsing, see #235 [Tristan Hume, trishume]
53
- * Add I18n syntax error translation, see #241 [Simon Hørup Eskildsen, Sirupsen]
54
- * Make sort filter work on enumerable drops, see #239 [Florian Weingarten, fw42]
55
- * Fix clashing method names in enumerable drops, see #238 [Florian Weingarten, fw42]
56
- * Make map filter work on enumerable drops, see #233 [Florian Weingarten, fw42]
57
- * Improved whitespace stripping for blank blocks, related to #216 [Florian Weingarten, fw42]
122
+ * Removed Block#end_tag. Instead, override parse with `super` followed by your code. See #446 [Dylan Thacker-Smith]
123
+ * Fixed condition with wrong data types (#423) [Bogdan Gusiev]
124
+ * Add url_encode to standard filters (#421) [Derrick Reimer]
125
+ * Add uniq to standard filters [Florian Weingarten]
126
+ * Add exception_handler feature (#397) and #254 [Bogdan Gusiev, Florian Weingarten]
127
+ * Optimize variable parsing to avoid repeated regex evaluation during template rendering #383 [Jason Hiltz-Laforge]
128
+ * Optimize checking for block interrupts to reduce object allocation #380 [Jason Hiltz-Laforge]
129
+ * Properly set context rethrow_errors on render! #349 [Thierry Joyal]
130
+ * Fix broken rendering of variables which are equal to false (#345) [Florian Weingarten]
131
+ * Remove ActionView template handler [Dylan Thacker-Smith]
132
+ * Freeze lots of string literals for new Ruby 2.1 optimization (#297) [Florian Weingarten]
133
+ * Allow newlines in tags and variables (#324) [Dylan Thacker-Smith]
134
+ * Tag#parse is called after initialize, which now takes options instead of tokens as the 3rd argument. See #321 [Dylan Thacker-Smith]
135
+ * Raise `Liquid::ArgumentError` instead of `::ArgumentError` when filter has wrong number of arguments #309 [Bogdan Gusiev]
136
+ * Add a to_s default for liquid drops (#306) [Adam Doeler]
137
+ * Add strip, lstrip, and rstrip to standard filters [Florian Weingarten]
138
+ * Make if, for & case tags return complete and consistent nodelists (#250) [Nick Jones]
139
+ * Prevent arbitrary method invocation on condition objects (#274) [Dylan Thacker-Smith]
140
+ * Don't call to_sym when creating conditions for security reasons (#273) [Bouke van der Bijl]
141
+ * Fix resource counting bug with respond_to?(:length) (#263) [Florian Weingarten]
142
+ * Allow specifying custom patterns for template filenames (#284) [Andrei Gladkyi]
143
+ * Allow drops to optimize loading a slice of elements (#282) [Tom Burns]
144
+ * Support for passing variables to snippets in subdirs (#271) [Joost Hietbrink]
145
+ * Add a class cache to avoid runtime extend calls (#249) [James Tucker]
146
+ * Remove some legacy Ruby 1.8 compatibility code (#276) [Florian Weingarten]
147
+ * Add default filter to standard filters (#267) [Derrick Reimer]
148
+ * Add optional strict parsing and warn parsing (#235) [Tristan Hume]
149
+ * Add I18n syntax error translation (#241) [Simon Hørup Eskildsen, Sirupsen]
150
+ * Make sort filter work on enumerable drops (#239) [Florian Weingarten]
151
+ * Fix clashing method names in enumerable drops (#238) [Florian Weingarten]
152
+ * Make map filter work on enumerable drops (#233) [Florian Weingarten]
153
+ * Improved whitespace stripping for blank blocks, related to #216 [Florian Weingarten]
58
154
 
59
155
  ## 2.6.3 / 2015-07-23 / branch "2-6-stable"
60
156
 
@@ -67,8 +163,8 @@
67
163
  ## 2.6.1 / 2014-01-10
68
164
 
69
165
  Security fix, cherry-picked from master (4e14a65):
70
- * Don't call to_sym when creating conditions for security reasons, see #273 [Bouke van der Bijl, bouk]
71
- * Prevent arbitrary method invocation on condition objects, see #274 [Dylan Thacker-Smith, dylanahsmith]
166
+ * Don't call to_sym when creating conditions for security reasons (#273) [Bouke van der Bijl]
167
+ * Prevent arbitrary method invocation on condition objects (#274) [Dylan Thacker-Smith]
72
168
 
73
169
  ## 2.6.0 / 2013-11-25
74
170
 
@@ -76,37 +172,37 @@ IMPORTANT: Liquid 2.6 is going to be the last version of Liquid which maintains
76
172
  The following releases will only be tested against Ruby 1.9 and Ruby 2.0 and are likely to break on Ruby 1.8.
77
173
 
78
174
  * Bugfix for #106: fix example servlet [gnowoel]
79
- * Bugfix for #97: strip_html filter supports multi-line tags [Jo Liss, joliss]
80
- * Bugfix for #114: strip_html filter supports style tags [James Allardice, jamesallardice]
81
- * Bugfix for #117: 'now' support for date filter in Ruby 1.9 [Notre Dame Webgroup, ndwebgroup]
82
- * Bugfix for #166: truncate filter on UTF-8 strings with Ruby 1.8 [Florian Weingarten, fw42]
83
- * Bugfix for #204: 'raw' parsing bug [Florian Weingarten, fw42]
84
- * Bugfix for #150: 'for' parsing bug [Peter Schröder, phoet]
85
- * Bugfix for #126: Strip CRLF in strip_newline [Peter Schröder, phoet]
86
- * Bugfix for #174, "can't convert Fixnum into String" for "replace" [wǒ_is神仙, jsw0528]
87
- * Allow a Liquid::Drop to be passed into Template#render [Daniel Huckstep, darkhelmet]
88
- * Resource limits [Florian Weingarten, fw42]
89
- * Add reverse filter [Jay Strybis, unreal]
175
+ * Bugfix for #97: strip_html filter supports multi-line tags [Jo Liss]
176
+ * Bugfix for #114: strip_html filter supports style tags [James Allardice]
177
+ * Bugfix for #117: 'now' support for date filter in Ruby 1.9 [Notre Dame Webgroup]
178
+ * Bugfix for #166: truncate filter on UTF-8 strings with Ruby 1.8 [Florian Weingarten]
179
+ * Bugfix for #204: 'raw' parsing bug [Florian Weingarten]
180
+ * Bugfix for #150: 'for' parsing bug [Peter Schröder]
181
+ * Bugfix for #126: Strip CRLF in strip_newline [Peter Schröder]
182
+ * Bugfix for #174, "can't convert Fixnum into String" for "replace" [jsw0528]
183
+ * Allow a Liquid::Drop to be passed into Template#render [Daniel Huckstep]
184
+ * Resource limits [Florian Weingarten]
185
+ * Add reverse filter [Jay Strybis]
90
186
  * Add utf-8 support
91
- * Use array instead of Hash to keep the registered filters [Tasos Stathopoulos, astathopoulos]
92
- * Cache tokenized partial templates [Tom Burns, boourns]
93
- * Avoid warnings in Ruby 1.9.3 [Marcus Stollsteimer, stomar]
94
- * Better documentation for 'include' tag (closes #163) [Peter Schröder, phoet]
95
- * Use of BigDecimal on filters to have better precision (closes #155) [Arthur Nogueira Neves, arthurnn]
187
+ * Use array instead of Hash to keep the registered filters [Tasos Stathopoulos]
188
+ * Cache tokenized partial templates [Tom Burns]
189
+ * Avoid warnings in Ruby 1.9.3 [Marcus Stollsteimer]
190
+ * Better documentation for 'include' tag (closes #163) [Peter Schröder]
191
+ * Use of BigDecimal on filters to have better precision (closes #155) [Arthur Nogueira Neves]
96
192
 
97
193
  ## 2.5.5 / 2014-01-10 / branch "2-5-stable"
98
194
 
99
195
  Security fix, cherry-picked from master (4e14a65):
100
- * Don't call to_sym when creating conditions for security reasons, see #273 [Bouke van der Bijl, bouk]
101
- * Prevent arbitrary method invocation on condition objects, see #274 [Dylan Thacker-Smith, dylanahsmith]
196
+ * Don't call to_sym when creating conditions for security reasons (#273) [Bouke van der Bijl]
197
+ * Prevent arbitrary method invocation on condition objects (#274) [Dylan Thacker-Smith]
102
198
 
103
199
  ## 2.5.4 / 2013-11-11
104
200
 
105
- * Fix "can't convert Fixnum into String" for "replace", see #173, [wǒ_is神仙, jsw0528]
201
+ * Fix "can't convert Fixnum into String" for "replace" (#173), [jsw0528]
106
202
 
107
203
  ## 2.5.3 / 2013-10-09
108
204
 
109
- * #232, #234, #237: Fix map filter bugs [Florian Weingarten, fw42]
205
+ * #232, #234, #237: Fix map filter bugs [Florian Weingarten]
110
206
 
111
207
  ## 2.5.2 / 2013-09-03 / deleted
112
208
 
@@ -114,7 +210,7 @@ Yanked from rubygems, as it contained too many changes that broke compatibility.
114
210
 
115
211
  ## 2.5.1 / 2013-07-24
116
212
 
117
- * #230: Fix security issue with map filter, Use invoke_drop in map filter [Florian Weingarten, fw42]
213
+ * #230: Fix security issue with map filter, Use invoke_drop in map filter [Florian Weingarten]
118
214
 
119
215
  ## 2.5.0 / 2013-03-06
120
216
 
File without changes
data/README.md CHANGED
@@ -42,6 +42,8 @@ Liquid is a template engine which was written with very specific requirements:
42
42
 
43
43
  ## How to use Liquid
44
44
 
45
+ Install Liquid by adding `gem 'liquid'` to your gemfile.
46
+
45
47
  Liquid supports a very simple API based around the Liquid::Template class.
46
48
  For standard use you can just pass it the content of a file and call render with a parameters hash.
47
49
 
@@ -73,3 +75,34 @@ This is useful for doing things like enabling strict mode only in the theme edit
73
75
 
74
76
  It is recommended that you enable `:strict` or `:warn` mode on new apps to stop invalid templates from being created.
75
77
  It is also recommended that you use it in the template editors of existing apps to give editors better error messages.
78
+
79
+ ### Undefined variables and filters
80
+
81
+ By default, the renderer doesn't raise or in any other way notify you if some variables or filters are missing, i.e. not passed to the `render` method.
82
+ You can improve this situation by passing `strict_variables: true` and/or `strict_filters: true` options to the `render` method.
83
+ When one of these options is set to true, all errors about undefined variables and undefined filters will be stored in `errors` array of a `Liquid::Template` instance.
84
+ Here are some examples:
85
+
86
+ ```ruby
87
+ template = Liquid::Template.parse("{{x}} {{y}} {{z.a}} {{z.b}}")
88
+ template.render({ 'x' => 1, 'z' => { 'a' => 2 } }, { strict_variables: true })
89
+ #=> '1 2 ' # when a variable is undefined, it's rendered as nil
90
+ template.errors
91
+ #=> [#<Liquid::UndefinedVariable: Liquid error: undefined variable y>, #<Liquid::UndefinedVariable: Liquid error: undefined variable b>]
92
+ ```
93
+
94
+ ```ruby
95
+ template = Liquid::Template.parse("{{x | filter1 | upcase}}")
96
+ template.render({ 'x' => 'foo' }, { strict_filters: true })
97
+ #=> '' # when at least one filter in the filter chain is undefined, a whole expression is rendered as nil
98
+ template.errors
99
+ #=> [#<Liquid::UndefinedFilter: Liquid error: undefined filter filter1>]
100
+ ```
101
+
102
+ If you want to raise on a first exception instead of pushing all of them in `errors`, you can use `render!` method:
103
+
104
+ ```ruby
105
+ template = Liquid::Template.parse("{{x}} {{y}}")
106
+ template.render!({ 'x' => 1}, { strict_variables: true })
107
+ #=> Liquid::UndefinedVariable: Liquid error: undefined variable y
108
+ ```
data/lib/liquid/block.rb CHANGED
@@ -1,90 +1,41 @@
1
1
  module Liquid
2
2
  class Block < Tag
3
- FullToken = /\A#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}\z/om
4
- ContentOfVariable = /\A#{VariableStart}(.*)#{VariableEnd}\z/om
5
- TAGSTART = "{%".freeze
6
- VARSTART = "{{".freeze
3
+ MAX_DEPTH = 100
7
4
 
8
- def blank?
9
- @blank
5
+ def initialize(tag_name, markup, options)
6
+ super
7
+ @blank = true
10
8
  end
11
9
 
12
10
  def parse(tokens)
13
- @blank = true
14
- @nodelist ||= []
15
- @nodelist.clear
16
-
17
- while token = tokens.shift
18
- begin
19
- unless token.empty?
20
- case
21
- when token.start_with?(TAGSTART)
22
- if token =~ FullToken
23
-
24
- # if we found the proper block delimiter just end parsing here and let the outer block
25
- # proceed
26
- return if block_delimiter == $1
27
-
28
- # fetch the tag from registered blocks
29
- if tag = Template.tags[$1]
30
- markup = token.is_a?(Token) ? token.child($2) : $2
31
- new_tag = tag.parse($1, markup, tokens, @options)
32
- new_tag.line_number = token.line_number if token.is_a?(Token)
33
- @blank &&= new_tag.blank?
34
- @nodelist << new_tag
35
- else
36
- # this tag is not registered with the system
37
- # pass it to the current block for special handling or error reporting
38
- unknown_tag($1, $2, tokens)
39
- end
40
- else
41
- raise SyntaxError.new(options[:locale].t("errors.syntax.tag_termination".freeze, :token => token, :tag_end => TagEnd.inspect))
42
- end
43
- when token.start_with?(VARSTART)
44
- new_var = create_variable(token)
45
- new_var.line_number = token.line_number if token.is_a?(Token)
46
- @nodelist << new_var
47
- @blank = false
48
- else
49
- @nodelist << token
50
- @blank &&= (token =~ /\A\s*\z/)
51
- end
52
- end
53
- rescue SyntaxError => e
54
- e.set_line_number_from_token(token)
55
- raise
56
- end
11
+ @body = BlockBody.new
12
+ while parse_body(@body, tokens)
57
13
  end
58
-
59
- # Make sure that it's ok to end parsing in the current block.
60
- # Effectively this method will throw an exception unless the current block is
61
- # of type Document
62
- assert_missing_delimitation!
63
14
  end
64
15
 
65
- # warnings of this block and all sub-tags
66
- def warnings
67
- all_warnings = []
68
- all_warnings.concat(@warnings) if @warnings
16
+ def render(context)
17
+ @body.render(context)
18
+ end
69
19
 
70
- (nodelist || []).each do |node|
71
- all_warnings.concat(node.warnings || []) if node.respond_to?(:warnings)
72
- end
20
+ def blank?
21
+ @blank
22
+ end
73
23
 
74
- all_warnings
24
+ def nodelist
25
+ @body.nodelist
75
26
  end
76
27
 
77
- def unknown_tag(tag, params, tokens)
78
- case tag
79
- when 'else'.freeze
80
- raise SyntaxError.new(options[:locale].t("errors.syntax.unexpected_else".freeze,
81
- :block_name => block_name))
82
- when 'end'.freeze
83
- raise SyntaxError.new(options[:locale].t("errors.syntax.invalid_delimiter".freeze,
84
- :block_name => block_name,
85
- :block_delimiter => block_delimiter))
28
+ def unknown_tag(tag, _params, _tokens)
29
+ if tag == 'else'.freeze
30
+ raise SyntaxError.new(parse_context.locale.t("errors.syntax.unexpected_else".freeze,
31
+ block_name: block_name))
32
+ elsif tag.start_with?('end'.freeze)
33
+ raise SyntaxError.new(parse_context.locale.t("errors.syntax.invalid_delimiter".freeze,
34
+ tag: tag,
35
+ block_name: block_name,
36
+ block_delimiter: block_delimiter))
86
37
  else
87
- raise SyntaxError.new(options[:locale].t("errors.syntax.unknown_tag".freeze, :tag => tag))
38
+ raise SyntaxError.new(parse_context.locale.t("errors.syntax.unknown_tag".freeze, tag: tag))
88
39
  end
89
40
  end
90
41
 
@@ -96,65 +47,31 @@ module Liquid
96
47
  @block_delimiter ||= "end#{block_name}"
97
48
  end
98
49
 
99
- def create_variable(token)
100
- token.scan(ContentOfVariable) do |content|
101
- markup = token.is_a?(Token) ? token.child(content.first) : content.first
102
- return Variable.new(markup, @options)
103
- end
104
- raise SyntaxError.new(options[:locale].t("errors.syntax.variable_termination".freeze, :token => token, :tag_end => VariableEnd.inspect))
105
- end
106
-
107
- def render(context)
108
- render_all(@nodelist, context)
109
- end
110
-
111
50
  protected
112
51
 
113
- def assert_missing_delimitation!
114
- raise SyntaxError.new(options[:locale].t("errors.syntax.tag_never_closed".freeze, :block_name => block_name))
115
- end
116
-
117
- def render_all(list, context)
118
- output = []
119
- context.resource_limits[:render_length_current] = 0
120
- context.resource_limits[:render_score_current] += list.length
121
-
122
- list.each do |token|
123
- # Break out if we have any unhanded interrupts.
124
- break if context.has_interrupt?
125
-
126
- begin
127
- # If we get an Interrupt that means the block must stop processing. An
128
- # Interrupt is any command that stops block execution such as {% break %}
129
- # or {% continue %}
130
- if token.is_a? Continue or token.is_a? Break
131
- context.push_interrupt(token.interrupt)
132
- break
52
+ def parse_body(body, tokens)
53
+ if parse_context.depth >= MAX_DEPTH
54
+ raise StackLevelError, "Nesting too deep".freeze
55
+ end
56
+ parse_context.depth += 1
57
+ begin
58
+ body.parse(tokens, parse_context) do |end_tag_name, end_tag_params|
59
+ @blank &&= body.blank?
60
+
61
+ return false if end_tag_name == block_delimiter
62
+ unless end_tag_name
63
+ raise SyntaxError.new(parse_context.locale.t("errors.syntax.tag_never_closed".freeze, block_name: block_name))
133
64
  end
134
65
 
135
- token_output = render_token(token, context)
136
-
137
- unless token.is_a?(Block) && token.blank?
138
- output << token_output
139
- end
140
- rescue MemoryError => e
141
- raise e
142
- rescue ::StandardError => e
143
- output << (context.handle_error(e, token))
66
+ # this tag is not registered with the system
67
+ # pass it to the current block for special handling or error reporting
68
+ unknown_tag(end_tag_name, end_tag_params, tokens)
144
69
  end
70
+ ensure
71
+ parse_context.depth -= 1
145
72
  end
146
73
 
147
- output.join
148
- end
149
-
150
- def render_token(token, context)
151
- token_output = (token.respond_to?(:render) ? token.render(context) : token)
152
- context.increment_used_resources(:render_length_current, token_output)
153
- if context.resource_limits_reached?
154
- context.resource_limits[:reached] = true
155
- raise MemoryError.new("Memory limits exceeded".freeze)
156
- end
157
- token_output
74
+ true
158
75
  end
159
76
  end
160
77
  end