David Heinemeier Hansson
7f5d44bac5
The controller key shouldnt be part of the mapping if its not used
2009-12-25 10:14:44 -08:00
David Heinemeier Hansson
a8f1ee5986
Fix tests
2009-12-25 10:04:26 -08:00
Yehuda Katz
f3b072189a
Instead of marking raw text in templates as safe, and then putting them through String#<< which checks if the String is safe, use safe_concat, which uses the original (internal) String#<< and leaves the safe flag as is. Results in a significant performance improvement.
2009-12-24 21:50:18 -08:00
Yehuda Katz
baaaf2acaa
Dead code
2009-12-24 21:50:17 -08:00
David Heinemeier Hansson
0a365d63f6
Translated strings in the view are assumed html_safe ( Closes #3401 )
2009-12-24 20:32:53 -08:00
David Heinemeier Hansson
6ce5982afa
Stray carrier return
2009-12-24 16:13:50 -08:00
David Heinemeier Hansson
38af368360
Merge
2009-12-24 15:24:57 -08:00
David Heinemeier Hansson
2b7256a42e
Extract Mapping class from monster match method
2009-12-24 15:23:39 -08:00
Sam Ruby
aa3565f3a6
Allow named_routes to be used with root, and with new DSL short-form.
...
The real use case it to make all of the following act the same:
root 'store#index', :as => 'store'
match '/' => 'store#index', :as => 'store'
match '/', :to => 'store#index', :as => 'store'
The test case provided deviates from this in order to demonstrate all three
forms in a single set of test routes.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net >
2009-12-23 20:55:21 -08:00
Carlhuda
84f1137ef8
Merge remote branch 'origin/master'
...
Conflicts:
railties/lib/rails/application.rb
2009-12-23 19:18:11 -08:00
Carlhuda
9653599a79
Remove the ActionView::Base autoload because it creates crazy circular autoload insanity
2009-12-23 18:59:49 -08:00
Jeremy Kemper
4d3602a8c4
Routing: fix that route shorthand shouldn't ignore other options. Raise if :as option is given to root method since its name is always 'root'
2009-12-23 17:42:30 -08:00
Carlhuda
d2bd71a145
Finish moving config.frameworks-dependent code to the framework plugin
2009-12-23 17:23:29 -08:00
Jeremy Kemper
94bb331635
Shift more responsibility from application class to its singleton instance. Treat instantiation and boot as separate steps. Use app.config rather than app.configuration.
2009-12-23 17:11:17 -08:00
Carlhuda
38aeb1528c
Moving out some framework specific initializers into the framework libraries.
2009-12-23 16:13:09 -08:00
Jeremy Kemper
24e1b55608
Fix bare string Rack response bodies
2009-12-23 13:06:53 -08:00
Joshua Peek
74b2e00ce8
Require rack-mount 0.3.3
...
Fixes "Rack-mount boot time is slow as shit" [#3567 state:resolved]
2009-12-22 19:44:38 -06:00
David Heinemeier Hansson
e7ef57dd0d
Merge
2009-12-22 17:31:29 -08:00
David Heinemeier Hansson
fe5f660413
Dont encourage __FILE__ bullshit
2009-12-22 17:25:34 -08:00
Joshua Peek
ace20bd25e
Flip deferrable autoload convention
2009-12-22 17:27:37 -06:00
Joshua Peek
b1aee9f4ee
All AD modules are "deferrable"
2009-12-22 17:11:21 -06:00
Joshua Peek
2d0c703c92
Use Rack::Runtime middleware so the reported time includes the entire middleware stack
2009-12-22 16:18:22 -06:00
Joshua Peek
df7faef68e
Referer and user agent are in Rack::Request
2009-12-22 16:09:41 -06:00
Joshua Peek
a1bf2f96ce
AD::StatusCodes support is now part of rack
2009-12-22 16:08:03 -06:00
Joshua Peek
17b6053083
Float on rack/master in preparation for rack 1.1 gem release
2009-12-22 15:46:15 -06:00
José Valim
4964d3b02c
Make ActionMailer::Base inherit from AbstractController::Base
...
Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local >
2009-12-22 11:29:06 -08:00
David Heinemeier Hansson
8e48a5ef0c
Add test for root
2009-12-21 21:49:36 -08:00
David Heinemeier Hansson
a110ff0fca
Dont introspect inline templates for the logger and cleanup a few styling issues
2009-12-21 16:03:04 -08:00
David Heinemeier Hansson
fee07b9da0
Merge branch 'master' of github.com:rails/rails
2009-12-21 15:50:19 -08:00
Joshua Peek
715dd10961
Less annoying RoutingError message
2009-12-21 17:34:53 -06:00
Joshua Peek
f82e1046f8
reset_session needs to be a real method so flash can override it
2009-12-21 17:29:59 -06:00
David Heinemeier Hansson
fa8849a573
Merge branch 'master' of github.com:rails/rails
2009-12-21 11:28:16 -08:00
David Heinemeier Hansson
3ff9e9ee14
Its now possible to use match 'stuff' => 'what#stuff' instead of using the :to for simple routes
2009-12-20 20:37:36 -08:00
Joshua Peek
15f95621d5
We don't need AD parse_config
2009-12-20 21:11:42 -06:00
Yehuda Katz
17f66473bc
AC::Head now doesn't have an unfulfilled Rendering dependency, and instead works just fine standalone (which means that ConditionalGet also doesn't have a Rendering dependency)
2009-12-20 18:50:54 -08:00
David Heinemeier Hansson
eeda059818
Just a little tidying
2009-12-20 18:37:09 -08:00
David Heinemeier Hansson
91ce8d8b7f
Merge branch 'master' of github.com:rails/rails
2009-12-20 18:32:35 -08:00
David Heinemeier Hansson
cf9d6a95e8
Added ActionDispatch::Request#authorization to access the http authentication header regardless of its proxy hiding [DHH]
2009-12-20 18:30:50 -08:00
David Heinemeier Hansson
36c13cc07a
Rename RenderOptions to Renderers
2009-12-20 18:15:20 -08:00
Joshua Peek
29c8a43056
Rename RackConvenience => RackDelegation
2009-12-20 20:05:26 -06:00
Joshua Peek
0f8a5c7954
Merge Session stuff into RackConvenience
2009-12-20 20:00:04 -06:00
David Heinemeier Hansson
9b41e1e4d8
Renamed Redirector to Redirecting (its a module, not a class)
2009-12-20 17:25:13 -08:00
David Heinemeier Hansson
83f4d86a93
Rename the RenderingController module to just plain Rendering
2009-12-20 17:15:31 -08:00
David Heinemeier Hansson
c06aff0a7e
Added cookies.permanent, cookies.signed, and cookies.permanent.signed accessor for common cookie actions [DHH]
2009-12-20 14:33:13 -08:00
Yehuda Katz
e48b4c2dd0
:to => redirect() can take a String using 1.9-style interpolation or proc that takes the path parameters as a Hash
2009-12-20 14:07:32 -08:00
Yehuda Katz
8b4735fbd9
Add active_support/ruby/shim to the default requirements for AP components
2009-12-20 14:06:40 -08:00
Joshua Peek
2419fae092
Pending tests for AD Response
2009-12-17 22:10:37 -06:00
Joshua Peek
3b44f35e24
Don't need response prepare!
2009-12-17 22:10:37 -06:00
David Heinemeier Hansson
fa575973b1
Added alert/notice from 2-3-stable and refactored redirect_to into just living in Redirector [DHH]
2009-12-17 16:37:11 -08:00
Joshua Peek
7217d64f61
Use AbstractController error constants
2009-12-16 16:11:42 -06:00
