aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Collapse)AuthorAgeFilesLines
* Base options cant live in lazy loaded helpers as they then wont be available ↵David Heinemeier Hansson2010-05-312-7/+4
| | | | to set for config
* Update template to allow handlers to more cleanly handle encodings (ht: nex3)wycats2010-05-303-65/+65
|
* Merge commit 'mislav/auto_link'Michael Koziarski2010-05-291-12/+21
|\
| * avoid auto_linking already linked emails; more robust detection of linked URLsMislav Marohnić2010-05-241-9/+18
| | | | | | | | | | | | | | | | | | | | References #1523 [#1862 state:resolved] [#3591 state:resolved] Add test that shows how link text can contain HTML if needed: the trick is using block form in combination with `raw`. Let link text be automatically HTML-escaped [#2017 state:resolved]
| * auto_link: support arbitrary URI schemes like "ftp:" and "file:"Mislav Marohnić2010-05-241-3/+3
| | | | | | | | | | | | recognizes all URI scheme allowed characters, such as colon and period. [#3494 state:resolved]
* | In AV::TC, move protect_against_forgery? from the test_case to theDavid Chelimsky2010-05-261-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | _helper module included in the view. - ensures that protect_against_forgery? is present when a helper included in a partial that is rendered by the template under test calls it (which happens in FormTagHelper#extra_tags_for_form, for example). [#4700 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Support configuration of controller.controller_path on instances ofDavid Chelimsky2010-05-261-2/+7
| | | | | | | | | | | | | | | | | | | | ActionView::TestCase::TestController without stubs. Just say: @controller.controller_path = "path/i/need/for/this/test" [#4697 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | i18n: t() handles single keys returning an Array, alsoJeremy Kemper2010-05-241-2/+5
| |
* | HTML safety: fix textarea with nil contentJeremy Kemper2010-05-241-1/+1
| |
* | translate method doesn't support arrays anymore and is optimized to be used ↵Santiago Pastorino2010-05-241-18/+10
| | | | | | | | | | | | with strings or symbols Signed-off-by: José Valim <jose.valim@gmail.com>
* | Revert "translation method for arrays on TranslationHelper module returns an ↵Santiago Pastorino2010-05-241-25/+25
| | | | | | | | | | | | | | | | array where values for keys of the form (.|_)html keys are html_safe" This reverts commit 05c95b5c5815c0b3ae55fda7a897922b7f3ec2c7. Signed-off-by: José Valim <jose.valim@gmail.com>
* | Move AV::TC to AV::TC::Behavior [#4678 state:resolved]David Chelimsky2010-05-241-65/+85
| | | | | | | | | | | | | | | | | | | | | | | | - enables alternative testing frameworks to include AV::TC::Behavior instead of subclassing AV::TC - also added tests and code for: - test view delegates :notice to request.flash - useful since generators generate views that use notice - test case doesn't try to include modules that are actually classes Signed-off-by: José Valim <jose.valim@gmail.com>
* | translation method for arrays on TranslationHelper module returns an array ↵Santiago Pastorino2010-05-241-25/+25
|/ | | | | | | | where values for keys of the form (.|_)html keys are html_safe [#4675] Signed-off-by: José Valim <jose.valim@gmail.com>
* refactor evals and adds some __FILE__ and __LINE__Santiago Pastorino2010-05-203-5/+4
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge remote branch 'rails/master'Xavier Noria2010-05-196-74/+293
|\
| * Avoid instance variable @output_buffer not initializedSantiago Pastorino2010-05-191-1/+2
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Merge remote branch 'origin/master'wycats2010-05-171-2/+5
| |\
| | * Added default currency values to NumberHelper and pass them to I18n.translateSantiago Pastorino2010-05-171-2/+5
| | | | | | | | | | | | | | | | | | [#4604 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
| * | Make sure encoding changes don't break 1.8wycats2010-05-171-1/+3
| | |
* | | fix documentation typoMarius Nuennerich2010-05-181-2/+2
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | Merge branch 'master' of git://github.com/rails/railsRizwan Reza2010-05-177-38/+96
|\ \ \ | | |/ | |/|
| * | Moved encoding work in progress to a feature branch.Jeremy Kemper2010-05-164-284/+71
| |/ | | | | | | This reverts commits af0d1a88157942c6e6398dbf73891cff1e152405 and 64d109e3539ad600f58536d3ecabd2f87b67fd1c.
| * Significantly improved internal encoding heuristics and support.wycats2010-05-164-35/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Default Encoding.default_internal to UTF-8 * Eliminated the use of file-wide magic comments to coerce code evaluated inside the file * Read templates as BINARY, use default_external or template-wide magic comments inside the Template to set the initial encoding * This means that template handlers in Ruby 1.9 will receive Strings encoded in default_internal (UTF-8 by default) * Create a better Exception for encoding issues, and use it when the template source has bytes that are not compatible with the specified encoding * Allow template handlers to opt-into handling BINARY. If they do so, they need to do some of their own manual encoding work * Added a "Configuration Gotchas" section to the intro Rails Guide instructing users to use UTF-8 for everything * Use config.encoding= in Ruby 1.8, and raise if a value that is an invalid $KCODE value is used Also: * Fixed a few tests that were assert() rather than assert_equal() and were caught by Minitest requiring a String for the message * Fixed a test where an assert_select was misformed, also caught by Minitest being more restrictive * Fixed a test where a Rack response was returning a String rather than an Enumerable
| * Initial work to improve the state of encodings for templateswycats2010-05-162-45/+59
| |
| * Check blocks are not incorrectly detected when compiling erubis templates ↵Simon Jefford2010-05-161-1/+1
| | | | | | | | | | | | [#4575 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * added support for html attributes in options_for_select [#2165]pleax2010-05-161-2/+25
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Sending :id => nil to form helpers now properly omits the "id" html element ↵Jeff Dean2010-05-151-5/+11
| | | | | | | | | | | | [#4559 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Optimize the code added in fa99de0bd054576336c9José Valim2010-05-151-9/+19
| |
| * make sure `as` is set before trying to build an #{as}_counter. [#2804 ↵Jeff Kreeftmeijer2010-05-151-1/+1
| | | | | | | | | | | | state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * partial counters with :as [#2804 state:resolved]Jeff Kreeftmeijer2010-05-151-0/+1
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Accept :alt => nil on image_tag [#4558 state:resolved]Marc-Andre Lafortune2010-05-151-1/+1
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Improve previous patch a bit [#3645 state:resolved]José Valim2010-05-152-9/+6
| |
| * Let label helpers accept blocks.Stephen Celis2010-05-152-18/+40
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Use annoted source code in Template:Error to avoid special cases in the show ↵José Valim2010-05-091-3/+2
| | | | | | | | exceptions middleware.
* | Added extra documentation for content_for helperJeroen van Dijk2010-05-151-6/+25
|/
* Favor %{} in all code instead of (deprecated) {{}} as interpolation syntax ↵Lawrence Pit2010-05-031-1/+1
| | | | | | for I18n Signed-off-by: José Valim <jose.valim@gmail.com>
* Make backtrace_cleaner work as expected. Prior to this patch, the Full Trace ↵José Valim2010-05-031-26/+6
| | | | rarely showed the full trace. Also, increase performance considerably.
* add NullResolverDavid Chelimsky2010-05-021-0/+8
| | | | | | [#4523 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* move FixtureResolver to a file that is accessible outside Rails' own testsDavid Chelimsky2010-05-021-0/+35
| | | | | | [#4522 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Change event namespace ordering to most-significant first [#4504 state:resolved]Justin George2010-05-023-4/+4
| | | | | | | | | More work still needs to be done on some of these names (render_template.action_view and render_template!.action_view particularly) but this allows (for example) /^sql/ to subscribe to all the various ORMs without further modification Signed-off-by: José Valim <jose.valim@gmail.com>
* Speed up I18n helpers in views and add entry to CHANGELOG.José Valim2010-05-011-7/+3
|
* Use %{} syntax in I18n (faster) instead of {{}}.José Valim2010-05-012-17/+17
|
* Merge branch 'master' of github.com:rails/railswycats2010-04-303-47/+36
|\
| * removing the extra assignment statement [#4432 state:resolved]Neeraj Singh2010-04-301-1/+0
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Fix form builder and form helpers inconsistencies [#4432 state:resolved]Neeraj Singh2010-04-291-43/+33
| | | | | | | | | | | | | | | | * datetime_select and select_datetime should be consistent as much as possible * date_select and select_date should be consistent as much as possible * time_select and select_time should be consistent as much as possible Signed-off-by: José Valim <jose.valim@gmail.com>
| * Fix prototype grep depending on JSON encoding regexp as JavaScript regexpJeremy Kemper2010-04-271-1/+1
| |
| * Only run load hooks once a file has been fully loaded.Nathan Weizenbaum2010-04-271-2/+2
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Merge branch 'master' of github.com:rails/railswycats2010-04-263-3/+3
|\|
| * Rename fieldWithErrors style to field_with_errors. Remove unused alert style.Jeremy Kemper2010-04-241-1/+1
| |
| * HWIA symbolize_keys now returns a hash so no need to do this anymoreSantiago Pastorino2010-04-221-1/+1
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>