github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
18,566 Commits 34 Branches 105 Tags
e12e2fb4f660da479110b35b375694bf267aedfb
Commit Graph

268 Commits

Author SHA1 Message Date
Carlos Antonio da Silva
7fc1edd790 Remove deprecated stuff in ActionController 
This removes all deprecated classes in ActionController related to
Routing, Abstract Request/Response and Integration/IntegrationTest.
All tests and docs were changed to ActionDispatch instead of ActionController.
 2010-09-26 02:13:45 +08:00
John Firebaugh
c509379923 Add ActionDispatch::TestResponse tests. 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-09-25 10:52:57 +02:00
Andrew White
0bffd7d933 Raise ArgumentError instead of normalizing controller name when there is a leading slash [#5651 state:resolved] 2010-09-18 17:49:46 +01:00
Andrew White
013ed1c050 Remove leading slash from controller [#5651 state:resolved] 2010-09-18 13:32:54 +01:00
Carl Lerche
7418a44096 Add RouteSet#append 
Allows specifying blocks to the routeset that will get 	appended after the RouteSet is drawn.
 2010-09-17 12:05:40 -07:00
W. Andrew Loe III
9cd094b8da Only send secure cookies over SSL. 2010-09-13 15:11:46 -07:00
Collin Miller
96650f704a added block arguments to ActionController::Metal#use 
Useful for cases such as warden, where a block configuration is taken.

    class SomeController < ApplicationController
      use RailsWarden::Manager do |manager|
        manager.default_strategies :facebook_oauth
        manager.failure_app = SomeController.action(:authorize)
      end
    end
 2010-09-12 07:35:54 +08:00
wycats
f6153f74da Merge remote branch 'drogus/engines' 2010-09-11 03:24:50 -05:00
Simon Jefford
7fae0aa4ac Add configuration option for tld length 2010-09-09 18:26:35 -07:00
Piotr Sarnacki
6258f7c972 Change app to main_app in mounted_helpers 2010-09-08 19:27:59 +02:00
Piotr Sarnacki
18aee33335 Do not require passing :app to mounted helpers, it's actually useless and not DRY 2010-09-08 19:27:59 +02:00
Piotr Sarnacki
b3eb26a161 Removed deprecated RouteSet API, still many tests fail 2010-09-05 13:44:36 +02:00
Piotr Sarnacki
b8d6dc3c84 Implemented RouteSet#default_scope, which allows to set the scope for the entire routes object 2010-09-03 22:59:15 +02:00
Piotr Sarnacki
401cd97923 Modified ActionDispatch::Static to allow passing multiple roots 2010-09-03 22:59:09 +02:00
Piotr Sarnacki
1e6612ef80 Ensure that url_helpers included after application's ones have higher priority 2010-09-03 22:59:07 +02:00
Piotr Sarnacki
6c95e0f879 Add mounted_helpers to routes 
mounted_helpers are a bit similar to url_helpers. They're automatically
included in controllers for Rails.application and each of mounted
Engines. Mounted helper allows to call url_for and named helpers for
given application.

Given Blog::Engine mounted as blog_engine, there are 2 helpers defined:
app and blog_engine. You can call routes for app and engine using those
helpers:

app.root_url
app.url_for(:controller => "foo")
blog_engine.posts_path
blog_engine.url_for(@post)
 2010-09-03 22:59:07 +02:00
Piotr Sarnacki
e9791bec82 Routes refactoring: 
* added more tests for prefix generation
* fixed bug with generating host for both prefix and url
* refactored url_for method
* organized tests for prefix generation
 2010-09-03 22:59:07 +02:00
Piotr Sarnacki
229a868264 Use new url_for API instead of including routes.url_helpers 2010-09-03 22:59:06 +02:00
Piotr Sarnacki
b53efd2105 Extended url_for to handle specifying which router should be used. 
A few examples:
url_for Blog::Engine, :posts_path
url_for Blog::Engine, @post
url_for Blog::Engine, :action => "main", :controller => "index"
 2010-09-03 22:59:06 +02:00
Piotr Sarnacki
b697ba9fd7 Added some more tests for url generation between Engine and Application 2010-09-03 22:59:06 +02:00
Piotr Sarnacki
8a077089d9 Get rid of :skip_prefix options in routes 2010-09-03 22:59:06 +02:00
Piotr Sarnacki
b1e5e233fa Refactored tests for prefix generation and added test for url generation in regular class with default_url_options[:script_name] set 2010-09-03 22:59:05 +02:00
Piotr Sarnacki
eedbf87d15 New way of generating urls for Application from Engine. 
It's based specifying application's script_name with:
Rails.application.default_url_options = {:script_name => "/foo"}

default_url_options method is delegated to routes. If router
used to generate url differs from the router passed via env
it always overwrites :script_name with this value.
 2010-09-03 22:59:05 +02:00
Piotr Sarnacki
451c9942bb Allow to generate Application routes inside Engine 
This requires knowledge about original SCRIPT_NAME and
the parent router. It should be pass through the env
as ORIGIAL_SCRIPT_NAME and action_dispatch.parent_routes
 2010-09-03 22:59:05 +02:00
Piotr Sarnacki
28016d33b0 Use env['action_dispatch.routes'] to determine if we should generate prefix or not. 
This technique is here to allow using routes from Engine in Application
and vice versa. When using Engine routes inside Application it should
generate prefix based on mount point. When using Engine routes inside
Engine it should use env['SCRIPT_NAME']. In any other case it should
generate prefix as env should not be even available.
 2010-09-03 22:59:05 +02:00
José Valim
599e46bf24 Revert "Setup explicit requires for files with exceptions. Removed them from autoloading." 
Booting a new Rails application does not work after this commit [#5359 state:open]

This reverts commit 38a421b34d.
 2010-09-02 21:11:03 +02:00
Łukasz Strzałkowski
38a421b34d Setup explicit requires for files with exceptions. Removed them from autoloading. 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-09-02 11:54:04 +02:00
Andrew White
02480a897b Move implicit nested call before options handling so that nested constraints work [#5513 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-09-01 10:09:14 +02:00
Andrew White
6c3f5eb76c Bump rack-mount to 0.6.13 and add test case for named character classes [#5509 state:resolved] 
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
 2010-08-31 21:16:21 -03:00
Andrew White
1847d33b4b Use nested scope for routes defined at the :resources scope level (as in Rails 2.3) 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-24 21:15:13 -03:00
José Valim
80e1f730a2 Allow format to be skipped. This is used internally by mount. 2010-08-24 16:58:32 -03:00
José Valim
e197d6f34b Finally fix the bug where symbols and strings were not having the same behavior in the router. 
If you were using symbols before for methods like match/get/post/put/delete, it is likely that this commit will break your routes.
Everything should behave the same if you are using strings, if not, please open up a ticket.
 2010-08-24 16:58:25 -03:00
José Valim
4a90ecb3ad Ensure shortcuts inside resources also generates helpers. 2010-08-24 16:58:12 -03:00
José Valim
2916521da8 Fix how routes inside namespaces are generated. 2010-08-24 13:05:29 -03:00
Santiago Pastorino
4df19b3f27 Allow actions which start with A-Za-z_ only 2010-08-24 12:43:43 -03:00
José Valim
b4f304b7b6 Fix a bug where symbols and strings were not behaving the same in the router. [#5431 state:resolved] 2010-08-24 10:26:25 -03:00
Andrew White
2fb0cbec02 When custom resource actions are specified using strings add the default name and action if the string is a valid ruby method name. 
[#5431 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-24 10:26:25 -03:00
Andrew White
ae2c60734a Cache the symbolized path parameters using a instance variable in the request object rather than the environment hash. This it to prevent stale parameters in later routing constraints/redirects as only the normal path parameters are set by Rack::Mount. 
Also if a constraint proc arity is more than one, pass the symbolized path parameters
as the first argument to match redirect proc args and provide easier access.

[#5157 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-22 16:17:26 -03:00
Andrew White
0d0fbf1e64 Don't add the standard https port when using redirect in routes.rb and ensure that request.scheme returns https when using a reverse proxy. 
[#5408 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-20 10:40:34 -03:00
Andrew White
771d2f918f Allow symbols for :path resource(s) option [#5306 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-20 09:32:48 -03:00
Andrew White
c019db8ca1 Move regexps in options hash to :constraints hash so that they are pushed into the scope [#5208 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-19 15:05:57 -03:00
Andrew White
0cc483aa14 Move edit route before show route so that it will have precedence if the :id parameter allows slashes [#5409 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-19 15:05:33 -03:00
Javier Martín
3e871eee80 Don't pluralize resource methods [#4704 state:resolved] 
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
 2010-08-18 13:56:46 -03:00
Andre Arko
fca617af14 Allow member actions (get, etc) to accept strings, with test 2010-08-17 20:41:13 -03:00
Bryce Thornton
fd78bb7270 Allow for any possible TLD when using the :all option with the cookie session store. This works for subdomain.mysite.local, google.co.uk, google.com.au, etc. [#5147 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-15 16:42:02 -03:00
Santiago Pastorino
b451de0d6d Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;) 2010-08-14 04:12:33 -03:00
Xavier Noria
4434e407e9 adds URL to the body generated by the redirect macro in the routes mapper as per the RFC, extracts common test pattern into a test macro, adds a test to cover the :status option 2010-08-09 13:31:42 +02:00
José Valim
9dfe9fa693 Ensure insert_before in middleware stack raises a meaningful error message [#3679 state:resolved] 2010-07-21 15:17:04 +02:00
Bryan Helmkamp
e466354edb Extract ParameterFilter class from FilterParameters mixin 
Signed-off-by: wycats <wycats@gmail.com>
 2010-07-19 13:44:43 -07:00
José Valim
291adcd588 Set session options id to nil is respected and cancels lazy loading. 2010-07-18 12:51:03 +02:00