aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* fields_for_style needs to test for AC::ParametersAaron Patterson2016-02-171-1/+1
| | | | | | | | | | | | | While iterating an AC::Parameters object, the object will mutate itself and stick AC::Parameters objects where there used to be hashes: https://github.com/rails/rails/blob/f57092ad728fa1de06c4f5fd9d09dcc2c4738fd9/actionpack/lib/action_controller/metal/strong_parameters.rb#L632 If you use `permit` after this iteration, the `fields_for_style` method wouldn't return true because the child objects are now AC::Parameters objects rather than Hashes. fixes #23701
* partially revert 69009f4473637a44ade26d954ef5ddea6ff903f2Aaron Patterson2016-02-171-4/+1
| | | | | we need to continue setting the body on the request object because of Fiber based streaming templates. Fixes #23659
* Implement ActionController::Parameters#inspectBenjamin Quorning2016-02-171-1/+5
| | | | Now that AC::Parameters is no longer a Hash, it shouldn't look like a hash.
* Merge pull request #23729 from maclover7/rm-unused-journeyRafael França2016-02-172-8/+0
|\ | | | | Remove unused Journey code
| * Remove unused Journey codeJon Moss2016-02-172-8/+0
| | | | | | | | | | | | | | | | | | | | - `VERSION` shouldn't be there anymore since Journey is technically part of Action Dispatch now (and thus Action Pack, and follows the normal Rails versioning scheme) - `backwards.rb` was only in the file tree because early in the history or Journey (back in 2011!), it was moved from under the Rack namespace, to its own namespace, Journey! This file is no longer required, and is assigning constants that are no longer needed.
* | Merge pull request #23712 from ↵Rafael França2016-02-171-1/+1
|\ \ | | | | | | | | | | | | bf4/incorrect_to_accept_json_api_and_not_render_spec The JSON API media type should only work wih a JSON API handler
| * | The JSON API media type should only work wih a JSON API handlerBenjamin Fleischer2016-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the media type 'application/vnd.api+json' is a spec, it is inappropriate to handle it with the JSON renderer. This PR removes support for a JSON API media type. I would recommend the media type be registered on its own as `jsonapi` when a jsonapi Renderer and deserializer (Http::Parameters::DEFAULT_PARSERS) are added. Is related to work in https://github.com/rails/rails/pull/21496
* | | Fix code styleRafael Mendonça França2016-02-171-3/+4
| |/ |/| | | | | This change was added in #23203 and it was not conforming our code style.
* | Merge pull request #23661 from meinac/add_gzip_mime_typeRichard Schneeman2016-02-161-0/+1
|\ \ | | | | | | application/gzip added as default mime type into mime type list
| * | application/gzip added as default mime type into mime type listMehmet Emin İNAÇ2016-02-131-0/+1
| | |
* | | Merge pull request #23203 from vipulnsward/22979-show-tags-on-exceptionRichard Schneeman2016-02-161-7/+11
|\ \ \ | |_|/ |/| | WIP: Errors in logs should show log tags as well.
| * | WIP: Errors in logs should show log tags as well.Vipul A M2016-02-121-7/+11
| | | | | | | | | | | | | | | | | | | | | - Changed formatted_code_for to return array of logs to be tagged for each line - Changed some render tests to match new behaviour of return Fixes #22979
* | | Merge pull request #23692 from abhishekjain16/docsYves Senn2016-02-162-2/+2
|\ \ \ | | | | | | | | Use a URL instead of an URL everywhere
| * | | Use a URL instead of an URL everywhereAbhishek Jain2016-02-152-2/+2
| | |/ | |/|
* | | Join values using '; ' as per RFC specAndrew White2016-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | Multiple cookie values should be separated by '; ' according to RFC 6265, section 5.4.4[1]. [1]: https://tools.ietf.org/html/rfc6265#section-5.4
* | | Add require and move escape to private methodAndrew White2016-02-161-1/+6
| | |
* | | Merge branch 'should-escape-cookie' of https://github.com/ma2gedev/rails ↵Andrew White2016-02-161-1/+1
|\ \ \ | | | | | | | | | | | | into ma2gedev-should-escape-cookie
| * | | Escape cookie's key and value in ActionController::TestCaseTakayuki Matsubara2015-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | Get an incorrect cookie value in controller action method if cookie value contains an escapable string.
* | | | Corrected secret_key_basevs4vijay2016-02-151-1/+1
| | | |
* | | | Remove `const_missing` which fallback to deprecated `NEVER_UNPERMITTED_PARAMS`Ryuta Kamizono2016-02-151-10/+0
| |/ / |/| | | | | | | | `NEVER_UNPERMITTED_PARAMS` is deprecated in Rails 4.2. See #15933.
* | | Merge pull request #23611 from abhishekjain16/routes_optionsKasper Timm Hansen2016-02-121-2/+3
|\ \ \ | | | | | | | | Fix routes to match verb and URL path with -g option also.
| * | | Fixes routes to match verbs and path with -g optionAbhishek Jain2016-02-111-2/+3
| | | |
* | | | Add fixes accidentally removed.Kasper Timm Hansen2016-02-122-2/+3
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yesterday, when improving how `parsed_body` extracted a parser I wrote 77bbf1e. Then I thought that was too many changes in one commit and broke it up locally... or so I thought. When pushed the extra commits removed the changes! Wups! In shame, lob those changes together here: * 3b94c38 which meant to fix the CHANGELOG syntax error. * 5007df5 which meant to mention `parsed_body` in the docs. * 036a7a0 which meant to memoize the `parsed_body`.
* | | Merge pull request #23612 from vipulnsward/23561-fix-routes-argsKasper Timm Hansen2016-02-121-2/+1
|\ \ \ | | | | | | | | Fix argument passing to rake routes
| * | | - Fixed and removed long arguments to rake routesVipul A M2016-02-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | - Fixed related documentation and usage all around Fixes #23561
* | | | Memoize `parsed_body`.Kasper Timm Hansen2016-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's common to use several assertions on the parsed response. The response bodies aren't meant to be mutated. People should make new test requests instead. Thus, it should be safe to memoize the parsing.
* | | | [ci skip] Mention `parsed_body` in docs.Kasper Timm Hansen2016-02-111-2/+1
| | | | | | | | | | | | | | | | Little easier to understand when you know the method that's used.
* | | | Make `parsed_body` extract parser from the content type.Kasper Timm Hansen2016-02-112-5/+9
|/ / / | | | | | | | | | | | | | | | | | | We're not guaranteed to have a `RequestEncoder` to assign on `get` requests because we aren't extracting the parser from the response content type. Until now.
* | | Add `parsed_body` to spare writing out parsing routines.Kasper Timm Hansen2016-02-102-12/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When testing: ```ruby post articles_path, params: { article: { title: 'Ahoy!' } }, as: :json ``` It's common to want to make assertions on the response body. Perhaps the server responded with JSON, so you write `JSON.parse(response.body)`. But that gets tedious real quick. Instead add `parsed_body` which will automatically parse the reponse body as what the last request was encoded `as`.
* | | Merge pull request #21671 from kaspth/integration-request-encoding-helpersDavid Heinemeier Hansson2016-02-101-4/+79
|\ \ \ | |/ / |/| | Add `as` to encode a request as a specific mime type.
| * | Add `as` to encode a request as a specific mime type.Kasper Timm Hansen2016-01-041-4/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns ``` post articles_path(format: :json), params: { article: { name: 'Ahoy!' } }.to_json, headers: { 'Content-Type' => 'application/json' } ``` into ``` post articles_path, params: { article: { name: 'Ahoy!' } }, as: :json ```
* | | `log_process_action` will return an array, so use `empty?`Aaron Patterson2016-02-091-1/+1
| | | | | | | | | | | | | | | We don't need to use active support in this case because we know the type that will be returned.
* | | Request#fullpath should not raise an exception, so remove the rescueAaron Patterson2016-02-091-1/+1
| | |
* | | AC::Request#format always returns a value, so we do not need to tryAaron Patterson2016-02-091-1/+1
| | |
* | | speed up string xor operation and reduce object allocationsAaron Patterson2016-02-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` [aaron@TC rails (master)]$ cat xor.rb a = "\x14b\"\xB4P8\x05\x8D\xC74\xC3\xEC}\xFDf\x8E!h\xCF^\xBF\xA5%\xC6\xF0\xA9\xF9x\x04\xFA\xF1\x82" b = "O.\xF7\x01\xA9D\xA3\xE1D\x7FU\x85\xFC\x8Ak\e\x04\x8A\x97\x91\xD01\x02\xA4G\x1EIf:Y\x0F@" def xor_byte_strings(s1, s2) s1.bytes.zip(s2.bytes).map { |(c1,c2)| c1 ^ c2 }.pack('c*') end def xor_byte_strings2(s1, s2) s2_bytes = s2.bytes s1.bytes.map.with_index { |c1, i| c1 ^ s2_bytes[i] }.pack('c*') end require 'benchmark/ips' require 'allocation_tracer' Benchmark.ips do |x| x.report 'xor_byte_strings' do xor_byte_strings a, b end x.report 'xor_byte_strings2' do xor_byte_strings2 a, b end end ObjectSpace::AllocationTracer.setup(%i{type}) result = ObjectSpace::AllocationTracer.trace do xor_byte_strings a, b end p :xor_byte_strings => result ObjectSpace::AllocationTracer.clear result = ObjectSpace::AllocationTracer.trace do xor_byte_strings2 a, b end p :xor_byte_strings2 => result [aaron@TC rails (master)]$ ruby -I~/git/allocation_tracer/lib xor.rb Calculating ------------------------------------- xor_byte_strings 10.087k i/100ms xor_byte_strings2 11.339k i/100ms ------------------------------------------------- xor_byte_strings 108.386k (± 5.8%) i/s - 544.698k xor_byte_strings2 122.239k (± 3.0%) i/s - 612.306k {:xor_byte_strings=>{[:T_ARRAY]=>[38, 0, 0, 0, 0, 0], [:T_STRING]=>[2, 0, 0, 0, 0, 0]}} {:xor_byte_strings2=>{[:T_ARRAY]=>[3, 0, 0, 0, 0, 0], [:T_DATA]=>[1, 0, 0, 0, 0, 0], [:T_IMEMO]=>[2, 0, 0, 0, 0, 0], [:T_STRING]=>[2, 0, 0, 0, 0, 0]}} ```
* | | Merge pull request #23534 from bronson/fix-redefined-warningArthur Nogueira Neves2016-02-081-0/+1
|\ \ \ | | | | | | | | fix 'method redefined' warnings
| * | | fix 'method redefined' warningsScott Bronson2016-02-061-0/+1
| | | |
* | | | Merge pull request #23532 from matthewd/live-interlockMatthew Draper2016-02-081-23/+28
|\ \ \ \ | | | | | | | | | | Hand off the interlock to the new thread in AC::Live
| * | | | Hand off the interlock to the new thread in AC::LiveMatthew Draper2016-02-071-23/+28
| |/ / / | | | | | | | | | | | | | | | | | | | | Most importantly, the original request thread must yield its share lock while waiting for the live thread to commit -- otherwise a request's base and live threads can deadlock against each other.
* / / / Add SVG as a default mime typeDavid Heinemeier Hansson2016-02-071-0/+1
|/ / /
* | | Avoid coupling Action Pack to Railties.Kasper Timm Hansen2016-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Referencing Rails.env without checking if it's defined couples us to Railties. Fix by avoiding the line breaks if we don't have an env check to rely on.
* | | add missing requireAaron Patterson2016-02-051-0/+1
| | |
* | | disable controller / view thread spawning in testsAaron Patterson2016-02-052-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests can (and do) access the database from the main thread. In this case they were starting a transaction, then making a request. The request would create a new thread, which would allocate a new database connection. Since the main thread started a transaction that contains data that the new thread wants to see, the new thread would not see it due to data visibility from transactions. Spawning the new thread in production is fine because middleware should not be doing database manipulation similar to the test harness. Before 603fe20c it was possible to set the database connection id based on a thread local, but 603fe20c changes the connection lookup code to never look at the "connection id" but only at the thread object itself. Without that indirection, we can't force threads to use the same connection pool as another thread. Fixes #23483
* | | Put some space for non-assets requests in development modePrathamesh Sonpatki2016-02-031-0/+2
| | | | | | | | | | | | - Fixes #23428.
* | | Sleep well, sweet princeSean Griffin2016-02-021-1/+1
| | | | | | | | | | | | | | | Prototype, you have served us well. But you are no longer how we make an XMLHttpRequest. RIP
* | | Merge pull request #23396 from pschambacher/pschambacher/fix_assert_generatesRafael França2016-02-021-0/+1
|\ \ \ | | | | | | | | Duplicate assert_generates options before modifying it
| * | | Duplicate assert_generates options before modifying itPierre Schambacher2016-02-011-0/+1
| | | |
* | | | Preparing for Rails 5.0.0.beta2Sean Griffin2016-02-011-1/+1
| | | |
* | | | Converge on filter.Kasper Timm Hansen2016-02-011-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some places were saying filter, while others said filter_options, spare the ambiguity and use filter throughout. This inlines a needless local variable and clarifies a route filter consists of defaults and values to match against.
* | | | Simplify filter normalization.Kasper Timm Hansen2016-02-011-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Assume the filter is a string, if it wasn't a hash and isn't nil. Remove needless else and rely on Ruby's default nil return. Add spaces within hash braces.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 02:17:04 +0000