aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Allow engine root relative redirects using an empty string.Andrew White2014-01-013-49/+149
| | | | | | | | | | | | | | | | | | Example: # application routes.rb mount BlogEngine => '/blog' # engine routes.rb get '/welcome' => redirect('') This now redirects to the path `/blog`, whereas before it would redirect to the application root path. In the case of a path redirect or a custom redirect if the path returned contains a host then the path is treated as absolute. Similarly for option redirects, if the options hash returned contains a `:host` or `:domain` key then the path is treated as absolute. Fixes #7977
* Merge pull request #13470 from strzalek/variants-all-anyDavid Heinemeier Hansson2013-12-315-27/+217
|\ | | | | Add any/all support for variants
| * Add any/all support for variantsŁukasz Strzałkowski2013-12-265-27/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like `format.any`, you can do the same with variants. It works for both inline: respond_to do |format| format.html.any { render text: "any" } format.html.phone { render text: "phone" } end and block syntax: respond_to do |format| format.html do |variant| variant.any(:tablet, :phablet){ render text: "any" } variant.phone { render text: "phone" } end end
* | Fix Encoding::CompatibilityError when public path is UTF-8Andrew White2013-12-298-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In #5337 we forced the path encoding to ASCII-8BIT to prevent static file handling from blowing up before an application has had chance to deal with possibly invalid urls. However this has a negative side effect of making it an incompatible encoding if the application's public path has UTF-8 characters in it. To work around the problem we check to see if the path has a valid encoding once it has been unescaped. If it is not valid then we can return early since it will not match any file anyway. Fixes #13518
* | Fix method redefined warning message in mapper.rbAndrew White2013-12-291-2/+3
|/
* Improve font of some code in API documentation [ci skip]Chun-wei Kuo2013-12-261-1/+1
| | | | | * Add "<tt>" or "+" to improve font of some code and filenames in API documentation * Does not contain wording changes
* Unused classes in AP testsAkira Matsuda2013-12-252-14/+0
|
* AC::Parameters#permit! permits hashes in array valuesXavier Noria2013-12-233-5/+19
|
* Move the null mime type to request.formatCarlos Antonio da Silva2013-12-236-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TLDR: always return an object that responds to the query methods from request.format, and do not touch Mime::Type[] lookup to avoid bugs. --- Long version: The initial issue was about being able to do checks like request.format.html? for request with an unknown format, where request.format would be nil. This is where the issue came from at first in #7837 and #8085 (merged in cba05887dc3b56a46a9fe2779b6b228880b49622), but the implementation went down the path of adding this to the mime type lookup logic. This unfortunately introduced subtle bugs, for instance in the merged commit a test related to send_file had to be changed to accomodate the introduction of the NullType. Later another bug was found in #13064, related to the content-type being shown as #<Mime::NullType:...> for templates with localized extensions but no format included. This one was fixed in #13133, merged in 43962d6ec50f918c9970bd3cd4b6ee5c7f7426ed. Besides that, custom handlers were not receiving the proper template formats anymore when passing through the rendering process, because of the NullType addition. That was found while migrating an application from 3.2 to 4.0 that uses the Markerb gem (a custom handler that generates both text and html emails from a markdown template). --- This changes the implementation moving away from returning this null object from the mime lookup, and still fixes the initial issue where request.format.zomg? would raise an exception for unknown formats due to request.format being nil.
* Add missing av/railtie requireŁukasz Strzałkowski2013-12-221-0/+1
|
* optimizes array conversion in AC::ParametersXavier Noria2013-12-212-2/+17
|
* refactors AC::Parameters#fetchXavier Noria2013-12-211-10/+3
| | | | | | | | AC::Parameters#fetch was refactored in 7171111 to prevent self mutation, but in doing so it hardcodes logic #convert_hashes_to_parameters is supposed to encapsulate. Better leave the delegation, and add a way to avoid mutating self in there.
* converts hashes in arrays of unfiltered params to unpermitted params [fixes ↵Xavier Noria2013-12-213-3/+23
| | | | #13382]
* Merge pull request #13188 from imanel/skip_deep_mungeJeremy Kemper2013-12-194-0/+33
|\ | | | | | | | | | | | | Add configuration option to optionally disable deep_munge Conflicts: actionpack/CHANGELOG.md
| * Add configuration option to optionally disable deep_mungeBernard Potocki2013-12-054-0/+35
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-12-204-4/+4
|\ \
| * | Typos. return -> returns. [ci skip]Lauro Caetano2013-12-034-4/+4
| | |
* | | Fix assertions for testing unknown formats using Mime::NullTypeCarlos Antonio da Silva2013-12-191-5/+5
| | |
* | | Show routes defined under assets prefixRyunosuke SATO2013-12-193-1/+17
| | | | | | | | | | | | Closes #9625
* | | Prefer assert_raise instead of flunk + rescue to test for exceptionsCarlos Antonio da Silva2013-12-192-20/+9
| | | | | | | | | | | | | | | | | | Change most tests to make use of assert_raise returning the raised exception rather than relying on a combination of flunk + rescue to check for exception types/messages.
* | | Change all `MiniTest` to `Minitest` since, `MiniTest` namespace has been ↵Vipul A M2013-12-183-7/+7
| | | | | | | | | | | | | | | | | | renamed to `Minitest` Ref: https://github.com/seattlerb/minitest/blob/master/History.txt
* | | Get ready to release 4.1.0.beta1David Heinemeier Hansson2013-12-171-1/+1
| | |
* | | Clearly limit new CSRF protection to GET requestsJeremy Kemper2013-12-172-2/+17
| | |
* | | Merge pull request #13345 from jeremy/get-csrfJeremy Kemper2013-12-175-25/+138
|\ \ \ | | | | | | | | CSRF protection from cross-origin <script> tags
| * | | CSRF protection from cross-origin <script> tagsJeremy Kemper2013-12-175-25/+138
| | | | | | | | | | | | | | | | Thanks to @homakov for sounding the alarm about JSONP-style data leaking
* | | | Merge pull request #13346 from chancancode/release_notes_etcYves Senn2013-12-171-1/+1
|\ \ \ \ | | | | | | | | | | Release notes fixes [ci skip]
| * | | | Some assorted fixes for the 4.1 release notes:Godfrey Chan2013-12-171-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added release notes for secrets.yml and mentioned it in the highlights * Added release notes for Mailer previews and mentioned it in the highlights * Added release notes for Module#concerning * Removed mention for AV extraction from the highlights * Rearranged the major features to put highlighted features first * Various improvements and typo fixes [ci skip]
* / / / Disable available locales checks to avoid warnings running the testsCarlos Antonio da Silva2013-12-171-0/+3
|/ / /
* | | Add mailer previews feature based on mail_view gemAndrew White2013-12-171-1/+1
| | |
* | | Merge pull request #13307 from akshay-vishnoi/typoRafael Mendonça França2013-12-151-1/+1
|\ \ \ | | | | | | | | Spelling and Grammar check [ci skip]
| * | | Spelling and Grammar check [ci skip]Akshay Vishnoi2013-12-161-1/+1
| | | |
* | | | Update secret_key_base Docsrobertomiranda2013-12-152-10/+11
| | | |
* | | | Fix syntax error in redirect_to examplePhilipe Fatio2013-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | Without parenthesis, ruby assumes that curly braces denote the beginning of a block.
* | | | Merge pull request #13293 from akshay-vishnoi/typoCarlos Antonio da Silva2013-12-124-5/+5
|\| | | | | | | | | | | Spelling and Grammar checks [ci skip]
| * | | Spelling and Grammar checksAkshay Vishnoi2013-12-124-5/+5
| | | |
* | | | Merge pull request #13290 from strzalek/inline-syntax-docsRafael Mendonça França2013-12-122-0/+17
|\ \ \ \ | |/ / / |/| | | Variants inline syntax documentation
| * | | Variants inline syntax documentation [ci skip]Łukasz Strzałkowski2013-12-122-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | * Extend method documentation * Mention it in actionpack/CHANGELOG * Update release notes
* | | | Changelog improvements [ci skip]Carlos Antonio da Silva2013-12-121-4/+6
|/ / /
* | | Merge pull request #13288 from dvsuresh/fix_typoDamien Mathieu2013-12-121-1/+1
|\ \ \ | | | | | | | | Fix typo in action_controller responder.rb [ci skip]
| * | | Fix typo in action_controller responder.rbdvsuresh2013-12-121-1/+1
| | | |
* | | | Merge pull request #13284 from aayushkhandelwal11/typos_correctedGodfrey Chan2013-12-111-1/+1
|\ \ \ \ | |/ / / |/| | | s/everytime/every time/
| * | | typos rectified [ci skip]Aayush khandelwal2013-12-121-1/+1
| | | |
* | | | Update CHANGELOG entry for Session#fetchTrent Ogren2013-12-111-3/+1
| | | | | | | | | | | | | | | | | | | | This reverts the changes to CHANGELOG.md in commit 38f8872aa5fd8f0a1d0895e9eb41f73261acd040.
* | | | Make ActionDispatch::Request::Session#fetch behave like Hash#fetchTrent Ogren2013-12-112-11/+10
|/ / / | | | | | | | | | | | | | | | Session#fetch was mutating the session when given a default argument and/or a block. Since Session duck-types as a Hash, it should behave like one in these cases.
* | | Fix mounting engines inside a resources blockPiotr Sarnacki2013-12-103-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a route is mounted inside a resources block, it's automatically prefixed, so a following code: resources :users do mount Blog::Engine => '/blog' end will generate a user_blog path helper. In order to access engine helpers, we also use "mounted_helpers", a list of helpers associated with each mounted engine, so a path to blog's post can be generated using user_blog.post_path(user, post). The problem I'm fixing here is that mount used a raw :as option, without taking nestings into account. As a result, blog was added to a route set as a `user_blog`, but helper was generated for just `blog`. This commit applies the proper logic for defining a helper for a mounted engine nested in resources or resource block. (closes #8533)
* | | Inline variants syntaxŁukasz Strzałkowski2013-12-103-3/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In most cases, when setting variant specific code, you're not sharing any code within format. Inline syntax can vastly simplify defining variants in those situations: respond_to do |format| format.js { render "trash" } format.html do |variant| variant.phone { redirect_to progress_path } variant.none { render "trash" } end end Becomes: respond_to do |format| format.js { render "trash" } format.html.phone { redirect_to progress_path } format.html.none { render "trash" } end
* | | Simplify @responses hash initializationŁukasz Strzałkowski2013-12-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @responses hash needs to be initialized with mime types that we get from Collector#collect_mimes_from_class_level. Mime::Type class as key and nil as value. This need to happen before content negotiation. Before that, it was looping though mime types and executing mime-type-generated method inside collector (see AbstractController::Collector#generate_method_for_mime). That approach resulted in 2 unnecessary method calls for each mime type collected by Collector#collect_mimes_from_class_level. Now hash is initialized in place, without usage of Collector#custom method.
* | | Revert "Merge pull request #13235 from strzalek/variants-inline" -- needs a ↵David Heinemeier Hansson2013-12-082-28/+10
| | | | | | | | | | | | | | | | | | | | | little more work! This reverts commit 186161148a189839a1e0924043f068a8d155ce69, reversing changes made to cad9eb178ea5eec0e27d74e93518f4ed34e2f997.
* | | Merge pull request #13235 from strzalek/variants-inlineDavid Heinemeier Hansson2013-12-082-10/+28
|\ \ \ | | | | | | | | Inline syntax for variants
| * | | Inline variants syntaxŁukasz Strzałkowski2013-12-082-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In most cases, when setting variant specific code, you're not sharing any code within format. Inline syntax can vastly simplify defining variants in those sitiations: respond_to do |format| format.js { render "trash" } format.html do |variant| variant.phone { redirect_to progress_path } variant.none { render "trash" } end end ` Becomes: respond_to do |format| format.js { render "trash" } format.html.phone { redirect_to progress_path } format.html.none { render "trash" } end