aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
* Correct `render text:` deprecation messageJack Bracewell2016-09-141-1/+1
| | | The default Content-Type is `text/html`, not `text/plain`.
* Fix broken comments indentation caused by rubocop auto-correct [ci skip]Ryuta Kamizono2016-09-144-15/+15
| | | | | | All indentation was normalized by rubocop auto-correct at 80e66cc4d90bf8c15d1a5f6e3152e90147f00772. But comments was still kept absolute position. This commit aligns comments with method definitions for consistency.
* Do not mutate AC::TestRequest::DEFAULT_OPTIONSKir Shatrov2016-09-101-1/+1
|
* Merge pull request #26418 from y-yagi/fixes_26415Richard Schneeman2016-09-071-1/+1
|\ | | | | call `.to_h` to avoid using deprecated method
| * call `.to_h` to avoid using deprecated methodyuuji.yaginuma2016-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | `ActionController::Parameters#merge` call `HashWithIndifferentAccess#merge`. In addition, it calls `HashWithIndifferentAccess#update` from `HashWithIndifferentAccess#merge`, where it is called the `#to_hash` of argument. But `ActionController::Parameters#to_hash` is deprecated, warning message is displayed. To avoid this, modify to convert object to `Hash`. Fixes #26415
* | Merge pull request #26016 from nateberkopec/patch-1Vipul A M2016-09-071-2/+3
|\ \ | |/ |/| Clarify expires_now documentation
| * Clarify expires_now documentationNate Berkopec2016-09-061-2/+3
| | | | | | | | [ci skip]
* | Fix broken heredoc indentation caused by rubocop auto-correctRyuta Kamizono2016-09-031-6/+6
| | | | | | | | | | | | All indentation was normalized by rubocop auto-correct at 80e66cc4d90bf8c15d1a5f6e3152e90147f00772. But heredocs was still kept absolute position. This commit aligns heredocs indentation for consistency.
* | RuboCop is 100% green :tada:Xavier Noria2016-09-021-1/+1
| |
* | fixes remaining RuboCop issues [Vipul A M, Xavier Noria]Xavier Noria2016-09-013-3/+3
| |
* | Move to_param undef closer to the deprecations.Kasper Timm Hansen2016-08-311-2/+4
| | | | | | | | | | | | | | Makes it clearer why we're doing this Add a comment to elaborate on what the undef means and move it closer to the deprecations so it's less likely for whoever pulls the deprecations that it should go too.
* | Do not allow to_param on AC::ParametersKir Shatrov2016-08-311-0/+3
| |
* | Allow `send_file` to declare a charsetJon Moss2016-08-291-0/+1
| | | | | | | | | | | | Removed my patch in favor of @tenderlove's less invasive approach. [Aaron Patterson & Jon Moss]
* | Fix typo in the hook nameRafael Mendonça França2016-08-251-1/+1
| |
* | Add load hooks to all tests classesRafael Mendonça França2016-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usually users extends tests classes doing something like: ActionView::TestCase.include MyCustomTestHelpers This is bad because it will load the ActionView::TestCase right aways and this will load ActionController::Base making its on_load hooks to execute early than it should. One way to fix this is using the on_load hooks of the components like: ActiveSupport.on_load(:action_view) do ActionView::TestCase.include MyCustomTestHelpers end The problem with this approach is that the test extension will be only load when ActionView::Base is loaded and this may happen too late in the test. To fix this we are adding hooks to people extend the test classes that will be loaded exactly when the test classes are needed.
* | yl - remove extra …yunlei2016-08-231-1/+1
| |
* | Include the content of the flash in the auto-generated etag (#26250)David Heinemeier Hansson2016-08-222-0/+17
| | | | | | Include the content of the flash in the auto-generated etag
* | Copy edits in the documentation [ci skip]Rafael Mendonça França2016-08-191-1/+1
| |
* | Set the request type if as: is specifiedEverest Munro-Zeisberger2016-08-181-1/+8
| | | | | | | | Documentation & testing
* | Merge pull request #25862 from ↵प्रथमेश Sonpatki2016-08-171-6/+12
|\ \ | | | | | | | | | | | | prathamesh-sonpatki/start-documenting-ac-testcase-again Start documenting ActionController::TestCase again
| * | Start documenting ActionController::TestCase againPrathamesh Sonpatki2016-08-171-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Rails 5 changed interface for passing arguments to request methods to keyword args for AC::TestCase but also hid the documentation. - But existing AC::TestCase tests need the new documentation about keyword args. So resurrected documentation and added a note about not using this for new tests. - The guides and other documentation is already updated to use `ActionDispatch::IntegrationTest`. [Matthew Draper, Prathamesh Sonpatki]
* | | Merge pull request #26094 from igorkasyanchuk/masterRafael França2016-08-162-3/+3
|\ \ \ | | | | | | | | Show unpermitted parameters as symbols in logs (so they could be copy…
| * | | Show unpermitted parameters as symbols in logs (so they could be copy-pasted ↵Igor Kasyanchuk2016-08-102-3/+3
| | | | | | | | | | | | | | | | to the code)
* | | | Add three new rubocop rulesRafael Mendonça França2016-08-165-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style/SpaceBeforeBlockBraces Style/SpaceInsideBlockBraces Style/SpaceInsideHashLiteralBraces Fix all violations in the repository.
* | | | Fix deadlock that can occur when child live thread tries to load a constant ↵Alex Chinn2016-08-151-1/+6
| | | | | | | | | | | | | | | | after writing to the stream.
* | | | AC::Metal is already defining default encoding as UTF 8, let's reuse it.Prathamesh Sonpatki2016-08-141-1/+1
| | | |
* | | | Mark method as nodocRafael Mendonça França2016-08-121-3/+3
| | | | | | | | | | | | | | | | They are not part of the public API
* | | | [ci skip] Add documentation to Parameter EncodingAlex Kitchens2016-08-111-0/+1
| | | |
* | | | Merge pull request #26092 from kerrizor/kerrizor/force-param-encodingAaron Patterson2016-08-104-6/+42
|\ \ \ \ | | | | | | | | | | Allow specifying encoding of parameters by action
| * | | | Allow specifying encoding of parameters by actionKerri Miller2016-08-094-6/+42
| |/ / / | | | | | | | | | | | | | | | | At GitHub we need to handle parameter encodings that are not UTF-8. This patch allows us to specify encodings per parameter per action.
* / / / Remove unused methodAndrew White2016-08-101-5/+0
|/ / / | | | | | | | | | | | | | | | | | | In c546a2b parameter handling in AC test cases was changed to round tripping through encoders/decoders so that they matched reality and in 0adb8f8 the old methods were removed but the `html_format?` method was overlooked.
* | | revises more Lint/EndAlignment offensesXavier Noria2016-08-081-1/+1
| | |
* | | code gardening: removes redundant selfsXavier Noria2016-08-085-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | A few have been left for aesthetic reasons, but have made a pass and removed most of them. Note that if the method `foo` returns an array, `foo << 1` is a regular push, nothing to do with assignments, so no self required.
* | | Add back unintentionally removed newline.Kasper Timm Hansen2016-08-071-0/+1
| | |
* | | Modify LogSubscriber for single partial's cache message.Stan Lo2016-08-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement naive partial caching mechanism. Add test for LogSubscriber Use ActionView::Base#log_payload to store log_subscriber's payload, so we can pass cache result into it. Fixed tests Remove useless settings Check if #log_payload exists before calling it. Because other classes also includes CacheHelper but don't have is attribute Use @log_payload_for_partial_reder instead of #log_payload to carry ActionView's payload. Update test's hash syntax Add configuration to enable/disable fragment caching logging Remove unless test and add new test to ensure cache info won't effect next rendering's log Move :enable_fragment_cache_logging config from ActionView to ActionPack Apply new config to tests Update actionview's changelog Update configuration guide Improve actionview's changelog Refactor PartialRenderer#render and log tests Mute subscriber's log instead of disabling instrumentation. Fix typo, remove useless comment and use new hash syntax Improve actionpack's log_subscriber test Fix rebase mistake Apply new config to all caching intstrument actions
* | | applies remaining conventions across the projectXavier Noria2016-08-065-5/+0
| | |
* | | normalizes indentation and whitespace across the projectXavier Noria2016-08-0610-184/+184
| | |
* | | modernizes hash syntax in actionpackXavier Noria2016-08-068-27/+27
| | |
* | | applies new string literal convention in actionpack/libXavier Noria2016-08-0622-130/+130
| | | | | | | | | | | | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* | | Move the YAML hook closer to `init_with`.Kasper Timm Hansen2016-08-021-8/+9
| | | | | | | | | | | | | | | Looked odd, so completely detached from the other necessary part of the implementation.
* | | Replace implicit formats with a case statement.Kasper Timm Hansen2016-08-021-7/+8
| | | | | | | | | | | | | | | | | | The coder that Psych passes in has a `tag` method we can use to detect which serialization format we're reviving for. Use it and make it clearer alongside the `load_tags` fiddling.
* | | Let Psych 2.0.9+ deserialize 2.0.8 serialized parameters.Kasper Timm Hansen2016-08-021-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we were to serialize an `ActionController::Parameters` on Psych 2.0.8, we'd get: ```yaml --- !ruby/hash:ActionController::Parameters key: :value ``` Because 2.0.8 didn't store instance variables, while 2.0.9 did: https://github.com/tenderlove/psych/commit/8f84ad0fc711a82a1040def861cb121e8985fd4c That, coupled with 2.0.8 calling `new` instead of `allocate` meant parameters was deserialized just fine: https://github.com/tenderlove/psych/commit/af308f8307899cb9e1c0fffea4bce3110a1c3926 However, if users have 2.0.8 serialized parameters, then upgrade to Psych 2.0.9+ and Rails 5, it would start to blow up because `initialize` will never be called, and thus `@parameters` will never be assigned. Hello, `NoMethodErrors` on `NilClass`! :) To fix this we register another variant of the previous serialization format and take it into account in `init_with`. I've tested this in our app and previously raising code now deserializes like a champ. I'm unsure how to test this in our suite because we use Psych 2.0.8 and don't know how to make us use 2.0.9+ for just one test.
* | | Make Parameters support legacy YAML encodings.Kasper Timm Hansen2016-08-011-0/+19
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By changing ActionController::Parameter's superclass, Rails 5 also changed the YAML serialization format. Since YAML doesn't know how to handle parameters it would fallback to its routine for the superclass, which in Rails 4.2 was Hash while just Object in Rails 5. As evident in the tags YAML would spit out: 4.2: !ruby/hash-with-ivars:ActionController::Parameters 5.0: !ruby/object:ActionController::Parameters Thus when loading parameters YAML from 4.2 in Rails 5, it would parse a hash dump as it would an Object class. To fix this we have to provide our own `init_with` to be aware of the past format as well as the new one. Then we add a `load_tags` mapping, such that when the YAML parser sees `!ruby/hash-with-ivars:ActionController::Parameters`, it knows to call our `init_with` function and not try to instantiate it as a normal hash subclass.
* | Reset rack.input when the environment is scrubbed for the next requestNick Sieger2016-07-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, posted parameters would leak across requests. The included test case failed like so: 1) Failure: TestCaseTest#test_multiple_mixed_method_process_should_scrub_rack_input: --- expected +++ actual @@ -1 +1 @@ -{"bar"=>"an bar", "controller"=>"test_case_test/test", "action"=>"test_params"} +{"foo"=>"an foo", "bar"=>"an bar", "controller"=>"test_case_test/test", "action"=>"test_params"} An argument could be made that this situation isn't encountered often and that one should limit the number of requests per test case, but I still think the parameter leaking is an unexpected side-effect.
* | Fix incorrect indentation in method comment [ci skip]Junya Ogura2016-07-211-3/+3
|/
* Fix adding implicitly rendered namespaced template digests to ETagsJavan Makhmali2016-07-131-1/+1
|
* Trust `Object#dup` in `ActionController::Parameters`, using ↵Tim Rogers2016-07-081-15/+1
| | | | | | `#initialize_copy` to manually duplicate the underlying parameters hash It looks like `ActionController::Parameters#dup` is leftover from when the class inherited from `Hash`. We can just trust `#dup`, which already copies the `@permitted` instance variable (confirmed by tests). We still define a `#initialize_copy` to make `@parameters` a copy that can be mutated without affecting the original instance.
* Changes to a dupped `ActionController::Parameters` mutate the originalTim Rogers2016-07-071-0/+5
| | | | | | | | | | | | | | When `ActionController::Parameters` is duplicated with `#dup`, it doesn't create a duplicate of the instance variables (e.g. `@parameters`) but rather maintains the reference (see <http://ruby-doc.org/core-2.3.1/Object.html>). Given that the parameters object is often manipulated as if it were a hash (e.g. with `#delete` and similar methods), this leads to unexpected behaviour, like the following: ``` params = ActionController::Parameters.new(foo: "bar") duplicated_params = params.dup duplicated_params.delete(:foo) params == duplicated_params ``` This fixes the bug by defining a private `#initialize_copy` method, used internally by `#dup`, which makes a copy of `@parameters`.
* [ci skip] Add 'params' formatting in ActionController::BaseAlex Kitchens2016-06-301-4/+4
|
* Fix adding implicitly rendered template digests to ETagsJavan Makhmali2016-06-281-1/+7
| | | | Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>