Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-03-15 | 3 | -41/+15 |
|\ | |||||
| * | Remove formats setters from render template, speeding up partial and ↵ | José Valim | 2010-03-13 | 1 | -2/+1 |
| | | | | | | | | collection renderings. | ||||
| * | Finish cleaning up rendering stack from views and move assigns evaluation to ↵ | José Valim | 2010-03-12 | 2 | -33/+9 |
| | | | | | | | | controller (so plugins and/or controllers can overwrite just one method). | ||||
| * | Allow anything that responds to render to be given as :template and use ↵ | José Valim | 2010-03-12 | 3 | -8/+7 |
| | | | | | | | | find_template instead of find in views. | ||||
* | | Updated documentation for block helpers in render/layouts.rb | Jeroen van Dijk | 2010-03-12 | 1 | -2/+2 |
| | | |||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-03-12 | 3 | -107/+121 |
|\| | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb railties/lib/rails/configuration.rb railties/lib/rails/log_subscriber.rb | ||||
| * | Clean LookupContext API. | José Valim | 2010-03-08 | 3 | -8/+6 |
| | | |||||
| * | Bring AM up to date with new rendering stack. | José Valim | 2010-03-08 | 1 | -0/+2 |
| | | |||||
| * | Speed up performance in resolvers by adding fallbacks just when required. | José Valim | 2010-03-08 | 2 | -2/+3 |
| | | |||||
| * | Rename Template::Lookup to LookupContext. | José Valim | 2010-03-08 | 3 | -5/+5 |
| | | |||||
| * | More refactoring on the views side of rendering. | José Valim | 2010-03-08 | 3 | -95/+97 |
| | | |||||
| * | Finally moved the find template logic to the views. | José Valim | 2010-03-08 | 1 | -16/+24 |
| | | |||||
| * | More cleanup on the layouts side. | José Valim | 2010-03-08 | 2 | -17/+6 |
| | | |||||
| * | Move layout lookup to views. | José Valim | 2010-03-08 | 2 | -2/+16 |
| | | |||||
| * | Added template lookup responsible to hold all information used in template ↵ | José Valim | 2010-03-07 | 2 | -8/+4 |
| | | | | | | | | lookup. | ||||
| * | Solved a problem that prevented render :file => work in layouts | Jose Fernandez | 2010-03-05 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
| * | Change AV formats so they can delegate to the controller. Now users (or ↵ | Carlhuda | 2010-03-01 | 1 | -2/+6 |
| | | | | | | | | plugins) can override details_for_render in their controllers and add appropriate additional details. Now if only they could *do* something with those details... | ||||
* | | Updated documentation for block helpers in render/partials.rb | Jeroen van Dijk | 2010-03-12 | 1 | -3/+3 |
|/ | |||||
* | More html_safe strings now use the safe_concat method | Santiago Pastorino and José Ignacio Costa | 2010-02-05 | 1 | -1/+1 |
| | | | | | | [#3856 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | For performance reasons, you can no longer call html_safe! on Strings. ↵ | Yehuda Katz | 2010-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | Instead, all Strings are always not html_safe?. Instead, you can get a SafeBuffer from a String by calling #html_safe, which will SafeBuffer.new(self). * Additionally, instead of doing concat("</form>".html_safe), you can do safe_concat("</form>"), which will skip both the flag set, and the flag check. * For the first pass, I converted virtually all #html_safe!s to #html_safe, and the tests pass. A further optimization would be to try to use #safe_concat as much as possible, reducing the performance impact if we know up front that a String is safe. | ||||
* | Add missing require for Object#try [#3771 state:resolved] | Xavier Noria | 2010-01-22 | 1 | -0/+2 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | In heterogeneous collections, neither the @path nor the @template are ↵ | José Valim | 2010-01-15 | 1 | -1/+1 |
| | | | | available, so we need to tell that we are simply rendering a collection. | ||||
* | Remove URI object from ActiveResource notification, send the :mailer class ↵ | José Valim | 2010-01-15 | 1 | -4/+1 |
| | | | | in AM (like in AP#process_action) and remove locale instrumentation. | ||||
* | Template rendering should include layout time. | José Valim | 2010-01-15 | 1 | -10/+10 |
| | |||||
* | Provide useful information when instrumenting partials. | José Valim | 2010-01-11 | 1 | -8/+6 |
| | |||||
* | Use underscore in notification namespaces. | José Valim | 2010-01-04 | 2 | -4/+4 |
| | |||||
* | Use namespaces in notifications. | José Valim | 2010-01-03 | 2 | -5/+7 |
| | |||||
* | Make rendering in ActionView happen through _render_template, as the ↵ | José Valim | 2009-12-31 | 1 | -30/+14 |
| | | | | rendering which comes from ActionController. | ||||
* | Remove ActionView inline logging to ActiveSupport::Notifications and create ↵ | José Valim | 2009-12-26 | 1 | -8/+1 |
| | | | | ActionController::Base#log_event, so everything can be logged within one listener. Also expose log_process_action as a hook for different modules to include their own information during the action processing. This allow ActiveRecord to hook and any other ORM. Finally, this commit changes 'Processing' and 'Rendering' in logs to 'Processed' and 'Rendered' because at the point it's logged, everying already happened. | ||||
* | More <%= render(@posts) %> optimization. | José Valim | 2009-12-26 | 1 | -24/+20 |
| | |||||
* | Optimize <%= render(@posts) %>. | José Valim | 2009-12-26 | 1 | -4/+14 |
| | |||||
* | Break instrumentation into several end-points so rendering of partials can ↵ | José Valim | 2009-12-26 | 2 | -26/+40 |
| | | | | be optimized. | ||||
* | Wrap layout rendering in one method: _render_layout (this should make ↵ | José Valim | 2009-12-26 | 2 | -7/+7 |
| | | | | partial instrumentation easier). | ||||
* | Dont introspect inline templates for the logger and cleanup a few styling issues | David Heinemeier Hansson | 2009-12-21 | 1 | -13/+9 |
| | |||||
* | Fix @renderer warning | Joshua Peek | 2009-12-01 | 1 | -10/+10 |
| | |||||
* | When rendering layouts with blocks, use #capture to avoid assuming that the ↵ | Nathan Weizenbaum | 2009-11-05 | 1 | -4/+2 |
| | | | | | | return value is the block's content. Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
* | Remove ActionMailer helpers and rely on AbstractController one. | José Valim | 2009-11-01 | 1 | -1/+1 |
| | |||||
* | First pass at cleaning up action caching | Yehuda Katz | 2009-10-28 | 1 | -1/+0 |
| | |||||
* | Fix a bug where render :text could not handle yield :symbol. Fixes guides ↵ | Yehuda Katz | 2009-10-10 | 1 | -9/+13 |
| | | | | generation | ||||
* | Fix issue with standalone ActionView | Yehuda Katz | 2009-10-09 | 1 | -1/+4 |
| | |||||
* | Switch to on-by-default XSS escaping for rails. | Michael Koziarski | 2009-10-08 | 1 | -1/+1 |
| | | | | | | | | | | | | This consists of: * String#html_safe! a method to mark a string as 'safe' * ActionView::SafeBuffer a string subclass which escapes anything unsafe which is concatenated to it * Calls to String#html_safe! throughout the rails helpers * a 'raw' helper which lets you concatenate trusted HTML from non-safety-aware sources (e.g. presantized strings in the DB) * New ERB implementation based on erubis which uses a SafeBuffer instead of a String Hat tip to Django for the inspiration. | ||||
* | Ported the new ActionView::TestCase from 2-3-stable to master [#3260 | Erik Ostrom | 2009-09-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | state:resolved] The test case now mimicks the template environment more closely, so it's possible to use render, load helper dependencies. This also fixes assert_select, and similar assertions. Because view tests and helpers generally don't render full templates assert_select looks first in rendered and then in output_buffer to find the rendered output. Additional `master'-only changes: Made the Action Pack Rakefile run the ActionView::TestCase tests, and made ActionView::Rendering#_render_text always return a string. Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Clean up log output for rendered templates | Joshua Peek | 2009-09-24 | 1 | -2/+2 |
| | |||||
* | Fixes ActionMailer regression [#3059 state:resolved] | Yehuda Katz | 2009-08-15 | 1 | -1/+1 |
| | |||||
* | Caches and cache clearing seems to actually work, but the actual ↵ | Yehuda Katz | 2009-08-15 | 1 | -49/+73 |
| | | | | architecture is kind of messy. Next: CLEAN UP. | ||||
* | More cleanup of ActionView and reduction in need for blocks in some cases: | Yehuda Katz | 2009-08-15 | 2 | -24/+11 |
| | | | | | | | | * only one of partial_name or :as will be available as a local * `object` is removed * Simplify _layout_for in most cases. * Remove <% render :partial do |args| %> * <% render :partial do %> still works fine | ||||
* | Clean up ActionView some: | Yehuda Katz | 2009-08-15 | 2 | -45/+22 |
| | | | | | | | | | | * Call _evaluate_assigns_and_ivars at the two entry points so we don't have to do a check at every render. * Make template.render viable without having to go through a wrapper method * Remove old TemplateHandler#render(template, local_assigns) path so we don't have to set self.template every time we render a template. * Move Template rescuing code to Template#render so it gets caught every time. * Pull in some tests from Pratik that test render @object in ActionView | ||||
* | Tentatively accept the ":as or :object, but not both" solution | Yehuda Katz | 2009-08-11 | 1 | -22/+21 |
| | |||||
* | Further experimentation. Was able to cut the cost of rendering 100 partials ↵ | Yehuda Katz | 2009-08-11 | 1 | -9/+40 |
| | | | | | | | | | | in a collection in half. To discuss: What are the desired semantics (if any) for layouts in a collection. There are no tests for it at present, and I'm not sure if it's needed at all. Deprecated on this branch: `object` pointing at the current object in partials. You can still use the partial name, or use :as to achieve the same thing. This is obviously up for discussion. | ||||
* | Cache some more things to improve partial perf | Yehuda Katz | 2009-08-09 | 1 | -3/+3 |
| |