aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #35293 from rails/remove-rendered-format-from-cacheAaron Patterson2019-02-199-33/+33
|\ \ | | | | | | Pass the template format to the digestor
| * | remove another call to rendered_format=Aaron Patterson2019-02-171-2/+0
| | |
| * | Pass the template format to the digestorAaron Patterson2019-02-159-31/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit passes the template format to the digestor in order to come up with a key. Before this commit, the digestor would depend on the side effect of the template renderer setting the rendered_format on the lookup context. I would like to remove that mutation, so I've changed this to pass the template format in to the digestor. I've introduced a new instance variable that will be alive during a template render. When the template is being rendered, it pushes the current template on to a stack, setting `@current_template` to the template currently being rendered. When the cache helper asks the digestor for a key, it uses the format of the template currently on the stack.
* | | Merge pull request #35281 from ↵Aaron Patterson2019-02-152-5/+16
|\ \ \ | | | | | | | | | | | | | | | | y-yagi/show_deprecated_message_instead_of_raise_exception Show deprecated message instead of raise exception in `compiled_method_container` method
| * | | Show deprecated message instead of raise exception in ↵yuuji.yaginuma2019-02-162-5/+16
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `compiled_method_container` method Since #35036, the subclasses of `ActionView::Base` requires the `compiled_method_container`. This is incompatible. For example, `web-console` use view class that subclass of `ActionView::Base`, and does not work it now cause of this. Actually, since it seems that it is only `ActionView::Base` that `compiled_method_container` is necessary, modified the condition that emits a warning.
* / / Allow to pass options to `csp_meta_tag`yuuji.yaginuma2019-02-162-2/+8
|/ / | | | | | | | | | | | | | | | | | | | | | | Currently `csp_meta_tag` generates `name` attribute only. However, in libraries like `Material-UI` and `JSS`, expect that the meta tag that contains the nonce with `property` attribute. https://material-ui.com/css-in-js/advanced/#how-does-one-implement-csp https://github.com/cssinjs/jss/blob/master/docs/csp.md This patch allows `csp_meta_tag` to specify arbitrary options and allows `nonce` to be passed to those libraries.
* | Add test for `csp_meta_tag`yuuji.yaginuma2019-02-141-0/+31
| |
* | Merge pull request #35253 from rails/cached-collections-must-have-a-templateAaron Patterson2019-02-132-3/+22
|\ \ | | | | | | Cached collections only work if there is one template
| * | Cached collections only work if there is one templateAaron Patterson2019-02-132-3/+22
| |/ | | | | | | | | Cached collections only work if there is one template. If there are more than one templates, the caching mechanism doesn't have a key.
* | Address to useless assignment `formats = nil` after #35254Ryuta Kamizono2019-02-142-5/+1
| | | | | | | | https://codeclimate.com/github/rails/rails/pull/35254
* | Clean for fix done in #35229. Removed unused argumentsAbhay Nikam2019-02-131-2/+2
| |
* | Turn lookup context in to a stack, push and pop if formats changeAaron Patterson2019-02-118-27/+62
| | | | | | | | | | | | | | | | | | | | | | This commit keeps a stack of lookup contexts on the ActionView::Base instance. If a format is passed to render, we instantiate a new lookup context and push it on the stack, that way any child calls to "render" will use the same format information as the parent. This also isolates "sibling" calls to render (multiple calls to render in the same template). Fixes #35222 #34138
* | Adding another failing test caseAaron Patterson2019-02-1111-6/+39
| |
* | Add a failing test for #35222Aaron Patterson2019-02-115-0/+14
|/
* Always call superAaron Patterson2019-02-083-3/+1
|
* reuse details cache key identity objectAaron Patterson2019-02-081-5/+1
|
* Teach DetailsKey how to clear the template cacheAaron Patterson2019-02-085-11/+38
| | | | | This commit exposes all system wide view paths so that we can clear their caches.
* Split digest cache from details identity cacheAaron Patterson2019-02-084-8/+27
| | | | | This commit splits the digest cache from the "details identity" cache. Now both caches can be managed independently.
* Fix deprecation warnings and call superAaron Patterson2019-02-061-2/+2
|
* Fix some typos!Aaron Patterson2019-02-062-1/+5
|
* Add a message to help allocate AV::Base instancesAaron Patterson2019-02-061-1/+5
|
* Deprecate finalizer configuration (it doesn't do anything)Aaron Patterson2019-02-063-0/+28
| | | | | | Revert "Remove finalizer and configuration" This reverts commit 9e7b4a3173788ea43b11e74a4d2f69a5f1565daa.
* Rename method so it is more descriptiveAaron Patterson2019-02-061-3/+3
|
* Pull generated methods up in to the anonymous subclassAaron Patterson2019-02-062-13/+7
| | | | Then we don't need the extra module.
* 🚨 Make the cops happy 🚨Aaron Patterson2019-02-063-3/+3
|
* Remove finalizer and configurationAaron Patterson2019-02-062-23/+0
|
* Regenerate AV::Base subclass when DetailsKey gets clearedAaron Patterson2019-02-062-3/+29
|
* Move templates to an anonymous subclass of AV::BaseAaron Patterson2019-02-0612-35/+75
| | | | | Now we can throw away the subclass and the generated methods will get GC'd too
* Merge pull request #35171 from rails/speed-up-partialsAaron Patterson2019-02-052-18/+40
|\ | | | | Speed up partial rendering by caching "variable" calculation
| * Speed up partial rendering by caching "variable" calculationAaron Patterson2019-02-052-18/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit speeds up rendering partials by caching the variable name calculation on the template. The variable name is based on the "virtual path" used for looking up the template. The same virtual path information lives on the template, so we can just ask the cached template object for the variable. This benchmark takes a couple files, so I'll cat them below: ``` [aaron@TC ~/g/r/actionview (speed-up-partials)]$ cat render_benchmark.rb require "benchmark/ips" require "action_view" require "action_pack" require "action_controller" class TestController < ActionController::Base end TestController.view_paths = [File.expand_path("test/benchmarks")] controller_view = TestController.new.view_context result = Benchmark.ips do |x| x.report("render") do controller_view.render("many_partials") end end [aaron@TC ~/g/r/actionview (speed-up-partials)]$ cat test/benchmarks/test/_many_partials.html.erb Looping: <ul> <% 100.times do |i| %> <%= render partial: "list_item", locals: { i: i } %> <% end %> </ul> [aaron@TC ~/g/r/actionview (speed-up-partials)]$ cat test/benchmarks/test/_list_item.html.erb <li>Number: <%= i %></li> ``` Benchmark results (master): ``` [aaron@TC ~/g/r/actionview (master)]$ be ruby render_benchmark.rb Warming up -------------------------------------- render 41.000 i/100ms Calculating ------------------------------------- render 424.269 (± 3.5%) i/s - 2.132k in 5.031455s ``` Benchmark results (this branch): ``` [aaron@TC ~/g/r/actionview (speed-up-partials)]$ be ruby render_benchmark.rb Warming up -------------------------------------- render 50.000 i/100ms Calculating ------------------------------------- render 521.862 (± 3.8%) i/s - 2.650k in 5.085885s ```
* | Merge branch 'float_dom_ids'Gannon McGibbon2019-02-053-5/+27
|\ \ | | | | | | | | | Closes #34975.
| * | Fix unique DOM IDs for collection inputsMark Edmondson2019-01-253-5/+26
| | |
* | | Merge pull request #35166 from znz/improve-regexpAaron Patterson2019-02-051-1/+1
|\ \ \ | | | | | | | | Improve regexp of `html_safe_translation_key?`
| * | | Improve regexp of `html_safe_translation_key?`Kazuhiro NISHIYAMA2019-02-051-1/+1
| | |/ | |/| | | | | | | | | | | | | - Use `\z` instead of `$` - Use character class instead of alternation - Optimize alternation order
* / | Respect ENV variables when finding DBs etc for the test suiteMatthew Draper2019-02-062-3/+25
|/ / | | | | | | | | If they're not set we'll still fall back to localhost, but this makes it possible to run the tests against a remote Postgres / Redis / whatever.
* | Take in to account optional arguments when deprecatingAaron Patterson2019-02-042-1/+10
| | | | | | | | Refs: rails/jbuilder#452
* | Pass source to template handler and deprecate old style handlerAaron Patterson2019-02-0110-21/+55
| | | | | | | | | | | | | | | | | | This commit passes the mutated source to the template handler as a parameter and deprecates the old handlers. Old handlers required that templates contain a reference to mutated source code, but we would like to make template objects "read only". This change lets the template remain "read only" while still giving template handlers access to the source code after mutations.
* | Introduce a file type template, deprecate `Template#refresh`Aaron Patterson2019-02-014-3/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every template that specifies a "virtual path" loses the template source when the template gets compiled: https://github.com/rails/rails/blob/eda0f574f129fcd5ad1fc58b55cb6d1db71ea95c/actionview/lib/action_view/template.rb#L275 The "refresh" method seems to think that the source code for a template can be recovered if there is a virtual path: https://github.com/rails/rails/blob/eda0f574f129fcd5ad1fc58b55cb6d1db71ea95c/actionview/lib/action_view/template.rb#L171-L188 Every call site that allocates a template object *and* provides a "virtual path" reads the template contents from the filesystem: https://github.com/rails/rails/blob/eda0f574f129fcd5ad1fc58b55cb6d1db71ea95c/actionview/lib/action_view/template/resolver.rb#L229-L231 Templates that are inline or literals don't provide a "virtual path": https://github.com/rails/rails/blob/eda0f574f129fcd5ad1fc58b55cb6d1db71ea95c/actionview/lib/action_view/renderer/template_renderer.rb#L34 This commit introduces a `FileTemplate` type that subclasses `Template`. The `FileTemplate` keeps a reference to the filename, and reads the source from the filesystem. This effectively makes the template source immutable. Other classes depended on the source to be mutated while being compiled, so this commit also introduces a temporary way to pass the mutated source to the ERB (or whatever) compiler. See `LegacyTemplate`. I think we should consider it an error to provide a virtual path on a non file type template an non-file templates can't recover their source. Here is an example: https://github.com/rails/rails/blob/eda0f574f129fcd5ad1fc58b55cb6d1db71ea95c/actionview/lib/action_view/testing/resolvers.rb#L53 This provides a "virtual path" so the source code (a string literal) is thrown away after compilation. Clearly we can't recover that string, so I think this should be an error.
* | use the source returned from encode!Aaron Patterson2019-01-311-3/+5
| |
* | add tests to make sure deprecated API is still supportedAaron Patterson2019-01-312-2/+14
| |
* | Tighten up the AV::Base constructorAaron Patterson2019-01-2911-22/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AV::Base constructor was too complicated, and this commit tightens up the parameters it will take. At runtime, AV::Base is most commonly constructed here: https://github.com/rails/rails/blob/94d54fa4ab641a0ddeb173409cb41cc5becc02a9/actionview/lib/action_view/rendering.rb#L72-L74 This provides an AV::Renderer instance, a hash of assignments, and a controller instance. Since this is the common case for construction, we should remove logic from the constructor that handles other cases. This commit introduces special constructors for those other cases. Interestingly, most code paths that construct AV::Base "strangely" are tests.
* | Remove `with_layout_format` delegationAaron Patterson2019-01-281-1/+1
| | | | | | | | | | That method doesn't exist on LookupContext, so the delegate doesn't make sense.
* | Cache the digest path on the stack.Aaron Patterson2019-01-281-7/+5
| | | | | | | | We can remove the ivar by caching the digest on the stack
* | Pull `@template` in to a local variableAaron Patterson2019-01-283-25/+24
| | | | | | | | | | | | This gets the PartialRenderer to be a bit closer to the TemplateRenderer. TemplateRenderer already keeps its template in a local variable.
* | Remove default parameters from method signatureAaron Patterson2019-01-281-4/+2
| | | | | | | | This method is private, and we always pass something in.
* | Remove `@view` instance variable from the partial rendererAaron Patterson2019-01-282-25/+24
| | | | | | | | Similar to 1853b0d0abf87dfdd4c3a277c3badb17ca19652e
* | Remove `find_template` and `find_file` delegate methodsAaron Patterson2019-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | This reduces the surface area of our API and removes a Liskov issue. Both TemplateRenderer and PartialRenderer inherit from AbstractRenderer, but since PartialRenderer implements it's own `find_template` that is private, and has the wrong method signature, an instance of PartialRenderer cannot be substituted for an instance of AbstractRenderer renderer. Removing the superclass implementation solves both issues.
* | Deprecate `with_fallbacks` using a blockAaron Patterson2019-01-283-15/+42
| | | | | | | | | | | | | | This patch changes `with_fallbacks` to be a factory method that returns a new instance of a lookup context which contains the fallback view paths in addition to the controller specific view paths. Since the lookup context is more "read only", we may be able to cache them
* | Make `@view_paths` on the lookup context mostly read-onlyAaron Patterson2019-01-282-17/+17
| | | | | | | | | | | | The `with_fallbacks` method will temporarily mutate the lookup context instance, but nobody can call the setter, and we don't have to do a push / pop dance.
* | Remove method named "hash"Aaron Patterson2019-01-282-8/+10
| | | | | | | | | | | | We can't use the FixtureResolver as a hash key because it doesn't implement `hash` correctly. This commit renames the method to "data" (which is just as unfortunately named :( )