aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13982 from dskang/fix-response-flatten-infinite-recursionAaron Patterson2014-02-091-1/+1
|\ | | | | Fix response flatten infinite recursion
| * Prevent [response].flatten from recursing infinitely.Dan Kang2014-02-081-1/+1
| | | | | | | | | | | | Returning `self` from within the array returned by `to_ary` caused this. Instead, we can just substitute another object. It provides the `each` behavior required by the rack spec.
* | FilterParameters is referenced at the class level from the RequestZachary Scott2014-02-091-1/+0
|/ | | | | Since it's already required in the file, we don't need to use autoload too. This commit is symmetrical change to 0b10180 for Response.
* Updated the cookie docs to use the safer JSON.{generate,parse}Godfrey Chan2014-02-081-5/+5
| | | | cc @senny
* Rely on backticks instead of tt tags [ci skip]Robin Dupret2014-02-081-2/+2
| | | | | Since the language in code blocks is inferred, if the code contains tt tags, the block will be parsed as XML for instance while it is Ruby.
* docs, Cookie values are String based. Closes #12860. [ci skip]Yves Senn2014-02-081-7/+7
|
* Require action_view to fix missing constantPhilipe Fatio2014-02-071-0/+1
| | | | | Previously, requiring action_view/view_paths did cause an uninitialized constant error for ENCODING_FLAG, which is defined in action_view.
* Merge pull request #13863 from joshjordan/jsj-dont-throw-out-get-paramsRafael Mendonça França2014-02-011-4/+11
|\ | | | | | | | | | | | | Do not discard query parameters on requests that use wrap_parameters Conflicts: actionpack/CHANGELOG.md
| * Do not discard query parameters on requests that use wrap_parametersJosh Jordan2014-01-301-4/+11
| |
* | only ask for the location filters onceAaron Patterson2014-01-311-4/+5
| |
* | FilterRedirect is referenced at the class level from the ResponseAaron Patterson2014-01-312-1/+1
| | | | | | | | | | We can just require the file rather than going through the autoload indirection
* | Modify the session serializer implementationGuillermo Iguaran2014-01-301-3/+5
| | | | | | | | | | Rename allowed options to :marshal and :json, for custom serializers only allow the use of custom classes.
* | Allow session serializer key in config.session_storeLukasz Sarnacki2014-01-294-6/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | MessageEncryptor has :serializer option, where any serializer object can be passed. This commit make it possible to set this serializer from configuration level. There are predefined serializers (:marshal_serializer, :json_serialzier) and custom serializer can be passed as String, Symbol (camelized and constantized in ActionDispatch::Session namepspace) or serializer object. Default :json_serializer was also added to generators to provide secure defalt.
* | always use a block for cleanup / prepare callbacks so we can clean the ↵Aaron Patterson2014-01-281-0/+9
| | | | | | | | method signature
* | scope is not necessaryAaron Patterson2014-01-281-2/+2
| |
* | Log which keys were set to nil in deep_mungeLukasz Sarnacki2014-01-282-4/+18
|/ | | | | | | | deep_munge solves CVE-2013-0155 security vulnerability, but its behaviour is definately confuisng. This commit adds logging to deep_munge. It logs keys for which values were set to nil. Also mentions in guides were added.
* Clear filtered request attributes between requests in testsAndrew White2014-01-271-0/+3
| | | | | | | | The request attributes filtered_parameters, filtered_env and filtered_path are memoized for performance reasons. However this can cause unusual behavior in tests where there are multiple calls to get, post, etc. Fixes #13803.
* Transform dashes to underscores in resource route namesByron Bischoff2014-01-251-4/+4
| | | | Fixes #13824
* Fix `rake routes` error when `Rails::Engine` with empty routes is mounted; ↵Maurizio De Santis2014-01-241-3/+3
| | | | | | fixes rails/rails#13810 Squash
* Automatically convert dashes to underscores in shorthand routesMikko Johansson2014-01-201-0/+1
|
* Automatically convert dashes to underscores for url helpersAmr Tamimi2014-01-201-1/+2
|
* Revert "Don't remove trailing slash from PATH_INFO for mounted apps"Piotr Sarnacki2014-01-161-7/+1
| | | | | | | The revert is needed because of a regression described in #13369, routes with trailing slash are no longer recognized properly. This reverts commit 50311f1391ddd8e0349d74eb57f04b7e0045a27d.
* Merge branch 'master' into laurocaetano-fix_send_fileAaron Patterson2014-01-1039-162/+409
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (536 commits) doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip] Restore DATABASE_URL even if it's nil in connection_handler test [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users Ensure Active Record connection consistency Revert "ask the fixture set for the sql statements" Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314 Adding Hash#compact and Hash#compact! methods MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users. clear cache on body close so that cache remains during rendering add a more restricted codepath for templates fixes #13390 refactor generator tests to use block form of Tempfile Fix typo [ci skip] Move finish_template as the last public method in the generator Minor typos fix [ci skip] make `change_column_null` reversible. Closes #13576. create/drop test and development databases only if RAILS_ENV is nil Revert "Speedup String#to" typo fix in test name. [ci skip]. `core_ext/string/access.rb` test what we are documenting. Fix typo in image_tag documentation ... Conflicts: actionpack/CHANGELOG.md
| * Allow an absolute controller path inside a module scopeAndrew White2014-01-051-2/+6
| | | | | | | | Fixes #12777
| * Unique the segment keys array for non-optimized url helpersAndrew White2014-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | In Rails 3.2 you only needed pass an argument for dynamic segment once so unique the segment keys array to match the number of args. Since the number of args is less than required parts the non-optimized code path is selected. This means to benefit from optimized url generation the arg needs to be specified as many times as it appears in the path. Fixes #12808
| * Show full route constraints in error messageAndrew White2014-01-052-4/+5
| | | | | | | | | | | | | | | | When an optimized helper fails to generate, show the full route constraints in the error message. Previously it would only show the contraints that were required as part of the path. Fixes #13592
| * Simplify arg parameterizationAndrew White2014-01-051-6/+1
| |
| * Use a custom route vistor for optimized route generationAndrew White2014-01-052-31/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using a Regexp to replace dynamic segments in a path string is fraught with difficulty and can lead to odd edge cases like #13349. Since we already have a parsed representation of the path it makes sense to use that to generate an array of segments that can be used to build an optimized route's path quickly. Tests on a simple route (e.g. /posts/:id) show a speedup of 35%: https://gist.github.com/pixeltrix/8261932 Calculating ------------------------------------- Current Helper: 5274 i/100ms New Helper: 8050 i/100ms ------------------------------------------------- Current Helper: 79263.6 (±3.7%) i/s - 395550 in 4.997252s New Helper: 153464.5 (±4.9%) i/s - 772800 in 5.047834s Tests on a more complex route show even an greater performance boost: https://gist.github.com/pixeltrix/8261957 Calculating ------------------------------------- Current Helper: 2367 i/100ms New Helper: 5382 i/100ms ------------------------------------------------- Current Helper: 29506.0 (±3.2%) i/s - 149121 in 5.059294s New Helper: 78815.5 (±4.1%) i/s - 398268 in 5.062161s It also has the added benefit of fixing the edge cases described above. Fixes #13349
| * update copyright notices to 2014. [ci skip]Vipul A M2014-01-012-2/+2
| |
| * Allow engine root relative redirects using an empty string.Andrew White2014-01-011-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-311-27/+54
| |\ | | | | | | Add any/all support for variants
| | * Add any/all support for variantsŁukasz Strzałkowski2013-12-261-27/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * AC::Parameters#permit! permits hashes in array valuesXavier Noria2013-12-231-2/+4
| |
| * Move the null mime type to request.formatCarlos Antonio da Silva2013-12-234-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-211-2/+12
| |
| * 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-211-3/+10
| | | | | | | | #13382]
| * Merge pull request #13188 from imanel/skip_deep_mungeJeremy Kemper2013-12-192-0/+8
| |\ | | | | | | | | | | | | | | | | | | Add configuration option to optionally disable deep_munge Conflicts: actionpack/CHANGELOG.md
| | * Add configuration option to optionally disable deep_mungeBernard Potocki2013-12-052-0/+8
| | |
| * | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-12-203-3/+3
| |\ \
| | * | Typos. return -> returns. [ci skip]Lauro Caetano2013-12-033-3/+3
| | | |
| * | | Show routes defined under assets prefixRyunosuke SATO2013-12-191-1/+1
| | | | | | | | | | | | | | | | Closes #9625
| * | | Change all `MiniTest` to `Minitest` since, `MiniTest` namespace has been ↵Vipul A M2013-12-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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-171-2/+7
| | | |
| * | | Merge pull request #13345 from jeremy/get-csrfJeremy Kemper2013-12-171-13/+61
| |\ \ \ | | | | | | | | | | CSRF protection from cross-origin <script> tags