actionview 5.2.4 → 6.0.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of actionview might be problematic. Click here for more details.

Files changed (70) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +189 -77
  3. data/MIT-LICENSE +1 -1
  4. data/README.rdoc +4 -2
  5. data/lib/action_view.rb +3 -2
  6. data/lib/action_view/base.rb +107 -10
  7. data/lib/action_view/buffers.rb +15 -0
  8. data/lib/action_view/cache_expiry.rb +54 -0
  9. data/lib/action_view/context.rb +5 -9
  10. data/lib/action_view/digestor.rb +12 -20
  11. data/lib/action_view/gem_version.rb +3 -3
  12. data/lib/action_view/helpers.rb +0 -2
  13. data/lib/action_view/helpers/asset_tag_helper.rb +7 -30
  14. data/lib/action_view/helpers/asset_url_helper.rb +4 -3
  15. data/lib/action_view/helpers/cache_helper.rb +18 -10
  16. data/lib/action_view/helpers/capture_helper.rb +4 -0
  17. data/lib/action_view/helpers/csp_helper.rb +4 -2
  18. data/lib/action_view/helpers/csrf_helper.rb +1 -1
  19. data/lib/action_view/helpers/date_helper.rb +69 -25
  20. data/lib/action_view/helpers/form_helper.rb +238 -6
  21. data/lib/action_view/helpers/form_options_helper.rb +27 -18
  22. data/lib/action_view/helpers/form_tag_helper.rb +12 -11
  23. data/lib/action_view/helpers/javascript_helper.rb +9 -8
  24. data/lib/action_view/helpers/number_helper.rb +5 -0
  25. data/lib/action_view/helpers/output_safety_helper.rb +1 -1
  26. data/lib/action_view/helpers/rendering_helper.rb +6 -4
  27. data/lib/action_view/helpers/sanitize_helper.rb +12 -18
  28. data/lib/action_view/helpers/tag_helper.rb +7 -6
  29. data/lib/action_view/helpers/tags/base.rb +9 -5
  30. data/lib/action_view/helpers/tags/color_field.rb +1 -1
  31. data/lib/action_view/helpers/tags/translator.rb +1 -6
  32. data/lib/action_view/helpers/text_helper.rb +3 -3
  33. data/lib/action_view/helpers/translation_helper.rb +16 -12
  34. data/lib/action_view/helpers/url_helper.rb +14 -14
  35. data/lib/action_view/layouts.rb +5 -5
  36. data/lib/action_view/log_subscriber.rb +6 -6
  37. data/lib/action_view/lookup_context.rb +73 -31
  38. data/lib/action_view/path_set.rb +5 -10
  39. data/lib/action_view/railtie.rb +24 -1
  40. data/lib/action_view/record_identifier.rb +2 -2
  41. data/lib/action_view/renderer/abstract_renderer.rb +56 -3
  42. data/lib/action_view/renderer/partial_renderer.rb +66 -55
  43. data/lib/action_view/renderer/partial_renderer/collection_caching.rb +62 -16
  44. data/lib/action_view/renderer/renderer.rb +16 -4
  45. data/lib/action_view/renderer/streaming_template_renderer.rb +5 -5
  46. data/lib/action_view/renderer/template_renderer.rb +24 -18
  47. data/lib/action_view/rendering.rb +51 -31
  48. data/lib/action_view/routing_url_for.rb +12 -11
  49. data/lib/action_view/template.rb +102 -70
  50. data/lib/action_view/template/error.rb +21 -1
  51. data/lib/action_view/template/handlers.rb +27 -1
  52. data/lib/action_view/template/handlers/builder.rb +2 -2
  53. data/lib/action_view/template/handlers/erb.rb +17 -7
  54. data/lib/action_view/template/handlers/erb/erubi.rb +7 -3
  55. data/lib/action_view/template/handlers/html.rb +1 -1
  56. data/lib/action_view/template/handlers/raw.rb +2 -2
  57. data/lib/action_view/template/html.rb +14 -5
  58. data/lib/action_view/template/inline.rb +22 -0
  59. data/lib/action_view/template/raw_file.rb +28 -0
  60. data/lib/action_view/template/resolver.rb +136 -133
  61. data/lib/action_view/template/sources.rb +13 -0
  62. data/lib/action_view/template/sources/file.rb +17 -0
  63. data/lib/action_view/template/text.rb +5 -3
  64. data/lib/action_view/test_case.rb +1 -1
  65. data/lib/action_view/testing/resolvers.rb +33 -20
  66. data/lib/action_view/unbound_template.rb +32 -0
  67. data/lib/action_view/view_paths.rb +25 -1
  68. data/lib/assets/compiled/rails-ujs.js +30 -4
  69. metadata +23 -18
  70. data/lib/action_view/helpers/record_tag_helper.rb +0 -23
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7e94b21d68f5daeb4f7bf8727c7f89f7e3bacb9ea29633f798400728408b3265
4
- data.tar.gz: cb460ca02808f6935cc737c75c31f126eec9c8d8cf50c14ae963c40b821d1c7f
3
+ metadata.gz: '09307c25b4aca33f07c78f0eb2b2e1dcb83316272272340495d9bdb71200b66c'
4
+ data.tar.gz: c721b0700848cd657d418b9369ce575abfc12205e764cbdd04aa4f23320b80be
5
5
  SHA512:
6
- metadata.gz: 4a5ce41a3ade8b1097d8130ff1129e040b0a9a0a89dae5c81c6ec0b216baea8b408a99ea1e8902dde7092194e4df78f1bedc01f487a4a74b713c9494bd808e9d
7
- data.tar.gz: 3bd5a09c2ba16f20938d2d4ef0d21aebfea1ca226da1fc409c8a7df60f76b5d86027c729bc1c6b0ec92519755f98126512a7876a71397444264e231e3f82180a
6
+ metadata.gz: acd68ab05735381289baf92c2895b30dc73b8e25e36ea9b5496104e66d46d630e352785750518404da5c71cade47b8987effe98fcc7e35d6d108dfba51bb2b4f
7
+ data.tar.gz: d6e8f0d10ff2d4048c7ad3469584153f6faf284853b7f1afd191dbd3b3b469295855655c5ac59b986c52a894a7c774d11f0a09e747a492ad6d3b0e5edfb0bf27
@@ -1,27 +1,44 @@
1
- ## Rails 5.2.4 (November 27, 2019) ##
1
+ ## Rails 6.0.0 (August 16, 2019) ##
2
2
 
3
- * Allow programmatic click events to trigger Rails UJS click handlers.
4
- Programmatic click events (eg. ones generated by `Rails.fire(link, "click")`) don't specify a button. These events were being incorrectly stopped by code meant to ignore scroll wheel and right clicks introduced in #34573.
3
+ * ActionView::Helpers::SanitizeHelper: support rails-html-sanitizer 1.1.0.
5
4
 
6
- *Sudara Williams*
5
+ *Juanito Fatas*
7
6
 
8
7
 
9
- ## Rails 5.2.3 (March 27, 2019) ##
8
+ ## Rails 6.0.0.rc2 (July 22, 2019) ##
10
9
 
11
- * Prevent non-primary mouse keys from triggering Rails UJS click handlers.
12
- Firefox fires click events even if the click was triggered by non-primary mouse keys such as right- or scroll-wheel-clicks.
13
- For example, right-clicking a link such as the one described below (with an underlying ajax request registered on click) should not cause that request to occur.
10
+ * Fix `select_tag` so that it doesn't change `options` when `include_blank` is present.
14
11
 
15
- ```
16
- <%= link_to 'Remote', remote_path, class: 'remote', remote: true, data: { type: :json } %>
17
- ```
12
+ *Younes SERRAJ*
18
13
 
19
- Fixes #34541
20
14
 
21
- *Wolfgang Hobmaier*
15
+ ## Rails 6.0.0.rc1 (April 24, 2019) ##
16
+
17
+ * Fix partial caching skips same item issue
18
+
19
+ If we render cached collection partials with repeated items, those repeated items
20
+ will get skipped. For example, if you have 5 identical items in your collection, Rails
21
+ only renders the first one when `cached` is set to true. But it should render all
22
+ 5 items instead.
23
+
24
+ Fixes #35114.
25
+
26
+ *Stan Lo*
22
27
 
28
+ * Only clear ActionView cache in development on file changes
23
29
 
24
- ## Rails 5.2.2.1 (March 11, 2019) ##
30
+ To speed up development mode, view caches are only cleared when files in
31
+ the view paths have changed. Applications which have implemented custom
32
+ `ActionView::Resolver` subclasses may need to add their own cache clearing.
33
+
34
+ *John Hawthorn*
35
+
36
+ * Fix `ActionView::FixtureResolver` so that it handles template variants correctly.
37
+
38
+ *Edward Rudd*
39
+
40
+
41
+ ## Rails 6.0.0.beta3 (March 11, 2019) ##
25
42
 
26
43
  * Only accept formats from registered mime types
27
44
 
@@ -35,22 +52,104 @@
35
52
  *John Hawthorn*, *Eileen M. Uchitelle*, *Aaron Patterson*
36
53
 
37
54
 
38
- ## Rails 5.2.2 (December 04, 2018) ##
55
+ ## Rails 6.0.0.beta2 (February 25, 2019) ##
56
+
57
+ * `ActionView::Template.finalize_compiled_template_methods` is deprecated with
58
+ no replacement.
59
+
60
+ *tenderlove*
61
+
62
+ * `config.action_view.finalize_compiled_template_methods` is deprecated with
63
+ no replacement.
64
+
65
+ *tenderlove*
66
+
67
+ * Ensure unique DOM IDs for collection inputs with float values.
39
68
 
40
- * No changes.
69
+ Fixes #34974.
41
70
 
71
+ *Mark Edmondson*
42
72
 
43
- ## Rails 5.2.1.1 (November 27, 2018) ##
44
73
 
45
- * No changes.
74
+ ## Rails 6.0.0.beta1 (January 18, 2019) ##
46
75
 
76
+ * [Rename npm package](https://github.com/rails/rails/pull/34905) from
77
+ [`rails-ujs`](https://www.npmjs.com/package/rails-ujs) to
78
+ [`@rails/ujs`](https://www.npmjs.com/package/@rails/ujs).
47
79
 
48
- ## Rails 5.2.1 (August 07, 2018) ##
80
+ *Javan Makhmali*
49
81
 
50
- * Fix leak of `skip_default_ids` and `allow_method_names_outside_object` options
51
- to HTML attributes.
82
+ * Remove deprecated `image_alt` helper.
52
83
 
53
- *Yurii Cherniavskyi*
84
+ *Rafael Mendonça França*
85
+
86
+ * Fix the need of `#protect_against_forgery?` method defined in
87
+ `ActionView::Base` subclasses. This prevents the use of forms and buttons.
88
+
89
+ *Genadi Samokovarov*
90
+
91
+ * Fix UJS permanently showing disabled text in a[data-remote][data-disable-with] elements within forms.
92
+
93
+ Fixes #33889.
94
+
95
+ *Wolfgang Hobmaier*
96
+
97
+ * Prevent non-primary mouse keys from triggering Rails UJS click handlers.
98
+ Firefox fires click events even if the click was triggered by non-primary mouse keys such as right- or scroll-wheel-clicks.
99
+ For example, right-clicking a link such as the one described below (with an underlying ajax request registered on click) should not cause that request to occur.
100
+
101
+ ```
102
+ <%= link_to 'Remote', remote_path, class: 'remote', remote: true, data: { type: :json } %>
103
+ ```
104
+
105
+ Fixes #34541.
106
+
107
+ *Wolfgang Hobmaier*
108
+
109
+ * Prevent `ActionView::TextHelper#word_wrap` from unexpectedly stripping white space from the _left_ side of lines.
110
+
111
+ For example, given input like this:
112
+
113
+ ```
114
+ This is a paragraph with an initial indent,
115
+ followed by additional lines that are not indented,
116
+ and finally terminated with a blockquote:
117
+ "A pithy saying"
118
+ ```
119
+
120
+ Calling `word_wrap` should not trim the indents on the first and last lines.
121
+
122
+ Fixes #34487.
123
+
124
+ *Lyle Mullican*
125
+
126
+ * Add allocations to template rendering instrumentation.
127
+
128
+ Adds the allocations for template and partial rendering to the server output on render.
129
+
130
+ ```
131
+ Rendered posts/_form.html.erb (Duration: 7.1ms | Allocations: 6004)
132
+ Rendered posts/new.html.erb within layouts/application (Duration: 8.3ms | Allocations: 6654)
133
+ Completed 200 OK in 858ms (Views: 848.4ms | ActiveRecord: 0.4ms | Allocations: 1539564)
134
+ ```
135
+
136
+ *Eileen M. Uchitelle*, *Aaron Patterson*
137
+
138
+ * Respect the `only_path` option passed to `url_for` when the options are passed in as an array
139
+
140
+ Fixes #33237.
141
+
142
+ *Joel Ambass*
143
+
144
+ * Deprecate calling private model methods from view helpers.
145
+
146
+ For example, in methods like `options_from_collection_for_select`
147
+ and `collection_select` it is possible to call private methods from
148
+ the objects used.
149
+
150
+ Fixes #33546.
151
+
152
+ *Ana María Martínez Gómez*
54
153
 
55
154
  * Fix issue with `button_to`'s `to_form_params`
56
155
 
@@ -63,97 +162,110 @@
63
162
 
64
163
  *Georgi Georgiev*
65
164
 
66
- * Fix JavaScript views rendering does not work with Firefox when using
67
- Content Security Policy.
165
+ * Mark arrays of translations as trusted safe by using the `_html` suffix.
68
166
 
69
- Fixes #32577.
167
+ Example:
70
168
 
71
- *Yuji Yaginuma*
72
-
73
- * Add the `nonce: true` option for `javascript_include_tag` helper to
74
- support automatic nonce generation for Content Security Policy.
75
- Works the same way as `javascript_tag nonce: true` does.
76
-
77
- *Yaroslav Markin*
169
+ en:
170
+ foo_html:
171
+ - "One"
172
+ - "<strong>Two</strong>"
173
+ - "Three &#128075; &#128578;"
78
174
 
175
+ *Juan Broullon*
79
176
 
80
- ## Rails 5.2.0 (April 09, 2018) ##
177
+ * Add `year_format` option to date_select tag. This option makes it possible to customize year
178
+ names. Lambda should be passed to use this option.
81
179
 
82
- * Pass the `:skip_pipeline` option in `image_submit_tag` when calling `path_to_image`.
180
+ Example:
83
181
 
84
- Fixes #32248.
182
+ date_select('user_birthday', '', start_year: 1998, end_year: 2000, year_format: ->year { "Heisei #{year - 1988}" })
85
183
 
86
- *Andrew White*
184
+ The HTML produced:
87
185
 
88
- * Allow the use of callable objects as group methods for grouped selects.
186
+ <select id="user_birthday__1i" name="user_birthday[(1i)]">
187
+ <option value="1998">Heisei 10</option>
188
+ <option value="1999">Heisei 11</option>
189
+ <option value="2000">Heisei 12</option>
190
+ </select>
191
+ /* The rest is omitted */
89
192
 
90
- Until now, the `option_groups_from_collection_for_select` method was only able to
91
- handle method names as `group_method` and `group_label_method` parameters,
92
- it is now able to receive procs and other callable objects too.
193
+ *Koki Ryu*
93
194
 
94
- *Jérémie Bonal*
95
-
96
- * Add `preload_link_tag` helper.
195
+ * Fix JavaScript views rendering does not work with Firefox when using
196
+ Content Security Policy.
97
197
 
98
- This helper that allows to the browser to initiate early fetch of resources
99
- (different to the specified in `javascript_include_tag` and `stylesheet_link_tag`).
100
- Additionally, this sends Early Hints if supported by browser.
198
+ Fixes #32577.
101
199
 
102
- *Guillermo Iguaran*
200
+ *Yuji Yaginuma*
103
201
 
104
- * Change `form_with` to generates ids by default.
202
+ * Add the `nonce: true` option for `javascript_include_tag` helper to
203
+ support automatic nonce generation for Content Security Policy.
204
+ Works the same way as `javascript_tag nonce: true` does.
105
205
 
106
- When `form_with` was introduced we disabled the automatic generation of ids
107
- that was enabled in `form_for`. This usually is not an good idea since labels don't work
108
- when the input doesn't have an id and it made harder to test with Capybara.
206
+ *Yaroslav Markin*
109
207
 
110
- You can still disable the automatic generation of ids setting `config.action_view.form_with_generates_ids`
111
- to `false.`
208
+ * Remove `ActionView::Helpers::RecordTagHelper`.
112
209
 
113
- *Nick Pezza*
210
+ *Yoshiyuki Hirano*
114
211
 
115
- * Fix issues with `field_error_proc` wrapping `optgroup` and select divider `option`.
212
+ * Disable `ActionView::Template` finalizers in test environment.
116
213
 
117
- Fixes #31088
214
+ Template finalization can be expensive in large view test suites.
215
+ Add a configuration option,
216
+ `action_view.finalize_compiled_template_methods`, and turn it off in
217
+ the test environment.
118
218
 
119
- *Matthias Neumayr*
219
+ *Simon Coffey*
120
220
 
121
- * Remove deprecated Erubis ERB handler.
221
+ * Extract the `confirm` call in its own, overridable method in `rails_ujs`.
122
222
 
123
- *Rafael Mendonça França*
223
+ Example:
124
224
 
125
- * Remove default `alt` text generation.
225
+ Rails.confirm = function(message, element) {
226
+ return (my_bootstrap_modal_confirm(message));
227
+ }
126
228
 
127
- Fixes #30096
229
+ *Mathieu Mahé*
128
230
 
129
- *Cameron Cundiff*
231
+ * Enable select tag helper to mark `prompt` option as `selected` and/or `disabled` for `required`
232
+ field.
130
233
 
131
- * Add `srcset` option to `image_tag` helper.
234
+ Example:
132
235
 
133
- *Roberto Miranda*
236
+ select :post,
237
+ :category,
238
+ ["lifestyle", "programming", "spiritual"],
239
+ { selected: "", disabled: "", prompt: "Choose one" },
240
+ { required: true }
134
241
 
135
- * Fix issues with scopes and engine on `current_page?` method.
242
+ Placeholder option would be selected and disabled.
136
243
 
137
- Fixes #29401.
244
+ The HTML produced:
138
245
 
139
- *Nikita Savrov*
246
+ <select required="required" name="post[category]" id="post_category">
247
+ <option disabled="disabled" selected="selected" value="">Choose one</option>
248
+ <option value="lifestyle">lifestyle</option>
249
+ <option value="programming">programming</option>
250
+ <option value="spiritual">spiritual</option></select>
140
251
 
141
- * Generate field ids in `collection_check_boxes` and `collection_radio_buttons`.
252
+ *Sergey Prikhodko*
142
253
 
143
- This makes sure that the labels are linked up with the fields.
254
+ * Don't enforce UTF-8 by default.
144
255
 
145
- Fixes #29014.
256
+ With the disabling of TLS 1.0 by most major websites, continuing to run
257
+ IE8 or lower becomes increasingly difficult so default to not enforcing
258
+ UTF-8 encoding as it's not relevant to other browsers.
146
259
 
147
- *Yuji Yaginuma*
260
+ *Andrew White*
148
261
 
149
- * Add `:json` type to `auto_discovery_link_tag` to support [JSON Feeds](https://jsonfeed.org/version/1).
262
+ * Change translation key of `submit_tag` from `module_name_class_name` to `module_name/class_name`.
150
263
 
151
- *Mike Gunderloy*
264
+ *Rui Onodera*
152
265
 
153
- * Update `distance_of_time_in_words` helper to display better error messages
154
- for bad input.
266
+ * Rails 6 requires Ruby 2.5.0 or newer.
155
267
 
156
- *Jay Hayes*
268
+ *Jeremy Daer*, *Kasper Timm Hansen*
157
269
 
158
270
 
159
- Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/actionview/CHANGELOG.md) for previous changes.
271
+ Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/actionview/CHANGELOG.md) for previous changes.
@@ -1,4 +1,4 @@
1
- Copyright (c) 2004-2018 David Heinemeier Hansson
1
+ Copyright (c) 2004-2019 David Heinemeier Hansson
2
2
 
3
3
  Permission is hereby granted, free of charge, to any person obtaining
4
4
  a copy of this software and associated documentation files (the
@@ -5,6 +5,8 @@ view helpers that assist when building HTML forms, Atom feeds and more.
5
5
  Template formats that Action View handles are ERB (embedded Ruby, typically
6
6
  used to inline short Ruby snippets inside HTML), and XML Builder.
7
7
 
8
+ You can read more about Action View in the {Action View Overview}[https://edgeguides.rubyonrails.org/action_view_overview.html] guide.
9
+
8
10
  == Download and installation
9
11
 
10
12
  The latest version of Action View can be installed with RubyGems:
@@ -13,7 +15,7 @@ The latest version of Action View can be installed with RubyGems:
13
15
 
14
16
  Source code can be downloaded as part of the Rails project on GitHub:
15
17
 
16
- * https://github.com/rails/rails/tree/5-2-stable/actionview
18
+ * https://github.com/rails/rails/tree/master/actionview
17
19
 
18
20
 
19
21
  == License
@@ -27,7 +29,7 @@ Action View is released under the MIT license:
27
29
 
28
30
  API documentation is at
29
31
 
30
- * http://api.rubyonrails.org
32
+ * https://api.rubyonrails.org
31
33
 
32
34
  Bug reports for the Ruby on Rails project can be filed here:
33
35
 
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  #--
4
- # Copyright (c) 2004-2018 David Heinemeier Hansson
4
+ # Copyright (c) 2004-2019 David Heinemeier Hansson
5
5
  #
6
6
  # Permission is hereby granted, free of charge, to any person obtaining
7
7
  # a copy of this software and associated documentation files (the
@@ -35,7 +35,6 @@ module ActionView
35
35
  eager_autoload do
36
36
  autoload :Base
37
37
  autoload :Context
38
- autoload :CompiledTemplates, "action_view/context"
39
38
  autoload :Digestor
40
39
  autoload :Helpers
41
40
  autoload :LookupContext
@@ -45,6 +44,7 @@ module ActionView
45
44
  autoload :Rendering
46
45
  autoload :RoutingUrlFor
47
46
  autoload :Template
47
+ autoload :UnboundTemplate
48
48
  autoload :ViewPaths
49
49
 
50
50
  autoload_under "renderer" do
@@ -81,6 +81,7 @@ module ActionView
81
81
  end
82
82
  end
83
83
 
84
+ autoload :CacheExpiry
84
85
  autoload :TestCase
85
86
 
86
87
  def self.eager_load!
@@ -3,6 +3,7 @@
3
3
  require "active_support/core_ext/module/attr_internal"
4
4
  require "active_support/core_ext/module/attribute_accessors"
5
5
  require "active_support/ordered_options"
6
+ require "active_support/deprecation"
6
7
  require "action_view/log_subscriber"
7
8
  require "action_view/helpers"
8
9
  require "action_view/context"
@@ -179,37 +180,133 @@ module ActionView #:nodoc:
179
180
  def xss_safe? #:nodoc:
180
181
  true
181
182
  end
183
+
184
+ def with_empty_template_cache # :nodoc:
185
+ subclass = Class.new(self) {
186
+ # We can't implement these as self.class because subclasses will
187
+ # share the same template cache as superclasses, so "changed?" won't work
188
+ # correctly.
189
+ define_method(:compiled_method_container) { subclass }
190
+ define_singleton_method(:compiled_method_container) { subclass }
191
+ }
192
+ end
193
+
194
+ def changed?(other) # :nodoc:
195
+ compiled_method_container != other.compiled_method_container
196
+ end
182
197
  end
183
198
 
184
- attr_accessor :view_renderer
199
+ attr_reader :view_renderer, :lookup_context
185
200
  attr_internal :config, :assigns
186
201
 
187
- delegate :lookup_context, to: :view_renderer
188
202
  delegate :formats, :formats=, :locale, :locale=, :view_paths, :view_paths=, to: :lookup_context
189
203
 
190
204
  def assign(new_assigns) # :nodoc:
191
205
  @_assigns = new_assigns.each { |key, value| instance_variable_set("@#{key}", value) }
192
206
  end
193
207
 
194
- def initialize(context = nil, assigns = {}, controller = nil, formats = nil) #:nodoc:
208
+ # :stopdoc:
209
+
210
+ def self.build_lookup_context(context)
211
+ case context
212
+ when ActionView::Renderer
213
+ context.lookup_context
214
+ when Array
215
+ ActionView::LookupContext.new(context)
216
+ when ActionView::PathSet
217
+ ActionView::LookupContext.new(context)
218
+ when nil
219
+ ActionView::LookupContext.new([])
220
+ else
221
+ raise NotImplementedError, context.class.name
222
+ end
223
+ end
224
+
225
+ def self.empty
226
+ with_view_paths([])
227
+ end
228
+
229
+ def self.with_view_paths(view_paths, assigns = {}, controller = nil)
230
+ with_context ActionView::LookupContext.new(view_paths), assigns, controller
231
+ end
232
+
233
+ def self.with_context(context, assigns = {}, controller = nil)
234
+ new context, assigns, controller
235
+ end
236
+
237
+ NULL = Object.new
238
+
239
+ # :startdoc:
240
+
241
+ def initialize(lookup_context = nil, assigns = {}, controller = nil, formats = NULL) #:nodoc:
195
242
  @_config = ActiveSupport::InheritableOptions.new
196
243
 
197
- if context.is_a?(ActionView::Renderer)
198
- @view_renderer = context
244
+ unless formats == NULL
245
+ ActiveSupport::Deprecation.warn <<~eowarn.squish
246
+ Passing formats to ActionView::Base.new is deprecated
247
+ eowarn
248
+ end
249
+
250
+ case lookup_context
251
+ when ActionView::LookupContext
252
+ @lookup_context = lookup_context
199
253
  else
200
- lookup_context = context.is_a?(ActionView::LookupContext) ?
201
- context : ActionView::LookupContext.new(context)
202
- lookup_context.formats = formats if formats
203
- lookup_context.prefixes = controller._prefixes if controller
204
- @view_renderer = ActionView::Renderer.new(lookup_context)
254
+ ActiveSupport::Deprecation.warn <<~eowarn.squish
255
+ ActionView::Base instances should be constructed with a lookup context,
256
+ assignments, and a controller.
257
+ eowarn
258
+ @lookup_context = self.class.build_lookup_context(lookup_context)
205
259
  end
206
260
 
261
+ @view_renderer = ActionView::Renderer.new @lookup_context
262
+ @current_template = nil
263
+
207
264
  @cache_hit = {}
208
265
  assign(assigns)
209
266
  assign_controller(controller)
210
267
  _prepare_context
211
268
  end
212
269
 
270
+ def _run(method, template, locals, buffer, &block)
271
+ _old_output_buffer, _old_virtual_path, _old_template = @output_buffer, @virtual_path, @current_template
272
+ @current_template = template
273
+ @output_buffer = buffer
274
+ send(method, locals, buffer, &block)
275
+ ensure
276
+ @output_buffer, @virtual_path, @current_template = _old_output_buffer, _old_virtual_path, _old_template
277
+ end
278
+
279
+ def compiled_method_container
280
+ if self.class == ActionView::Base
281
+ ActiveSupport::Deprecation.warn <<~eowarn.squish
282
+ ActionView::Base instances must implement `compiled_method_container`
283
+ or use the class method `with_empty_template_cache` for constructing
284
+ an ActionView::Base instances that has an empty cache.
285
+ eowarn
286
+ end
287
+
288
+ self.class
289
+ end
290
+
291
+ def in_rendering_context(options)
292
+ old_view_renderer = @view_renderer
293
+ old_lookup_context = @lookup_context
294
+
295
+ if !lookup_context.html_fallback_for_js && options[:formats]
296
+ formats = Array(options[:formats])
297
+ if formats == [:js]
298
+ formats << :html
299
+ end
300
+ @lookup_context = lookup_context.with_prepended_formats(formats)
301
+ @view_renderer = ActionView::Renderer.new @lookup_context
302
+ end
303
+
304
+ yield @view_renderer
305
+ ensure
306
+ @view_renderer = old_view_renderer
307
+ @lookup_context = old_lookup_context
308
+ end
309
+
213
310
  ActiveSupport.run_load_hooks(:action_view, self)
214
311
  end
215
312
  end