aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/routing
Commit message (Collapse)AuthorAgeFilesLines
* Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-136-67/+62
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46c04970b5e7684998d09405648ecbd4 3942cb406e1d5db0ac00e03153809cc8dc4cc4db f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690 e3b166aab37ddc2fbab030b146eb61713b91bf55 ae9f258e03c9fd5088da12c1c6cd216cc89a01f7 44423126c6f6133a1d9cf1d0832b527e8711d40f 0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.
| * Ensure blank path_prefix works as expected [#2122 state:resolved]Andrew Bloom2009-03-091-1/+2
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Remove unused variable [#1451 state:resolved] [Raphaël Valyi]Pratik Naik2009-03-071-1/+0
| |
| * Generating routes with optional format segment does not inherit params ↵Joshua Peek2009-03-041-1/+5
| | | | | | | | format [#2043 state:resolved]
| * Allow routes with a trailing slash to be recognizedMike Gunderloy2009-03-041-1/+1
| | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2039 state:committed]
| * Ruby 1.9 compat: silence a warning about regexp languagesSam Granieri2009-02-251-1/+5
| | | | | | | | | | | | [#2050 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fix requirements regexp for path segmentsAndrew White2009-02-221-16/+12
| | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1772 state:committed]
| * Remove hardcoded number_of_capturesin ControllerSegment to allow regexp ↵Andrew White2009-02-221-4/+0
| | | | | | | | | | | | | | requirements with capturing parentheses Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1887 state:committed]
* | Merge commit 'rails/3-0-unstable'Yehuda Katz2009-01-304-1/+1092
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/base.rb actionpack/lib/action_dispatch/http/mime_type.rb actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/paths.rb actionpack/test/controller/session/cookie_store_test.rb actionpack/test/dispatch/rack_test.rb actionpack/test/dispatch/request_test.rb
| * | Move HTTP libs and middleware into ActionDispatch componentJoshua Peek2009-01-271-1/+1
| | |
| * | Reorganize ActionController folder structureJoshua Peek2009-01-273-0/+1094
| |/
| * Fix formatted_* deprecation messageJeremy Kemper2008-12-301-2/+2
| |
* | Fix formatted_* deprecation messageJeremy Kemper2009-01-011-2/+2
|/
* Make router and controller classes better rack citizensJoshua Peek2008-12-281-0/+6
|
* Inline code comments for class_eval/module_eval [#1657 state:resolved]Xavier Noria2008-12-281-30/+31
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* When checking for the wrong routing method, ensure the environment is passed ↵Joshua Peek2008-12-171-1/+1
| | | | to recognize optimize [#1406 state:resolved]
* Extract named_helper module_eval so it's easier to overrideJeremy Kemper2008-11-291-2/+6
|
* Added support for multiple routes files and made draw not clear the map so ↵David Heinemeier Hansson2008-11-261-12/+42
| | | | they can be additive
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-265-2/+48
|\
| * Added optimal formatted routes to rails, deprecating the formatted_* ↵Aaron Batalion2008-11-265-2/+48
| | | | | | | | | | | | methods, and reducing routes creation by 50% [#1359 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* | No need to have #generate and #generate_extras per instanceJeremy Kemper2008-11-261-5/+10
|/
* Use autoload instead of explicit requires for ActionControllerJoshua Peek2008-11-231-0/+2
|
* Make optimized named routes respect all reserved options and tie it into ↵Gabe da Silveira2008-11-182-6/+3
| | | | | | UrlRewriter::RESERVED_OPTIONS so it's DRY Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Eliminate excess Regexp creation due to capture countingJeremy Kemper2008-11-102-4/+26
|
* Pare down object creation during route buildingJeremy Kemper2008-11-102-30/+27
|
* Don't eval recognize_optimized use __FILE__ and __LINE__ in the optimised ↵Aliaksey Kandratsenka2008-11-061-1/+1
| | | | | | | | | recognition code. It produces meaningless line numbers. This also easily produces line numbers greater than recognition_optimization.rb have, which causes rcov to trash memory outside of it's coverage counting arrays. [#1319 state:committed] Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Cleaned up route optimisation guard condition generation code as it was ↵Tom Lea2008-11-011-7/+19
| | | | | | | | getting a little messy. Add additional condition to handle the case where default_url_options is only defined in the controller, not the view. Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Thread Safety: Ensure recognize_optimized is immediately written instead of ↵Joshua Peek2008-10-271-7/+1
| | | | lazily
* Allow use of :path_prefix and :name_prefix outside of namespaced routes. ↵Tom Stuart2008-10-081-3/+1
| | | | | | [#1188 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Remove recognized_optimized method before redefining itJeremy Kemper2008-09-081-2/+15
|
* Ensure routing optimizations are cleared when new routes are added [#981 ↵Matt Jones2008-09-072-2/+11
| | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Some performance goodness for routing.Clemens Kofler2008-09-031-3/+3
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, ↵Jeremy Kemper2008-08-311-3/+3
| | | | | | | | | | but it has since been removed from 1.9. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> Conflicts: actionpack/test/controller/layout_test.rb
* Fixes optimised named routes generating question mark followed by nothing ↵Luke Melia2008-08-311-2/+3
| | | | | | | when provided an empty hash as the last argument. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#481 state:committed]
* Routes may be restricted to lists of HTTP methods instead of a single method ↵Brennan Dunn2008-08-282-6/+8
| | | | | | | | or :any. [#407 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Expose Routing::Segment::SAFE_PCHAR list of path characters that don't need ↵Jeremy Kemper2008-08-041-1/+2
| | | | escaping
* Prepare Route#generate and Route#recognize early. Also refactor segments a ↵Joshua Peek2008-07-286-200/+202
| | | | bit to try to make immutable.
* Routing whitespace cleanupJoshua Peek2008-07-286-26/+23
|
* AbstractRequest.relative_url_root is no longer automatically configured by a ↵Joshua Peek2008-07-241-1/+1
| | | | HTTP header. It can now be set in your configuration environment with config.action_controller.relative_url_root
* Raise ArgumentError if an invalid method is specified as part of a route's ↵Tom Ward2008-07-181-0/+15
| | | | | | conditions. Also raise an error if HEAD is specified as the method, as rails routes all HEAD requests through the equivalent GET, though doesn't return the response body [#182 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Use :namespace instead of :path_prefix for finding controller. [#544 ↵Tarmo Tänav2008-07-031-2/+1
| | | | | | | | | | state:resolved] :namespace is supposed to be the module where controller exists. :path_prefix can contain anything, including variables, which makes it unsuitable for determining the module for a controller. Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Ensure we have an array to collectJeremy Kemper2008-06-061-1/+1
|
* Merge docrails.Pratik Naik2008-05-251-3/+3
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Ensure routing generator works with non-string keys. [#172 state:resolved]Sven Fuchs2008-05-161-1/+1
| | | | | | | | | | Make sure that (with recent correction to globbed parameter escaping) non-string values can still be passed route generation helpers for globbed route segments. For example, foo_path([1, 2, 3]) should still work for a route like map.foo "*globbed" by implicitely calling to_s on the Fixnums. Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Escape globbed parameters in routes correctly.Chris Roos2008-05-101-4/+5
| | | | | | :controller => 'glob', :action=> 'show', :additional => ['foo/bar', 'baz'] Should generate /glob/show/foo%2Fbar/baz not /glob/show/foo/bar/baz
* Allow ActionController::Base#default_url_options to have a default options ↵Cheah Chu Yeow2008-05-051-3/+3
| | | | | | argument of nil. This fixes a bug introduced in [6a6b4392c16c665eb713705f2b38e959a658eeef] which was breaking routing in ActionController::UrlWriter.
* Ensure that default_url_options, if defined, are used in named routes.Cheah Chu Yeow2008-05-041-3/+3
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#22 state:resolved]
* Improve documentation coverage and markupXavier Noria2008-05-023-13/+14
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Made the location of the routes file configurable with ↵David Heinemeier Hansson2008-05-011-6/+6
| | | | config.routes_configuration_file (Scott Fleckenstein) [#88 state:resolved]
* Added support for regexp flags like ignoring case in the :requirements part ↵David Heinemeier Hansson2008-03-283-5/+26
| | | | | | of routes declarations (closes #11421) [NeilW] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9115 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 12:22:08 +0000