aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Allow multiple `root` routes in same scope levelRafael Sales2015-10-102-2/+11
| | | | | | | | | | | | | | | | | | | | | | | When an application has multiple root entries with different constraints, the current solution is to use `get '/'`. Example: **Currently I have to do:** ```ruby get '/', to: 'portfolio#show', constraints: ->(req) { Hostname.portfolio_site?(req.host) } get '/', to: 'blog#show', constraints: ->(req) { Hostname.blog_site?(req.host) } root 'landing#show' ``` **But I would like to do:** ```ruby root 'portfolio#show', constraints: ->(req) { Hostname.portfolio_site?(req.host) } root 'blog#show', constraints: ->(req) { Hostname.blog_site?(req.host) } root 'landing#show' ``` Other URL matchers such as `get`, `post`, etc, already allows this, so I think it's fair that `root` also allow it since it's just a shortcut for a `get` internally.
* used predicate methods to avoid is_a? checksRonak Jangir2015-10-102-3/+5
|
* Fix mounted engine named routes regressionMatthew Erhard2015-10-073-2/+15
| | | | | | | | | | | | | | | | | When generating the url for a mounted engine through its proxy, the path should be the sum of three parts: 1. Any `SCRIPT_NAME` request header or the value of `ActionDispatch::Routing::RouteSet#relative_url_root`. 2. A prefix (the engine's mounted path). 3. The path of the named route inside the engine. Since commit https://github.com/rails/rails/commit/44ff0313c121f528a68b3bd21d6c7a96f313e3d3, this has been broken. Step 2 has been changed to: 2. A prefix (the value of `ActionDispatch::Routing::RouteSet#relative_url_root` + the engine's mounted path). The value of `ActionDispatch::Routing::RouteSet#relative_url_root` is taken into account in step 1 of the route generation and should be ignored when generating the mounted engine's prefix in step 2. This commit fixes the regression by having `ActionDispatch::Routing::RouteSet#url_for` check `options[:relative_url_root]` before falling back to `ActionDispatch::Routing::RouteSet#relative_url_root`. The prefix generating code then sets `options[:relative_url_root]` to an empty string. This empty string is used instead of `ActionDispatch::Routing::RouteSet#relative_url_root` and avoids the duplicate `relative_url_root` value in the final result. This resolves #20920 and resolves #21459
* use methods for accessing the cache control headersAaron Patterson2015-10-062-6/+9
| | | | | Use the methods rack provides so we don't have to worry about the exact header key.
* etag header is in Rack, so use it's response methodsAaron Patterson2015-10-061-6/+2
| | | | | Rack implements the Etag header manipulation methods, so we can use those instead of ours.
* Use `Mime[:foo]` instead of `Mime::Type[:FOO]` for back compatJeremy Daer2015-10-0627-208/+187
| | | | | | | | | | | | | | | | | Rails 4.x and earlier didn't support `Mime::Type[:FOO]`, so libraries that support multiple Rails versions would've had to feature-detect whether to use `Mime::Type[:FOO]` or `Mime::FOO`. `Mime[:foo]` has been around for ages to look up registered MIME types by symbol / extension, though, so libraries and plugins can safely switch to that without breaking backward- or forward-compatibility. Note: `Mime::ALL` isn't a real MIME type and isn't registered for lookup by type or extension, so it's not available as `Mime[:all]`. We use it internally as a wildcard for `respond_to` negotiation. If you use this internal constant, continue to reference it with `Mime::ALL`. Ref. efc6dd550ee49e7e443f9d72785caa0f240def53
* Merge pull request #21887 from abhishekjain16/doc_fixKasper Timm Hansen2015-10-061-1/+1
|\ | | | | Fix usage of word alternatively in docs [ci skip]
| * Fix usage of word alternatively in docs [ci skip]Abhishek Jain2015-10-061-1/+1
| |
* | [ci skip] Change 'an URL' to 'a URL' as URL doesn't have a vowel soundtanmay30112015-10-062-2/+2
|/
* move file sending to the response objectAaron Patterson2015-10-056-30/+50
| | | | | | | Just a slight refactor that delegates file sending to the response object. This gives us the advantage that if a webserver (in the future) provides a response object that knows how to do accelerated file serving, it can implement this method.
* Merge pull request #21848 from yui-knk/test_suppress_warningsSean Griffin2015-10-041-3/+2
|\ | | | | Suppress warnings of `assigned but unused variable`
| * Suppress warnings of `assigned but unused variable`yui-knk2015-10-031-3/+2
| |
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-10-043-3/+5
|\ \
| * | Revert "proper raise ArgumentError, divided large text new line"Rafael Mendonça França2015-09-282-4/+4
| | | | | | | | | | | | This reverts commit 4147ab730e807f622e5260a5f876749ff41fef26.
| * | proper raise ArgumentError, divided large text new lineGaurav Sharma2015-09-292-4/+4
| | |
| * | Renamed ‘Return’ to ‘Returns’ [ci skip]Ronak Jangir2015-09-282-3/+3
| | |
| * | [ci skip] Fix document of `ActionController::RequestForgeryProtection`yui-knk2015-09-281-0/+2
| | | | | | | | | | | | | | | * add `end` to end of class definition * add a blank line between explanation and example code
* | | Introduce `Headers#add`. Move `Response#add_header` upstream.Jeremy Daer2015-10-035-33/+36
| |/ |/| | | | | | | | | | | * Introduce `ActionDispatch::Http::Headers#add` to add a value to a multivalued header. * Move `Response#add_header` upstream: https://github.com/rack/rack/pull/957 * Match upstream `Response#have_header?` -> `#has_header?` name change.
* | Response#add_header for adding to multi-valued headers like VaryJeremy Daer2015-10-012-0/+79
| |
* | Don't set a nil Set-Cookie header when there aren't any cookies. Omit the ↵Jeremy Daer2015-10-012-75/+96
| | | | | | | | header.
* | adding test for content type with default charsetGaurav Sharma2015-10-021-1/+11
| | | | | | | | | | * first test is for `default_charset` i.e `ActionDispatch::Response.default_charset = “utf-8”` * In below test we are passing `ActionDispatch::Response.default_charset = 'utf-16’` so name of the test is irrelevant — “read content type without charset”
* | Remove TestRouter#add_routesakihiro172015-09-291-11/+0
| | | | | | | | | | | | Now, we use the mapper to build the routing table related to https://github.com/rails/rails/commit/703275ba70efbefb3358052b6ba750443eff1a28
* | remove useless methodAaron Patterson2015-09-281-4/+0
| | | | | | | | | | the caller of `handle_conditional_get!` checks the committed state of the response, so we don't need to in the subclass.
* | Added test case for deprecation of Mime.const_defined? and removed use of it.Ronak Jangir2015-09-271-1/+5
| |
* | Merge pull request #21768 from Gaurav2728/gaurav-doc_fix_for_mimeRafael Mendonça França2015-09-252-4/+4
|\ \ | | | | | | fix Mime type in doc since mime types via constants is deprecated [ci…
| * | fix Mime type in doc since mime types via constants is deprecated [ci skip]Gaurav Sharma2015-09-262-4/+4
| | |
* | | inherit from our AbstractStoreAaron Patterson2015-09-251-5/+1
| | |
* | | pull the flash methods in to their own moduleAaron Patterson2015-09-252-34/+41
| | | | | | | | | | | | | | | | | | We only want to activate flash when the user has enabled it. Api servers don't use flash, so add an empty implementation to the base Request object.
* | | commit the flash after the controller finishes being servicedAaron Patterson2015-09-253-25/+17
| | | | | | | | | | | | | | | Committing the flash needs to happen in order for the session to be written correctly, so lets guarantee that it actually does happen.
* | | move flash committing to the request object.Aaron Patterson2015-09-252-12/+16
|/ / | | | | | | | | I'm doing this so that we can commit the flash to the session object Out of Band of the flash middleware
* | Fix deprecated mime types via constantsamitkumarsuroliya2015-09-251-5/+5
| | | | | | Accessing mime types via constants is deprecated. Now, we are using `Mime::Type[:JSON]` instead of `Mime::JSON`
* | build the Set-Cookie header functionallyAaron Patterson2015-09-241-5/+18
| | | | | | | | | | Use the Rack utility methods for functional header manipulation. This helps to eliminate coupling on the header hash
* | move the Header hash to the super classAaron Patterson2015-09-242-28/+24
| | | | | | | | | | | | | | I want to move the header hash to the super request object in order to consolidate behavior. We should be switching out buffering strategies rather than header strategies since things like "mutating headers after send" is an error in both cases (buffering vs streaming).
* | mutate headers before committing the responseAaron Patterson2015-09-241-2/+8
| | | | | | | | We should not mutate headers after the response has been committed.
* | call `get` instead of controller.processAaron Patterson2015-09-231-12/+10
| | | | | | | | | | we want the request to go through the test harness, not directly call the methods on the controller
* | remove controller constructionAaron Patterson2015-09-231-8/+4
| | | | | | | | also remove req / res references
* | stop directly referencing the request and response objectsAaron Patterson2015-09-231-23/+21
| |
* | test framework allocates the controller for usAaron Patterson2015-09-231-1/+0
| |
* | type of response should not matterAaron Patterson2015-09-231-6/+0
| |
* | don't touch the response object until after we call `get`Aaron Patterson2015-09-231-5/+2
| |
* | stop directly setting headers on the controllerAaron Patterson2015-09-232-14/+1
| | | | | | | | | | again, since we are going through the test harness, all this is done for us.
* | stop constructing a request object in this setterAaron Patterson2015-09-231-1/+0
| | | | | | | | | | Since we just go through the normal test harness that sets up a request for us, we don't need to do this anymore.
* | test against controller responsesAaron Patterson2015-09-231-52/+65
| | | | | | | | | | | | rather than calling methods on the controller. We should test the values returned by the controller rather than assuming that the internals are implemented in a certain way.
* | stop applying default headers in ActionDispatch::ResponseAaron Patterson2015-09-237-16/+25
| | | | | | | | | | | | | | | | | | | | I'm making this change so that I can construct response objects that *don't* have the default headers applied. For example, I would like to construct a response object from the return value of a controller. If you need to construct a response object with the default headers, then please use the alternate constructor: `ActionDispatch::Response.create`
* | Merge pull request #21736 from eliotsykes/document-bearer-prefixKasper Timm Hansen2015-09-231-5/+7
|\ \ | | | | | | Document Bearer prefix for Authorization header [ci skip]
| * | Document Bearer prefix for Authorization header [ci skip]Eliot Sykes2015-09-231-5/+7
| | |
* | | don't access the response object before a request was madeAaron Patterson2015-09-231-1/+10
| | | | | | | | | | | | | | | | | | | | | It doesn't make sense to access the response object before a request is made (how was a response object created without making a request?) This commit splits testing default headers and default header mutation tests and removes access to the pre-request response object.
* | | split cookie testsAaron Patterson2015-09-231-1/+6
| | | | | | | | | | | | these should really be multiple tests.
* | | don't mutate a response object after to_aAaron Patterson2015-09-231-0/+2
|/ / | | | | | | | | | | When the response object is `to_a`'d, that means it's been written to the socket. It doesn't make sense to mutate the response object after it's been written (and this may raise an exception in the future).
* | Updated Mime Negotiations docs [ci skip]amitkumarsuroliya2015-09-232-6/+6
| | | | | | As we all know that Accessing mime types via constants is deprecated. Now, we are using `Mime::Type[:JSON]` instead of `Mime::JSON`