aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
* Check if etag exists before to do the gsubRafael Mendonça França2012-09-151-2/+4
| | | | This fix the build http://travis-ci.org/#!/rails/rails/builds/2459981
* fix the buildSteve Klabnik2012-09-151-0/+1
|
* Support for multiple etags in an If-None-Match headerTravis Warlick2012-09-151-1/+7
| | | | | | | | This is a rebased version of #2520. Conflicts: actionpack/test/dispatch/request_test.rb
* Use internal instance variable naming scheme for mounted URL helper proxiesSam Pohlenz2012-09-091-1/+1
|
* Fixed missing requireIlya Vorontsov2012-09-081-0/+1
| | | | | | | Missing require caused fail of guide generation (in action_dispatch/http/mime_type, line 295, undefined method `ends_with` for "to_ary":String) With this fix guides were normally generated
* Improve error message for memcache session store when dalli isn't loaded in appGuillermo Iguaran2012-09-071-2/+6
|
* More fixes for action pack tests with Dalli.Arun Agrawal2012-09-061-3/+3
|
* Merge pull request #7530 from robin850/masterXavier Noria2012-09-051-1/+1
|\ | | | | Fix a typo in AD
| * Fix a typoRobin Dupret2012-09-051-1/+1
| |
* | Merge pull request #7522 from lexmag/mime_typeRafael Mendonça França2012-09-041-84/+93
|\ \ | | | | | | Refactor `Mime::Type`
| * | Refactor `Mime::Type`Aleksey Magusev2012-09-051-84/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `parse` method performance improvements - ~27-33%: accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, , pronto/1.00.00, sslvpn/1.00.00.00, */*" Benchmark.measure{ 1_000_0.times { Mime::Type.parse(accept) }} old: 1.430000 0.000000 1.430000 ( 1.440977) new: 0.920000 0.000000 0.920000 ( 0.921813)
* | | Make enhanced routing Concerns more tell-don't-askErnie Miller2012-09-031-25/+55
| | |
* | | Fix concerns not executing block in mapperErnie Miller2012-09-031-2/+19
| | | | | | | | | | | | Also, add documentation for alternate usage.
* | | Allow routing concerns to accept a callableErnie Miller2012-09-031-3/+7
|/ / | | | | | | | | | | This allows us to make alterations to the generated routes based on the scope of the current mapper, and otherwise allows us to move larger blocks of concerns out of the routes file, altogether.
* | Merge pull request #7495 from steveklabnik/issue_7478Aaron Patterson2012-09-013-4/+18
|\ \ | | | | | | Properly reset the session on reset_session
| * | Force reloading of the session after destroyAndreas Loupasakis2012-09-011-0/+3
| | | | | | | | | | | | | | | | | | | | | Use load_for_write! to ensure a refresh of the session object. This way the new session_id and the empty data will be stored properly. E.g. in the case of the session cookie store this means that a new digest will be returned to the user.
| * | Override rack's destroy_session in cookie storeAndreas Loupasakis2012-09-011-0/+8
| | |
| * | Assign a new session_id to session options hashAndreas Loupasakis2012-09-011-2/+2
| | |
| * | Properly reset the session on reset_sessionSteve Klabnik2012-08-311-2/+5
| | | | | | | | | | | | Fixes #7478
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-011-1/+1
|\ \ \
| * | | Fix comment about Session.Steve Klabnik2012-08-311-1/+1
| | | | | | | | | | | | | | | | SessionHash isn't a thing, and tenses are wrong.
* | | | Revert "Merge pull request #7452 from arunagw/memcached_dalli"Jon Leighton2012-08-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7256cb53e0c34e510a4d59a50d120c0358cf1d99, reversing changes made to 6ebe22c3ae716d089af1e5090ddb0d12b31af8ac. Reason: A test was failing.
* | | | Update actionpack/lib/action_dispatch/routing/mapper.rbErik Ordway2012-08-291-1/+1
| |/ / |/| | | | | escape the '.'s  
* | | refactor route_set `generate_extras` functionalityschneems2012-08-281-17/+9
| | | | | | | | | | | | | | | | | | The result of Generator with or without the @extras instance variable set contains the desired information. Rather than preserving state when initializing the original object, we can simply extract the keys from the resultant parameters. ATP Actionpack, railties
* | | Add Missing Keys from Journey on failed URL formatschneems2012-08-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many named routes have keys that are required to successfully resolve. If a key is left off like this: <%= link_to 'user', user_path %> This will produce an error like this: No route matches {:action=>"show", :controller=>"users"} Since we know that the :id is missing, we can add extra debugging information to the error message. No route matches {:action=>"show", :controller=>"users"} missing required keys: [:id] This will help new and seasoned developers look closer at their parameters. I've also subclassed the routing error to be clear that this error is a result of attempting to generate a url and not because the user is trying to visit a bad url. While this may sound trivial this error message is misleading and confuses most developers. The important part isn't what's in the options its's what's missing. Adding this information to the error message will make debugging much more obvious. This is the sister pull request of https://github.com/rails/journey/pull/44 which will be required to get they missing keys into the correct error message. Example Development Error in Rails: http://cl.ly/image/3S0T0n1T3421
* | | removed : warning: `*' interpreted as argument prefixArun Agrawal2012-08-281-1/+1
| | |
* | | Merge pull request #7452 from arunagw/memcached_dalliRafael Mendonça França2012-08-281-3/+3
|\ \ \ | | | | | | | | Memcached to dalli for actionpack test.
| * | | More fixes for action pack tests with Dalli.Arun Agrawal2012-08-271-3/+3
| |/ /
* | | Don't require action_dispatch in ActionView::UrlHelpersPiotr Sarnacki2012-08-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Routing::UrlFor was always required in UrlHelpers. This was changed by splitting previous implementation of UrlHelper into 2 modules: ActionView::Helpers::UrlHelper and ActionView::Routing::UrlHelper. The former one keeps only basic implementation of url_for. The latter adds features that allow to use routes and is only required when url_helpers or mounted_helpers are required.
* | | Move action_controller/vendor/html-scanner to action_viewPiotr Sarnacki2012-08-283-3/+4
|/ / | | | | | | | | | | This is another step in moving Action View's dependencies in Action Pack to Action View itself. Also, HtmlScanner seems to be better suited for views rather than controllers.
* | Get rid of config.preload_frameworks in favor of config.eager_load_namespacesJosé Valim2012-08-211-0/+2
| | | | | | | | | | | | | | The new option allows any Ruby namespace to be registered and set up for eager load. We are effectively exposing the structure existing in Rails since v3.0 for all developers in order to make their applications thread-safe and CoW friendly.
* | Make sure :via works with mountPratik Naik2012-08-201-2/+3
| |
* | Added X-Content-Type-Options to the header defaults.Jim Jones2012-08-181-1/+2
| | | | | | | | With a value of "nosniff", this prevents Internet Explorer from MIME-sniffing a response away from the declared content-type.
* | Add Request#formats=(extensions) that lets you set multiple formats directly ↵David Heinemeier Hansson2012-08-141-0/+21
| | | | | | | | in a prioritized order
* | Add CHANGELOG entry and documentation for Routing ConcernsRafael Mendonça França2012-08-131-0/+38
| |
* | Implementing Routing ConcernsRafael Mendonça França2012-08-131-1/+23
| | | | | | | | | | | | | | This pattern was introduced as a plugin by @dhh. The original implementation can be found in https://github.com/rails/routing_concerns
* | push header merge down to a private method so that live responses can have ↵Aaron Patterson2012-08-131-3/+7
| | | | | | | | their own header object
* | Merge pull request #7329 from guilleiguaran/move-default-headers-ad-railtieRafael Mendonça França2012-08-101-0/+5
|\ \ | | | | | | Move AD default_headers configurations to railtie
| * | Move AD default_headers configurations to railtieGuillermo Iguaran2012-08-101-0/+5
| | | | | | | | | | | | | | | | | | ActionDispatch railtie is a better place for config.action_dispatch.default_headers settings, users can continue overriding those settings in their configuration files if needed.
* | | Further refactor build_conditions in route setCarlos Antonio da Silva2012-08-101-5/+3
|/ / | | | | | | | | Return the conditions from the keep_if call, and ignore the value argument since it's not being used.
* | Fix handling SCRIPT_NAME from within mounted engine'sPiotr Sarnacki2012-08-111-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you mount your application at a path, for example /myapp, server should set SCRIPT_NAME to /myapp. With such information, rails application knows that it's mounted at /myapp path and it should generate routes relative to that path. Before this patch, rails handled SCRIPT_NAME correctly only for regular apps, but it failed to do it for mounted engines. The solution was to hardcode default_url_options[:script_name], which is not the best answer - it will work only when application is mounted at a fixed path. This patch fixes the situation by respecting original value of SCRIPT_NAME when generating application's routes from engine and the other way round - when you generate engine's routes from application. This is done by using one of 2 pieces of information in env - current SCRIPT_NAME or SCRIPT_NAME for a corresponding router. This is because we have 2 cases to handle: - generating engine's route from application: in this situation SCRIPT_NAME is basically SCRIPT_NAME set by the server and it indicates the place where application is mounted, so we can just pass it as :original_script_name in url_options. :original_script_name is used because if we use :script_name, router will ignore generating prefix for engine - generating application's route from engine: in this situation we already lost information about the SCRIPT_NAME that server used. For example if application is mounted at /myapp and engine is mounted at /blog, at this point SCRIPT_NAME is equal /myapp/blog. Because of that we need to keep reference to /myapp SCRIPT_NAME by binding it to the current router. Later on we can extract it and use when generating url Please note that starting from now you *should not* use default_url_options[:script_name] explicitly if your server already passes correct SCRIPT_NAME to rack env. (closes #6933)
* | Merge pull request #7321 from bogdan/refactor_routes_setSantiago Pastorino2012-08-101-10/+7
|\ \ | | | | | | RouteSet: refactor internals
| * | RouteSet: refactor internalsBogdan Gusiev2012-08-101-10/+7
| | | | | | | | | | | | | | | No need to build valid_conditions array. We can get all the data in place.
* | | Merge pull request #7302 from homakov/default_headersAaron Patterson2012-08-092-0/+6
|\ \ \ | | | | | | | | Introduce default_headers. closes #6311 #6515
| * | | introduce default_headers configEgor Homakov2012-08-092-0/+6
| |/ /
* / / initialize instance variablesAaron Patterson2012-08-093-0/+22
|/ /
* | removes usage of Object#in? from the code base (the method remains defined ↵Xavier Noria2012-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by Active Support) Selecting which key extensions to include in active_support/rails made apparent the systematic usage of Object#in? in the code base. After some discussion in https://github.com/rails/rails/commit/5ea6b0df9a36d033f21b52049426257a4637028d we decided to remove it and use plain Ruby, which seems enough for this particular idiom. In this commit the refactor has been made case by case. Sometimes include? is the natural alternative, others a simple || is the way you actually spell the condition in your head, others a case statement seems more appropriate. I have chosen the one I liked the most in each case.
* | Revert "polymorphic_url with an array generates a query string"Andrew White2012-08-041-4/+1
| | | | | | | | | | Passing options as the last value in an array doesn't work with form_for. This reverts commit 61c8a4d926343903593a27080216af7e4ed81268.
* | Revert "Refactor passing url options via array for polymorphic_url"Andrew White2012-08-041-2/+2
| | | | | | | | | | Passing options as the last value in an array doesn't work with form_for. This reverts commit 6be564c7a087773cb0b51c54396cc190e4f5c983.
* | RouteSet: cleanup some unneeded compexityBogdan Gusiev2012-08-041-16/+7
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 11:49:18 +0000