Carl Lerche
e749424dfa
Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rb
2009-12-31 13:12:52 -08:00
Carl Lerche
a23f4b6aee
Add a /rails.rb for each framework for consistency
2009-12-31 11:57:59 -08:00
Jeremy Kemper
1fbd02e446
Revert "Add config.action_controller.include behavior to plugins."
...
This reverts commit 7e8b7f46bfc086a36db996420fbee93348c5268e.
Conflicts:
railties/lib/rails/plugin.rb
2009-12-30 19:34:15 -08:00
Jeremy Kemper
8ad9d14494
Partially revert "ActionDispatch should require as little of ActiveSupport as possible"
...
Removes load path change from commit bb153f42e45160c5ef3593c393db5d3c6857fb70.
2009-12-30 17:35:17 -08:00
Carl Lerche
bb153f42e4
ActionDispatch should require as little of ActiveSupport as possible
2009-12-30 12:58:40 -08:00
Carl Lerche
2e87196d14
Use extlib_inheritable_accessor in request_forgery_protection.rb.
...
For some reason the current class_inheritable_accessor does not play nice with included hooks. class_inheritable_accessor will be revised shortly.
2009-12-29 13:21:36 -08:00
Yehuda Katz
cf4978313b
Make sure evalled method knows where it came from
2009-12-29 01:04:32 -08:00
Jeremy Kemper
f79caa49fb
Complain if there's no such middleware
2009-12-28 20:24:28 -08:00
Carl Lerche
d747b6847b
Require active_support/dependencies/autoload in action_dispatch
2009-12-28 17:53:05 -08:00
Jeremy Kemper
9a650a6547
Silence some trivial warnings: shadowed local vars, indentation mismatches
2009-12-28 17:36:08 -08:00
Jeremy Kemper
7c4fb93ac3
Ruby 1.9: string is not enumerable, so #exclude? is not available
2009-12-27 15:38:00 -08:00
Jeremy Kemper
3a79117c77
Typo
2009-12-27 15:27:18 -08:00
David Heinemeier Hansson
438a8c3ec7
Require the enumberable extension from active support because we use #exclude?
2009-12-27 15:23:30 -08:00
Yehuda Katz
12e43494a7
Merge remote branch 'jose/perf'
2009-12-27 14:36:59 -08:00
David Heinemeier Hansson
95762cbbb3
Added shorthand for match 'products/overview' that expands to match 'products/overview', :to => 'products#overview', :as => 'products_overview'
2009-12-27 14:13:03 -08:00
José Valim
97db79ab3c
Remove ActiveRecord runtime logging from ActionPack and place in ActiveRecord, adding it through config.action_controller.include hook.
2009-12-27 13:32:40 +01:00
José Valim
75ba102a80
Remove ActionView inline logging to ActiveSupport::Notifications and create ActionController::Base#log_event, so everything can be logged within one listener. Also expose log_process_action as a hook for different modules to include their own information during the action processing. This allow ActiveRecord to hook and any other ORM. Finally, this commit changes 'Processing' and 'Rendering' in logs to 'Processed' and 'Rendered' because at the point it's logged, everying already happened.
2009-12-26 20:28:53 +01:00
Joshua Peek
feb7382047
AD::Cascade that supports X-Cascade
2009-12-26 13:28:06 -06:00
Joshua Peek
673fa7f066
rack-mount 0.4
2009-12-26 13:25:36 -06:00
José Valim
8a36e907d2
More <%= render(@posts) %> optimization.
2009-12-26 14:11:04 +01:00
José Valim
ff1a1c0b4d
Optimize <%= render(@posts) %>.
2009-12-26 14:11:04 +01:00
José Valim
c86424a72d
Break instrumentation into several end-points so rendering of partials can be optimized.
2009-12-26 14:11:04 +01:00
José Valim
48273a44c6
Wrap layout rendering in one method: _render_layout (this should make partial instrumentation easier).
2009-12-26 14:11:04 +01:00
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
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
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
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
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