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
19,109 Commits 34 Branches 105 Tags
4be0fc124a13704b309bb6d79da4fdfdbee67cf9
Commit Graph

291 Commits

Author SHA1 Message Date
Krekoten' Marjan
a75d21df06 Fix status initialization when custom status provided 
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
 2010-10-18 17:34:22 -02:00
Les Hill and Sandro Turriate
dde54f00c6 Show exceptions rescues the original exception 
[#5784 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-10-12 00:56:07 +02:00
Miles Egan
3eff729079 make sure request parameters are accessible after rack throws an exception parsing the query string [#3030 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-10-12 00:56:07 +02:00
Aaron Patterson
1217339616 only forwarding enough methods to work. People should grab the delegate tempfile if they really need to do hard work 2010-10-04 19:28:40 -07:00
Aaron Patterson
3370ad0b1e making sure respond_to? works properly 2010-10-04 17:11:50 -07:00
Aaron Patterson
8a97470210 raising an argument error if tempfile is not provided 2010-10-04 17:08:25 -07:00
Aaron Patterson
876acf001a if it walks like a duck and talks like a duck, it must be a duck 2010-10-04 16:57:11 -07:00
Aaron Patterson
2a3022db7f delegate to the @tempfile instance variable 2010-10-04 16:56:45 -07:00
Aaron Patterson
f9734f2b0f adding tests for uploaded file 2010-10-04 16:30:16 -07:00
José Valim
0b51f3cc73 Ensure the proper content type is returned for static files. 2010-10-04 18:06:04 +02:00
José Valim
74dd8a3681 Move ETag and ConditionalGet logic from AD::Response to the middleware stack. 2010-10-03 21:25:22 +02:00
José Valim
50215f9525 Rely on Rack::Session stores API for more compatibility across the Ruby world. 2010-10-03 21:24:22 +02:00
Aaron Patterson
ffbcb84c21 removing more duplicate code 2010-10-01 18:05:59 -07:00
Piotr Sarnacki
22b11a41cc Allow mounting engines at '/' 
Without that commit script_name always become '/', which
results in paths like //posts/1 instead of /posts/1
 2010-09-30 09:47:05 +02:00
José Valim
f63d35fba5 Ensure that named routes do not overwrite previously defined routes. 2010-09-29 14:24:32 +02:00
Emilio Tagua
783e9b8de5 Change test to avoid warnings. 2010-09-28 18:38:25 -03:00
Emilio Tagua
dc37bd778a Initialize @trusted_proxies. 2010-09-28 16:25:06 -03:00
Emilio Tagua
7129dd95d0 undef method if already defined. 2010-09-28 16:08:00 -03:00
Emilio Tagua
dda3431942 Remove useless use of :: in void context. 2010-09-28 16:02:31 -03:00
Emilio Tagua
1ab2ab07b5 Remove more warnings shadowing outer local variable. 
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
 2010-09-27 16:43:17 -03:00
Emilio Tagua
583ddf22a2 Remove more warnings shadowing outer local variable. 2010-09-27 11:19:22 -03:00
Emilio Tagua
0cb1d87cd5 Remove duplicated test. 2010-09-27 11:19:22 -03:00
Emilio Tagua
2d274a5208 Use parentheses when using assert_match followed by a regexp to avoid warnings. 2010-09-27 11:19:19 -03:00
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