aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Remove literal? check to fix issue with prefixed optionalseileencodes2016-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit d993cb3 `build_path` was changed from using `grep` to `find_all` to save array allocations. This change was a little too aggressive in that when the dash comes before the symbol like `/omg-:song` the symbol is skipped. Removing the check for `n.right.left.literal?` fixes this issue, but does add back some allocations. The number of allocations are still well less than before. I've added a regression test to test this behavior for the future. Fixes #23069. Array allocations as of d993cb3: ``` {:T_SYMBOL=>11} {:T_REGEXP=>17} {:T_STRUCT=>6500} {:T_MATCH=>12004} {:T_OBJECT=>91009} {:T_DATA=>100088} {:T_HASH=>114013} {:T_STRING=>159637} {:T_ARRAY=>321056} {:T_IMEMO=>351133} ``` Array allocations after this change: ``` {:T_SYMBOL=>11} {:T_REGEXP=>1017} {:T_STRUCT=>6500} {:T_MATCH=>12004} {:T_DATA=>84092} {:T_OBJECT=>87009} {:T_HASH=>110015} {:T_STRING=>166152} {:T_ARRAY=>322056} {:T_NODE=>343558} ```
* | | | Fix typo in docs [ci skip]Rebecca Skinner2016-01-141-2/+2
| | | |
* | | | Space OddityAkira Matsuda2016-01-143-4/+4
| | | | | | | | | | | | | | | | | | | | Converting nbsp(\u{00A0}) to the normal ASCII space(\u{0020}) [ci skip]
* | | | remove `present?` callsAaron Patterson2016-01-121-4/+4
| | | | | | | | | | | | | | | | | | | | Empty strings / data structures should be treated differently than nils. We don't really need these calls here (don't pass in blank strings).
* | | | monkey patch `recycle!` on to controllers onceAaron Patterson2016-01-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of checking whether the class has recycle! or not, we can just always add the method to all controller classes when the test harness is loaded. Technically this means that the controller test harness will not work with controllers that do not inherit from AC::Metal, but then, I'm not sure that is supported anyway. Mixing in the module one will ensure that we don't break method caches, and eliminates a runtime check so it should speed up tests (slightly).
* | | | Merge pull request #22935 from cllns/add-status-name-to-outputRafael França2016-01-123-14/+64
|\ \ \ \ | | | | | | | | | | Add HTTP status name to output of tests
| * | | | Add both HTTP Response Code and Type to assertion messagesSean Collins2016-01-123-14/+64
| | | | | | | | | | | | | | | | | | | | | | | | | Also, refactor logic to convert between symbol and response code, via the AssertionResponse class
* | | | | Merge pull request #23035 from jkowens/fix-null-byteRafael França2016-01-121-1/+5
|\ \ \ \ \ | | | | | | | | | | | | Prevent static middleware from attempting to serve a request with a null byte
| * | | | | Prevent attempt to serve a request with a null byteJordan Owens2016-01-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File paths cannot contain null byte characters and methods that do path operations such as Rack::Utils#clean_path_info will raise unwanted errors.
* | | | | | AC::Parameters#at_json: restore Rails 4.2’s valueclaudiob2016-01-121-1/+2
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fixes #23026 See discussion at #23026
* | | | | Commit before freezing the headersMatthew Draper2016-01-122-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | This shouldn't generally come up: under a standard flow, we don't start sending until after the commit. But application code always finds a way.
* | | | | Unneeded &block parametersAkira Matsuda2016-01-121-2/+2
| | | | |
* | | | | [ci skip] Fix typo Renderering --> RenderingAkshay Vishnoi2016-01-091-1/+1
| | | | |
* | | | | Better error message when running `rake routes` with CONTROLLER arg:Edouard CHIN2016-01-071-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `CONTROLLER` argument can now be supplied in different ways (Rails::WelcomeController, Rails::Welcome, rails/welcome) - If `CONTROLLER` argument was supplied but it does not exist, will warn the user that this controller does not exist - If `CONTROLLER` argument was supplied and no routes could be found matching this filter, will warn the user that no routes were found matching the supplied filter - If no routes were defined in the config/routes.rb file, will warn the user with the original message
* | | | | Merge pull request #20109 from prathamesh-sonpatki/keep-only-one-rootKasper Timm Hansen2016-01-071-21/+21
|\ \ \ \ \ | | | | | | | | | | | | Remove original root method from Base module and kept overridden implementation in Resources module.
| * | | | | Kept overridden root method and removed original methodPrathamesh Sonpatki2016-01-071-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The root method is defined and documented in Base module and decorated in Resources module. - The documentation in Base module actually talks about method signature of decorated method from Resources module. - Argument handling was moved to decorated method in https://github.com/rails/rails/commit/977455cc2efb94f40b4c0d46d1842be198ed7c4c to handle options such as :as with directly passed path parameter. - To avoid the confusion, removed original root method from Base module and only kept overridden version in Resources module. - References - https://github.com/rails/rails/pull/12208 & https://github.com/rails/rails/pull/12208#issuecomment-24350897.
* | | | | | Allow AC::Parameters as an argument to url_helpersPrathamesh Sonpatki2016-01-071-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Earlier only Hash was allowed as params argument to url_helpers. - Now ActionController::Parameters instances will also be allowed. - If the params are not secured then it will raise an ArgumentError to indicate that constructing URLs with non-secure params is not recommended. - Fixes #22832.
* | | | | | Merge pull request #22275 from mastahyeti/per-form-csrfRafael França2016-01-061-11/+54
|\ \ \ \ \ \ | | | | | | | | | | | | | | Per-form CSRF tokens
| * | | | | | add option for per-form CSRF tokensBen Toews2016-01-041-11/+54
| | | | | | |
* | | | | | | Merge pull request #22906 from bf4/rendering_exceptionsRafael França2016-01-041-64/+73
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add ActionController:Renderers test
| * | | | | | Group related methods togetherBenjamin Fleischer2016-01-031-67/+67
| | | | | | |
| * | | | | | Add ActionController:Renderers testBenjamin Fleischer2016-01-031-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To complement actionpack/test/controller/metal/renderers_test.rb
* | | | | | | Replace x.times.map{} with Array.new(x){}Viktar Basharymau2016-01-021-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The former is slightly more readable, performant and has fewer method calls. ```ruby Benchmark.ips do |x| x.report('times.map') { 5.times.map{} } x.report('Array.new') { Array.new(5){} } x.compare! end __END__ Calculating ------------------------------------- times.map 21.188k i/100ms Array.new 30.449k i/100ms ------------------------------------------------- times.map 311.613k (± 3.5%) i/s - 1.568M Array.new 590.374k (± 1.2%) i/s - 2.954M Comparison: Array.new: 590373.6 i/s times.map: 311612.8 i/s - 1.89x slower ```
* | | | | | Merge pull request #22519 from bf4/test_use_renderersRafael França2015-12-311-0/+34
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Add tests for ActionController::Renderers::use_renderers
| * | | | | Test ActionController::Renderers::use_renderersBenjamin Fleischer2015-12-311-0/+34
| | | | | |
* | | | | | Update copyright notices to 2016 [ci skip]Rashmi Yadav2015-12-312-2/+2
|/ / / / /
* | | | | Merge pull request #22850 from prathamesh-sonpatki/fix_ac_params_unsafe_h_2Kasper Timm Hansen2015-12-311-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Fix AC::Parameters#to_unsafe_h to return all unfiltered values
| * | | | | Fix AC::Parameters#to_unsafe_h to return all unfiltered valuesPrathamesh Sonpatki2015-12-311-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - AC::Parameters#convert_parameters_to_hashes should return filtered or unfiltered values based on whether it is called from `to_h` or `to_unsafe_h` instead of always defaulting to `to_h`. - Fixes #22841
* | | | | | Merge pull request #22826 from timrogers/actiondispatch-ssl-configRafael França2015-12-311-8/+12
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Configurable redirect and secure cookies for ActionDispatch::SSL
| * | | | | Flexible configuration for ActionDispatch::SSLTim Rogers2015-12-291-8/+12
| | |_|_|/ | |/| | |
* | | | | Avoid `Time.parse` for static dateRafaël Blais Masson2015-12-301-1/+1
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Benchmark.ips do |x| x.report('Time.parse') { Time.parse('2011-01-01') } x.report('Time.new') { Time.new(2011, 1, 1) } end Calculating ------------------------------------- Time.parse 6.640k i/100ms Time.new 15.082k i/100ms ------------------------------------------------- Time.parse 71.915k (± 3.1%) i/s - 365.200k Time.new 167.645k (± 3.3%) i/s - 844.592k
* | | | Merge pull request #22830 from jcoyne/parameters_includeRichard Schneeman2015-12-291-1/+1
|\ \ \ \ | | | | | | | | | | Add AC::Parameters#include?
| * | | | Add AC::Parameters#include?Justin Coyne2015-12-291-1/+1
| |/ / / | | | | | | | | | | | | Fixes #22818
* | | | Format from Accept headers have higher precedence than path extension formatJorge Bejar2015-12-291-2/+2
| | | |
* | | | Rely on default Mime format when MimeNegotiation#format_from_path_extension ↵Jorge Bejar2015-12-291-3/+3
|/ / / | | | | | | | | | | | | | | | is not a valid type Closes #22747
* | | Improve RDoc documentation of ActionDispatch::SSLTim Rogers2015-12-241-12/+14
| | |
* | | Add #== back to ActionDispatch::MiddlewareStack::MiddlewareJon Moss2015-12-211-0/+9
| | | | | | | | | | | | | | | This was causing bug #22738 to occur. Also added extra tests to make sure everything is A-OK.
* | | Remember the parameter hash we returnMatthew Draper2015-12-221-1/+1
| | | | | | | | | | | | Callers expect to be able to manipulate it.
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-12-202-3/+3
|\ \ \ | |_|/ |/| |
| * | Add missing punctuation mark [ci skip]Gaurav Sharma2015-11-182-3/+3
| | |
* | | Change `alpha` to `beta1` to prep for release of Rails 5eileencodes2015-12-181-1/+1
| | | | | | | | | | | | :tada: :beers:
* | | Merge pull request #20797 from byroot/prevent-url-for-ac-parametersRafael França2015-12-182-2/+4
|\ \ \ | | | | | | | | Prevent ActionController::Parameters in url_for
| * | | Prevent ActionController::Parameters from being passed to url_for directlyJean Boussier2015-12-152-2/+4
| | | |
* | | | Refer to rails command instead of rake in a bunch of placesDavid Heinemeier Hansson2015-12-182-2/+2
| | | | | | | | | | | | | | | | Still more to do. Please assist!
* | | | Document when fallback_location is used [ci-skip]Derek Prior2015-12-171-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you're not familiar with how the `Referer` header works, you likely won't understand why you need to provide a fallback or under what circumstances it would be used. Hopefully this clarifies things a bit.
* | | | Only dup Ruby's Hash and Array.Kasper Timm Hansen2015-12-171-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling `to_h` on an `ActionController::Parameters` instance it would `deep_dup` its internal parameters. This inadvertently called `dup` on a passed Active Record model which would create new models. Fix by only dupping Ruby's Arrays and Hashes.
* | | | Deprecate `redirect_to :back`Derek Prior2015-12-161-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Applications that use `redirect_to :back` can be forced to 500 by clients that do not send the HTTP `Referer` (sic) header. `redirect_back` requires the user to consider this possibility up front and avoids this trivially-caused application error.
* | | | Add `redirect_back` for safer referrer redirectsDerek Prior2015-12-161-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `redirect_to :back` is a somewhat common pattern in Rails apps, but it is not completely safe. There are a number of circumstances where HTTP referrer information is not available on the request. This happens often with bot traffic and occasionally to user traffic depending on browser security settings. When there is no referrer available on the request, `redirect_to :back` will raise `ActionController::RedirectBackError`, usually resulting in an application error. `redirect_back` takes a required `fallback_location` keyword argument that specifies the redirect when the referrer information is not available. This prevents 500 errors caused by `ActionController::RedirectBackError`.
* | | | Merge pull request #22598 from yui-knk/deprecate_string_callbackRafael França2015-12-161-1/+2
|\ \ \ \ | | | | | | | | | | Deprecate passing string to define callback.
| * | | | Deprecate passing string to define callback.yui-knk2015-12-161-1/+2
| |/ / /