aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
* never merge url options in to the first data hashAaron Patterson2014-05-011-1/+1
| | | | | if you want options, don't mix them with the first hash, just pass them all in with the second hash
* Merge pull request #14915 from juanpastas/patch-1Rafael Mendonça França2014-05-011-20/+37
|\ | | | | Update mapper.rb
| * [skip ci] Document: required `via` option in `match` routing method.Juan David Pastas2014-04-301-20/+37
| |
* | Merge pull request #12651 from cespare/ipv6-remote-ip-fixesRafael Mendonça França2014-05-011-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Make remote_ip detection properly handle private IPv6 addresses Conflicts: actionpack/CHANGELOG.md
| * | Make remote_ip detection properly handle private IPv6 addressesCaleb Spare2013-10-261-1/+1
| | | | | | | | | | | | Fixes #12638.
* | | avoid calling extract_record multiple timesAaron Patterson2014-04-301-3/+2
| | |
* | | eliminate conditional when sending the named route methodAaron Patterson2014-04-301-2/+4
| |/ |/|
* | Fixed an issue with migrating legacy json cookies.Godfrey Chan2014-04-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the `VerifyAndUpgradeLegacySignedMessage` assumes all incoming cookies are marshal-encoded. This is not the case when `secret_token` is used in conjunction with the `:json` or `:hybrid` serializer. In those case, when upgrading to use `secret_key_base`, this would cause a `TypeError: incompatible marshal file format` and a 500 error for the user. Fixes #14774. *Godfrey Chan*
* | Make URL escaping more consistentAndrew White2014-04-204-6/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Escape '%' characters in URLs - only unescaped data should be passed to URL helpers 2. Add an `escape_segment` helper to `Router::Utils` that escapes '/' characters 3. Use `escape_segment` rather than `escape_fragment` in optimized URL generation 4. Use `escape_segment` rather than `escape_path` in URL generation For point 4 there are two exceptions. Firstly, when a route uses wildcard segments (e.g. *foo) then we use `escape_path` as the value may contain '/' characters. This means that wildcard routes can't be optimized. Secondly, if a `:controller` segment is used in the path then this uses `escape_path` as the controller may be namespaced. Fixes #14629, #14636 and #14070.
* | Optimize URI escapingAndrew White2014-04-201-17/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | The URI::Parser#escape method is a general use method that has to deal with a variety of input however our use of it is limited in scope so we can increase the performance by implementing our specific needs within ActionDispatch::Journey::Router::Utils directly. If there is no encoding required then there is no change in performance or number of objects allocated, but for each character that needs to be encoded we save five object allocations and gain a performance boost. The performance boost seen varies from 20% when there is one character to over 50% when encoding ten characters.
* | Always escape string passed to url helper.edogawaconan2014-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | Makes it clear that anything passed with the helper must not be percent encoded. Fixes previous behavior which tricks people into believing passing non-percent-encoded will generate a proper percent-encoded path while in reality it doesn't ('%' isn't escaped). The intention is nice but the heuristic is broken.
* | "subhash" --> "sub-hash"Akshay Vishnoi2014-04-191-2/+2
| |
* | Implement to_io as an aliasRafael Mendonça França2014-04-171-5/+1
| |
* | Merge pull request #14755 from timlinquist/to_io_http_uploadRafael Mendonça França2014-04-171-0/+5
|\ \ | | | | | | | | | Use common to_io so users can access the underlying IO object
| * | Provide interface for accessing underlying IO objectTim Linquist2014-04-151-0/+5
| | | | | | | | | | | | | | | | | | In some cases users may need to work with/manipulate more of the Tempfile api than provided by Upload. Allow users to get at the underlying io via the common to_io method of IO/IO-like objects
* | | Merge pull request #14745 from razum2um/plain-text-diagnosticsRafael Mendonça França2014-04-152-0/+9
|\ \ \ | | | | | | | | Display diagnostics in text format for xhr request
| * | | Display diagnostics in text format for xhr requestVlad Bokov2014-04-142-0/+9
| | | |
* | | | Merge pull request #14728 from stomar/assertion-msgYves Senn2014-04-151-3/+3
|\ \ \ \ | |_|/ / |/| | | Remove surplus period from assertion messages
| * | | Remove surplus period from assertion messagesMarcus Stollsteimer2014-04-131-3/+3
| | | |
* | | | Return null type format when format is not knowRafael Mendonça França2014-04-141-1/+1
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When requesting a controller with the following code with a unknown format: def my_action respond_to do |format| format.json { head :ok } format.any { render text: 'Default response' } end end we should render the default response instead of raising ActionController::UnknownFormat Fixes #14462 Conflicts: actionpack/CHANGELOG.md actionpack/test/controller/mime/respond_with_test.rb Conflicts: actionpack/CHANGELOG.md
* | | Update documentation to use Rails.application insteadMarcel Morgan2014-04-132-2/+2
|/ / | | | | | | | | | | | | References to ``AppName::Application` removed in favour of ``Rails.application`` as generated with a new rails 4.1 app. [ci skip]
* | Merge pull request #14619 from winston/enhance-routing-error-htmlRafael Mendonça França2014-04-111-63/+119
|\ \ | | | | | | | | | Enhance routing error html page
| * | Split search results into 'exact matches' and 'fuzzy matches'.Winston2014-04-111-60/+96
| | | | | | | | | | | | - also refactored the javascript.
| * | Improve CSS styling for routing error html page.Winston2014-04-111-7/+25
| | |
| * | Implement fuzzy matching for route search on routing error html page.Winston2014-04-111-8/+10
| | |
* | | Only make deeply nested routes shallow when parent is shallowAndrew White2014-04-111-1/+14
|/ / | | | | | | | | | | | | | | | | | | Since `:shallow` may be set at any point in the resource nesting we should only make the new and collection routes shallow when the parent is shallow. This is a bit of a hack but until the mapper is refactored to an object graph instead of a hash of merged values it's the best we can do. Fixes #14684.
* | Avoid URI parsingAndriel Nuernberg2014-04-091-5/+8
| | | | | | | | | | This parsing is unecessary once the Request object already has the needed information.
* | push move_string in to `move`Aaron Patterson2014-04-011-14/+12
| |
* | combine move_regexp and move_string so we only loop over states onceAaron Patterson2014-04-011-9/+6
| |
* | do not create memo objects since we'll just throw them awayAaron Patterson2014-04-012-9/+11
| |
* | only ask if `t` is empty once.Aaron Patterson2014-04-011-4/+1
| |
* | Merge pull request #13890 from achempion/syntax-error-backtraceYves Senn2014-03-291-0/+8
|\ \ | | | | | | append link to bad code when error type is SyntaxError
| * | Append link to bad code to backtrace when exception is SyntaxErrorBoris Kuznetsov2014-03-271-0/+8
| | |
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-291-0/+4
|\ \ \
| * | | Mention required glob param name in match docs for mapperEarl St Sauver2014-03-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | THe match documentation doesn't mention any requirement of the parameter name requirement for matches. However, including a bare glob character without a variable assignment causes a parse error.
* | | | Replace trivial regexp with string or index, twice as fastKelley Reynolds2014-03-281-1/+1
| |/ / |/| |
* | | Swapped parameters of assert_equal in assert_selectVishal Lal2014-03-221-1/+1
| | |
* | | The digest option is no longer honoured since Rails 3.0 [ci skip]Godfrey Chan2014-03-201-1/+1
| | | | | | | | | | | | Closes #8513
* | | Use nested_scope? not shallow? to determine whether to copy optionsAndrew White2014-03-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | The method `shallow?` returns false if the parent resource is a singleton so we need to check if we're not inside a nested scope before copying the :path and :as options to their shallow equivalents. Fixes #14388.
* | | use the body proxy to freeze headersAaron Patterson2014-03-121-5/+32
| | | | | | | | | | | | | | | | | | avoid freezing the headers until the web server has actually read data from the body proxy. Once the webserver has read data, then we should throw an error if someone tries to set a header
* | | only write the jar if the response isn't committedAaron Patterson2014-03-122-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when streaming responses, we need to make sure the cookie jar is written to the headers before returning up the stack. This commit introduces a new method on the response object that writes the cookie jar to the headers as the response is committed. The middleware and test framework will not write the cookie headers if the response has already been committed. fixes #14352
* | | Merge pull request #14291 from laurocaetano/doc-for-original-fullpathYves Senn2014-03-121-0/+7
|\ \ \ | | | | | | | | Add documentation for original_fullpath. [ci skip]
| * | | [ci skip] Add documentation for original_fullpath.Lauro Caetano2014-03-111-0/+7
| | | |
* | | | Merge pull request #14262 from sferik/flat_mapAndrew White2014-03-097-18/+18
|\ \ \ \ | | | | | | | | | | Replace additional instances of map.flatten with flat_map
| * | | | Replace map.flatten with flat_map in actionpackErik Michaels-Ober2014-03-037-18/+18
| |/ / /
* | | | Copy shallow options from normal options when using scopeAndrew White2014-03-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | If the options :shallow_prefix and :shallow_path are not set in the scope options then copy them from the normal :as and :path options if they are set.
* | | | Pull namespace defaults out of the options hashAndrew White2014-03-081-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If a developer has specified either :path or :as in the options hash then these should be used as the defaults for :shallow_path and :shallow_prefix. Fixes #14241.
* | | | Only use shallow nested scope when depth is > 1Andrew White2014-03-081-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By tracking the depth of resource nesting we can push the need for nested shallow scoping to only those routes that are nested more than one deep. This allows us to keep the fix for #12498 and fix the regression in #14224. Fixes #14224.
* | | | Move setting :scope_level_resource to resource_scopeAndrew White2014-03-081-7/+7
| |/ / |/| | | | | | | | | | | | | | | | | | | | Originally with_scope_level was exclusively for managing scope levels with resources, however it is now used for other things so it makes more sense to move the responsibility for setting the :scope_level_resource to the resource_scope method. This eliminates repeatedly setting it to the same resource as each resource method scope is evaluated.
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: guides/source/4_1_release_notes.md
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-17 20:10:35 +0000