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 + Carl Lerche
0cac68d3be
Revert "Whitespace!"
...
This reverts commit a747ab5b20
2009-05-11 15:03:24 -07:00
Yehuda Katz + Carl Lerche
0f6e764e40
Fixed a bug with handling render options
2009-05-11 14:48:58 -07:00
Joshua Peek
a747ab5b20
Whitespace!
2009-05-07 10:45:29 -05:00
Joshua Peek
2854535b02
Make module dependency DSL opt in
2009-05-07 10:29:22 -05:00
Yehuda Katz + Carl Lerche
ad2a1b5cb1
Get render :inline working
2009-05-01 18:17:08 -07:00
Yehuda Katz + Carl Lerche
d58b57a3ca
Move ContentType inline for now.
...
Trying to avoid premature proliferation of modules.
2009-05-01 17:31:02 -07:00
Yehuda Katz + Carl Lerche
49834e088b
Support implicit render and blank render
2009-05-01 17:31:02 -07:00
Yehuda Katz + Carl Lerche
0c3d9bc4c2
Ported over render :template tests
2009-05-01 17:31:01 -07:00
Yehuda Katz + Carl Lerche
4f68311685
Finished implementing render :text in Base2
2009-05-01 17:31:01 -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
c1aa5b0e14
Add depends_on, use, and setup to abstract up ideas about module inheritance.
2009-04-07 14:57:18 -07:00
Carl Lerche
c6123c3703
Finished implementing layout for render :text
2009-03-23 10:23:14 -07:00
Carl Lerche
81e814adfa
Working on being able to render :text with layouts
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
8ab37c7660
Started implementing render :action
2009-03-19 13:35:39 -07:00
Yehuda Katz
e0447023db
Implemented basic template rendering in AC::Base2:
...
* Created several macros for writing simpler specs
* Finished making Rack::Test work right
* Implemented render_to_string
* Status Codes
* render :text => nil
2009-03-18 15:58:47 -07:00
Yehuda Katz
f55514125c
Working toward getting a basic AbstractController framework
2009-03-17 18:04:22 -07:00
