aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* Removing Metal from Rails 3. wycats2010-05-292-30/+0
| | | | | | | | | | | | | | | | | | | | If you have existing Metals, you have a few options: * if your metal behaves like a middleware, add it to the middleware stack via config.middleware.use. You can use methods on the middleware stack to control exactly where it should go * if it behaves like a Rack endpoint, you can link to it in the router. This will result in more optimal routing time, and allows you to remove code in your endpoint that matches specific URLs in favor of the more powerful handling in the router itself. For the future, you can use ActionController::Metal to get a very fast controller with the ability to opt-in to specific controller features without paying the penalty of the full controller stack. Since Rails 3 is closer to Rack, the Metal abstraction is no longer needed.
* Merge commit 'mislav/auto_link'Michael Koziarski2010-05-292-30/+61
|\
| * avoid auto_linking already linked emails; more robust detection of linked URLsMislav Marohnić2010-05-242-16/+48
| | | | | | | | | | | | | | | | | | | | 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-242-14/+13
| | | | | | | | | | | | recognizes all URI scheme allowed characters, such as colon and period. [#3494 state:resolved]
* | Merge remote branch 'rails/master'Xavier Noria2010-05-2715-233/+299
|\ \
| * | In AV::TC, move protect_against_forgery? from the test_case to theDavid Chelimsky2010-05-262-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _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>
| * | reorganize tests for AV::TCDavid Chelimsky2010-05-261-140/+138
| | | | | | | | | | | | | | | | | | | | | | | | - decouple tests from the test case class by moving them outside - split out more TestCase subs as cleaner way of avoiding bleed of class level concepts Signed-off-by: José Valim <jose.valim@gmail.com>
| * | Support configuration of controller.controller_path on instances ofDavid Chelimsky2010-05-262-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-242-2/+15
| | |
| * | HTML safety: fix textarea with nil contentJeremy Kemper2010-05-242-1/+7
| | |
| * | translate method doesn't support arrays anymore and is optimized to be used ↵Santiago Pastorino2010-05-245-34/+13
| | | | | | | | | | | | | | | | | | 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-244-42/+41
| | | | | | | | | | | | | | | | | | | | | | | | 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-242-65/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-244-41/+42
| | | | | | | | | | | | | | | | | | | | | | | | where values for keys of the form (.|_)html keys are html_safe [#4675] Signed-off-by: José Valim <jose.valim@gmail.com>
| * | Fix a bug where responders were not working properly on method override.José Valim2010-05-242-1/+14
| |/
| * refactor evals and adds some __FILE__ and __LINE__Santiago Pastorino2010-05-205-11/+9
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | fix small doc bug about running single unit test filesDavid Chelimsky2010-05-251-1/+1
| |
* | Minor typo fix in callbacks.rb of abstract_controllerRohit Arondekar2010-05-201-1/+1
|/
* Merge remote branch 'rails/master'Xavier Noria2010-05-1940-462/+711
|\
| * Avoid instance variable @output_buffer not initializedSantiago Pastorino2010-05-191-1/+2
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Use better assertion methods for testingNeeraj Singh2010-05-192-9/+9
| | | | | | | | | | | | [#4645 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Avoid creating a Rack::Response object in the cookie middleware since it may ↵José Valim2010-05-181-9/+13
| | | | | | | | stream the body.
| * Cut the fat and make session stores rely on request.cookie_jar and change ↵José Valim2010-05-187-133/+71
| | | | | | | | set_session semantics to return the cookie value instead of a boolean.
| * Use assert_respond_to because it has better error messagingNeeraj Singh2010-05-183-8/+8
| | | | | | | | | | | | [#4628 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Remove deprecated methods since 2-3-stable.José Valim2010-05-182-46/+6
| |
| * Kill legacy dispatcher.José Valim2010-05-181-2/+0
| |
| * Simplify cookie_store by simply relying on cookies.signed.José Valim2010-05-186-142/+130
| |
| * Rely on set and delete cookie logic from rack.José Valim2010-05-182-33/+6
| |
| * Merge remote branch 'origin/master'wycats2010-05-174-3/+38
| |\
| | * Added default currency values to NumberHelper and pass them to I18n.translateSantiago Pastorino2010-05-172-2/+22
| | | | | | | | | | | | | | | | | | [#4604 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
| | * Allow root to be given in the resources scope without need to specify :on => ↵José Valim2010-05-172-1/+16
| | | | | | | | | | | | collection.
| * | Merge branch 'encodings'wycats2010-05-172-5/+9
| |\ \
| | * | Make sure encoding changes don't break 1.8wycats2010-05-172-5/+9
| | | |
| * | | Revert "Moved encoding work in progress to a feature branch."wycats2010-05-1715-87/+435
| | |/ | |/| | | | | | | This reverts commit ade756fe42423033bae8e5aea8f58782f7a6c517.
| * | Ruby 1.9: helper path may be a pathname, so convert to a string before ↵Jeremy Kemper2010-05-161-1/+1
| | | | | | | | | | | | quoting for regexp
* | | 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-1725-85/+365
|\| |
| * | Moved encoding work in progress to a feature branch.Jeremy Kemper2010-05-1615-435/+87
| |/ | | | | | | This reverts commits af0d1a88157942c6e6398dbf73891cff1e152405 and 64d109e3539ad600f58536d3ecabd2f87b67fd1c.
| * Significantly improved internal encoding heuristics and support.wycats2010-05-1615-52/+384
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-163-45/+61
| |
| * Take out stale tasks from Actionpack's Rakefile [#4619 state:resolved]Rizwan Reza2010-05-161-19/+0
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Check blocks are not incorrectly detected when compiling erubis templates ↵Simon Jefford2010-05-163-1/+7
| | | | | | | | | | | | [#4575 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Fixed 1 failure in ActionPack testsuite [#4613 state:resolved]Hussein Morsy2010-05-161-2/+2
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * added support for html attributes in options_for_select [#2165]pleax2010-05-162-2/+81
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Fixed 1 failure and 2 errors in ActionPack testsuite [#4613 state:commited]rohit2010-05-163-6/+6
| | | | | | | | 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-152-5/+118
| | | | | | | | | | | | [#4559 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Optimize the code added in fa99de0bd054576336c9José Valim2010-05-151-9/+19
| |
| * Ruby 1.9: fix invalid rack response in testJeremy Kemper2010-05-151-1/+1
| |
| * 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-153-0/+11
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>