Commit Graph

29 Commits

Author SHA1 Message Date
Jeremy Kemper
cf6e025a45 Merge branch 'master' of git@github.com:rails/rails 2009-05-18 11:54:51 -07:00
Yehuda Katz + Carl Lerche
7e10504bde Refactored AbstractController to provide better hook points for overriding aspects of action dispatching 2009-05-15 15:57:12 -07:00
Jeremy Kemper
628110d7ee Active Support dependencies 2009-05-14 17:42:20 -07:00
Jeremy Kemper
e8550ee032 Cherry-pick core extensions 2009-05-13 12:00:15 -07:00
Yehuda Katz + Carl Lerche
72ca7c591c Fixed new callbacks to not call the action when a callback sets the response body 2009-05-12 10:53:00 -07:00
Yehuda Katz + Carl Lerche
00a9d4b91c Merge branch 'master' into wip_abstract_controller
Conflicts:
	actionpack/lib/action_controller/abstract/callbacks.rb
	actionpack/lib/action_controller/abstract/renderer.rb
	actionpack/lib/action_controller/base/base.rb
	actionpack/lib/action_controller/dispatch/dispatcher.rb
	actionpack/lib/action_controller/routing/route_set.rb
	actionpack/lib/action_controller/testing/process.rb
	actionpack/test/abstract_controller/layouts_test.rb
	actionpack/test/controller/filters_test.rb
	actionpack/test/controller/helper_test.rb
	actionpack/test/controller/render_test.rb
	actionpack/test/new_base/test_helper.rb
2009-05-11 17:07:05 -07:00
Yehuda Katz
030dfe3f83 More community code review :) 2009-05-11 10:22:07 -07:00
Joshua Peek
2854535b02 Make module dependency DSL opt in 2009-05-07 10:29:22 -05:00
Yehuda Katz + Carl Lerche
e046f36824 Renamed Base2 to Base and don't require old action_controller for new Base 2009-05-01 17:31:03 -07:00
Yehuda Katz + Carl Lerche
b1d34b3aa4 Starting to get new_base to run on old tests 2009-05-01 17:31:03 -07:00
Yehuda Katz + Carl Lerche
b4903a8e34 Modify new_base to use String action_names for back-compat 2009-05-01 17:31:02 -07:00
Yehuda Katz + Carl Lerche
8a4e77b420 OMG, a lot of work 2009-05-01 17:31:01 -07:00
Yehuda Katz + Carl Lerche
cecafc52ee Refactor ActionView::Template
ActionView::Template is now completely independent from template
  storage, which allows different back ends such as the database.
  ActionView::Template's only responsibility is to take in the
  template source (passed in from ActionView::Path), compile it,
  and render it.
2009-04-27 11:49:11 -07:00
Yehuda Katz + Carl Lerche
0a132c2fe1 Refactor ActionView::Path
* Decouple from ActionController and ActionMailer
  * Bring back localization support.
  * Prepare to decouple templates from the filesystem.
  * Prepare to decouple localization from ActionView
  * Fix ActionMailer to take advantage of ActionView::Path
2009-04-22 17:24:41 -07:00
Jeremy Kemper
f49e344128 Reinstate Base#render_to_string. Introduce AbstractController#render_to_string which stringifies render_to_body. 2009-04-21 16:02:30 -07:00
Jeremy Kemper
df42d26f99 Rename render_to_string to render_to_body since it may return any Rack-compatible body, not just strings 2009-04-17 18:34:49 -05:00
Yehuda Katz and Carl Lerche
3cecbc21e3 Get Base2 layouts to work :) 2009-04-07 17:57:20 -07:00
Yehuda Katz and Carl Lerche
95c9718118 Layouts work in AbstractController. Add support for the rspec runner for T::U 2009-04-07 15:54:02 -07:00
Yehuda Katz and Carl Lerche
c1aa5b0e14 Add depends_on, use, and setup to abstract up ideas about module inheritance. 2009-04-07 14:57:18 -07:00
Yehuda Katz and Carl Lerche
1d3e2c2b73 In the middle of some refactoring... some fails due to changes in AbstractController not yet reflected in ActionController tests 2009-03-23 18:06:47 -07:00
Yehuda Katz and Carl Lerche
a501638e9d Checkpoint 2009-03-23 15:45:01 -07:00
Carl Lerche
c6123c3703 Finished implementing layout for render :text 2009-03-23 10:23:14 -07:00
Yehuda Katz
890321e51e Get very basic layouts working.
* Required small architecture change
2009-03-19 15:45:48 -07:00
Yehuda Katz
f55514125c Working toward getting a basic AbstractController framework 2009-03-17 18:04:22 -07:00
Yehuda Katz
72b365ece9 Move Abstract stuff to autoload 2009-03-12 13:18:15 -06:00
Yehuda Katz
6001cea5d7 Helpers with an initial test 2009-03-03 16:42:20 -08:00
Yehuda Katz
cde9aab823 Callbacks test 2009-02-27 20:49:44 -08:00
Yehuda Katz
d1157e7242 AbstractController now supports layouts and rendering 2009-02-27 11:42:13 -08:00
Yehuda Katz
b1f078bddf First, very early, AbstractController code. More to come 2009-02-24 17:25:21 -08:00