aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Updating TestSession to access with indifferenceJeremy Friesen2015-08-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following Rails code failed (with a `KeyError` exception) under test: ```ruby class ApplicationController < ActionController::Base def user_strategy # At this point: # ```ruby # session == { # "user_strategy"=>"email", # "user_identifying_value"=>"hello@world.com" # } # ``` if session.key?(:user_strategy) session.fetch(:user_strategy) end end end ``` When I checked the session's keys (`session.keys`), I got an array of strings. If I accessed `session[:user_strategy]` I got the expected `'email'` value. However if I used `session.fetch(:user_strategy)` I got a `KeyError` exception. This appears to be a Rails 4.2.4 regression (as the code works under Rails 4.2.3). Closes #21383
* | | only call self.content_type= when there is a responseAaron Patterson2015-08-262-3/+6
| | | | | | | | | | | | | | | Apparently the AbstractController (whatever "abstract" means) is expected to work without a request and response.
* | | Pull `plain` content type handling up to `render`Aaron Patterson2015-08-261-6/+2
| | | | | | | | | | | | | | | `render` is the only possible source for the `plain` option. Pulling the conditional up to the `render` method removes far away conditionals
* | | stop passing the options hash to `_process_format`Aaron Patterson2015-08-261-2/+2
| | | | | | | | | | | | | | | | | | We don't need to pass the full hash just to pull one value out. It's better to just pass the value that the method needs to know about so that we can abstract it away from "options"
* | | remove RackDelegation moduleAaron Patterson2015-08-2610-66/+16
| | | | | | | | | | | | | | | | | | Since all controller instances are required to have a request and response object, RackDelegation is no longer needed (we always have to delegate to the response)
* | | remove useless methodAaron Patterson2015-08-261-5/+0
| | | | | | | | | | | | | | | the subclass sets the body on the response object, so we don't need the superclass doing it too
* | | include ActionView::Rendering in the minimal controllerAaron Patterson2015-08-261-1/+1
| | | | | | | | | | | | without this module, the content type is not set correctly
* | | `headers` should delegate to the response objectAaron Patterson2015-08-261-1/+2
| | |
* | | remove useless status setAaron Patterson2015-08-261-2/+0
| | | | | | | | | | | | | | | | | | Now that `Controller#status=` just delegates to the response object, we don't need to set the response on the controller and the response. We can just set it in one place.
* | | remove useless conditionalAaron Patterson2015-08-261-1/+1
| | | | | | | | | | | | we always have a response object, so there is no reason to test it
* | | remove ivars from the "protected" listAaron Patterson2015-08-261-1/+1
| | | | | | | | | | | | these ivars don't exist anymore, so we can remove them from the list
* | | use the content_type method on the request objectAaron Patterson2015-08-261-1/+1
| | | | | | | | | | | | | | | since the controller always has a request on it, we can just ask the request for the content type.
* | | ask the response for the statusAaron Patterson2015-08-261-3/+2
| | | | | | | | | | | | | | | | | | The controller instance always has an instance of a response object. We should store the status code on the response object so that it's only store in one place.
* | | remove useless conditionalAaron Patterson2015-08-261-1/+1
| | | | | | | | | | | | | | | We always have a response object in controller instances, so we can remove this conditional
* | | remove useless conditionalAaron Patterson2015-08-261-1/+1
|/ / | | | | | | | | controller instances always have a response object, so we don't need to test to see if there is one, just always call to_a on the response.
* | provide a request and response to all controllersAaron Patterson2015-08-253-30/+29
| | | | | | | | | | | | | | | | | | | | Controllers should always have a request and response when responding. Since we make this The Rule(tm), then controllers don't need to be somewhere in limbo between "asking a response object for a rack response" or "I, myself contain a rack response". This duality leads to conditionals spread through the codebase that we can delete: * https://github.com/rails/rails/blob/85a78d9358aa728298cd020cdc842b55c16f9549/actionpack/lib/action_controller/metal.rb#L221-L223
* | :snip: whitespaceAaron Patterson2015-08-251-2/+2
| |
* | move response allocation to the class levelAaron Patterson2015-08-252-8/+22
| | | | | | | | | | | | we don't need an instance to figure out what type of response to allocate. Later we'll pull this up the stack and pass the response object down
* | adding a direct dispatch method to controller classesAaron Patterson2015-08-251-0/+10
| | | | | | | | This saves a lambda and request allocation on each request.
* | always dispatch to controllers the same wayAaron Patterson2015-08-251-0/+1
| | | | | | | | | | controllers should always go through the `action` class method so that their middleware is respected.
* | remove unused require ‘set’NehaGautam2015-08-251-1/+0
| |
* | remove more direct `env` mutationsAaron Patterson2015-08-241-1/+3
| |
* | rm useless methodAaron Patterson2015-08-241-4/+0
| | | | | | | | superclass already has this method, so remove this one
* | Merge pull request #21339 from deepj/unused-block-argumentsCarlos Antonio da Silva2015-08-241-1/+1
|\ \ | | | | | | Remove unused block arguments
| * | Remove unused block argumentsdeepj2015-08-231-1/+1
| |/
* | remove more `env` accessAaron Patterson2015-08-231-11/+19
| |
* | remove more env accessAaron Patterson2015-08-231-3/+3
| |
* | remove more env accessAaron Patterson2015-08-231-4/+6
| |
* | convert more `@env` access to get / set headerAaron Patterson2015-08-231-1/+1
| |
* | Another place to use a request object in NullSessionHash Ronak Jangir2015-08-231-3/+3
|/ | | | May be missed in 5fe141638f1243ac6ae187ae14aa398b4c1875a2 commit Also fixes the broken build
* Fix master buildMarcin Olichwirowicz2015-08-171-0/+1
|
* [skip ci] Fix minor typoJon Atack2015-08-171-1/+1
|
* Refactor how assign_parameters sets generated_path & query_string_keyseileencodes2015-08-151-8/+20
| | | | | | | | | | | | | This is part of a larger refactoring on controller tests. We needed to move these methods here so that we could get rid of the `|| key == :action || key == :controller` in `assign_parameters`. We know this is ugly and intend to fix it but for now `generate_extras` needs to be used in the two methods to access the path and the query_string_keys. We're adding `:controller` and `:action` to the `query_string_keys` because we always need a controller and action. If someone passed `action` or `controller` in in there test they are unambigious - we know they have to go into the query params.
* Merge pull request #21203 from denniss/issue-21199Sean Griffin2015-08-111-1/+1
|\ | | | | Authorization scheme should be case insensitive. Fixes #21199
| * Authorization scheme should be case insensitive. Fixes #21199Dennis Suratna2015-08-111-1/+1
| |
* | Rename `extra_keys` variables to `query_string_keys`eileencodes2015-08-081-2/+2
| | | | | | | | | | | | `extra_keys` is a confusing variable name because it's not clear what is "extra". This renames it to `query_string_keys` so it's clear that the "extra" is just the query string.
* | deprecate the env method on controller instancesAaron Patterson2015-08-072-1/+3
| | | | | | | | | | | | people should be accessing request information through the request object, not via the env hash. If they really really want at the env hash, then they can get it off the request.
* | the request object manages `env`Aaron Patterson2015-08-071-2/+0
| | | | | | | | | | remove the setter. The request object manages the env hash, so any mutations need to go through it
* | remove vestigial codeAaron Patterson2015-08-071-39/+0
| | | | | | | | | | Looks like this was left over from converting Rails to Rack. I think it's safe to remove now.
* | stop using @_env in the controller instanceAaron Patterson2015-08-072-4/+3
| | | | | | | | | | | | | | Actions are processed through `dispatch`, so they should have the request set on them before any user land code can be executed. Lets stop setting _env on the controller, and give access to it through the `env` method.
* | Using strings or symbols for middleware class names is deprecated.Aaron Patterson2015-08-071-2/+1
| | | | | | | | | | | | | | | | | | | | Convert things like this: middleware.use "Foo::Bar" to this: middleware.use Foo::Bar
* | move `valid?` conditional to the constructorAaron Patterson2015-08-071-11/+21
| | | | | | | | | | use a strategy pattern to calculate the conditional in `valid?` in advance.
* | simplify the Middleware constructorAaron Patterson2015-08-071-8/+17
| | | | | | | | | | | | We should do the hard work outside the constructor. Also fix the tests to not directly construct middleware objects, but to go through the stack object.
* | the request class is never changed, so just use it directly in the method bodyAaron Patterson2015-08-071-3/+3
| |
* | Adds missing argument handling for ActionController::TestSession toMatthew Gerrior2015-08-061-0/+4
| | | | | | | | allow testing controllers that use session#fetch with a default value.
* | add a setter for the cookie jarAaron Patterson2015-08-061-1/+1
| |
* | remove `@host` ivarAaron Patterson2015-08-051-7/+1
| |
* | remove @secure ivarAaron Patterson2015-08-051-2/+1
| |
* | CookieJar does not need the key_generator parameter anymoreAaron Patterson2015-08-051-2/+1
| |
* | stop using an options hash with the cookie jarAaron Patterson2015-08-051-1/+1
| | | | | | | | | | | | | | | | The cookie jar can just ask the request object for the information it needs. This allows us to stop allocating hashes for options, and also allows us to delay calculating values in advance. Generating the options hash forced us to calculate values that we may never have needed at runtime