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
b10fb7e7bc
Merge branch 'master' of git@github.com:rails/rails
2009-04-20 18:34:43 -07:00
Mislav Marohnić
7ce0778a15
Always buffer rack.input if it is not rewindable
...
Signed-off-by: Joshua Peek <josh@joshpeek.com >
2009-04-17 21:53:44 -05:00
Jeremy Kemper
a22a778f86
render_for_text pushes a body part instead of replacing the whole body
2009-04-17 21:33:09 -05:00
Jeremy Kemper
1414e2afbb
Don't set Content-Length in Base#response_body= since body may be any Rack-compatible body. Leave it up to the content length middleware.
2009-04-17 18:36:28 -05: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
lifo
5b92dcb675
Merge docrails
2009-04-17 14:28:46 +01:00
Carl Lerche & Yehuda Katz
b49027e188
Make more Template methods public to make ActionMailer tests pass
2009-04-16 11:57:27 -07:00
Ross Kaffenburger and Bryan Helmkamp
256b0ee8e3
Don't check authenticity tokens for any AJAX requests
2009-04-15 16:04:21 -07:00
Carl Lerche & Yehuda Katz
3c1187699a
Makes rails-dev-boost work again
2009-04-14 18:32:31 -07:00
Joshua Peek
109a3876f0
Move middleware stack out of utils folder
2009-04-14 18:32:31 -07:00
Joshua Peek
c2511f936e
Make dispatcher instances immutable
2009-04-14 18:32:31 -07:00
Joshua Peek
d7751036fa
Final blow to CGI
2009-04-14 18:32:31 -07:00
Joshua Peek
cf44788b06
We aren't using UploadedStringIO and UploadedTempfile anymore
2009-04-14 18:32:31 -07:00
Carl Lerche & Yehuda Katz
d39f5f18bb
Move all Templates methods not used by other class into private to
...
define surface area of the class.
2009-04-14 18:32:31 -07:00
Joshua Peek
9954494397
Move MimeResponds into base folder
2009-04-14 17:08:38 -05:00
Joshua Peek
d7396b5ca9
Move reloader middleware in ActionDispatch
2009-04-14 17:06:32 -05:00
Joshua Peek
1d2686517c
Session management belongs in base folder
2009-04-14 17:02:38 -05:00
Joshua Peek
97a88a91cb
Move middleware stack out of utils folder
2009-04-14 16:56:45 -05:00
Joshua Peek
13bb6a9a99
Backwords compat alias for ActionController::Request and ActionController::Response
2009-04-14 16:55:10 -05:00
Joshua Peek
ef08aa45b1
Use rack's status code list as a base
2009-04-14 16:47:03 -05:00
Joshua Peek
c1b4a5eb56
Make dispatcher instances immutable
2009-04-14 16:21:06 -05:00
Joshua Peek
4a3afe0b4f
Final blow to CGI
2009-04-14 16:18:24 -05:00
Joshua Peek
11d4bfb18c
We aren't using UploadedStringIO and UploadedTempfile anymore
2009-04-14 15:56:13 -05:00
Joshua Peek
4839fe2e82
Move bundled rack into ActionDispatch
2009-04-14 15:52:23 -05:00
Carl Lerche & Yehuda Katz
647b83d50c
Resurrecting 1.9 compatibility.
2009-04-13 16:56:04 -07:00
Carl Lerche & Yehuda Katz
906aebceed
Bring abstract_controller up to date with rails/master
...
Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list
of commits that could not be applied cleanly or are obviated with the
abstract_controller refactor. They all need to be revisited to ensure
that fixes made in 2.3 do not reappear in 3.0:
2259ecf36806182ea02e#1844 state:resolved]
* This will be handled generically
893e9eb995#1909 state:resolved]
* We will need to reimplement rails-dev-boost on top of the refactor;
the changes here are very implementation specific and cannot be
cleanly applied. The following commits are implicated:
199e750d463942cb406ef8ea9f85d4e3b166aab3ae9f258e0344423126c60cb020b4d6#1974 state:resolved]
* The specifics of this commit no longer apply. Since it is a two-line
commit, we will reimplement this change.
8c5cc66a83#1974 state:resolved]
* This does not apply at all. It should be trivial to apply the feature
to the reimplemented ActionController::Base.
87e8b16246#2052 state:resolved]
* There were a number of patches related to this that simply compounded
each other. Basically none of them apply cleanly, and the underlying
issue needs to be revisited. After discussing the underlying problem
with Koz, we will defer these fixes for further discussion.
2009-04-13 15:18:45 -07:00
Yehuda Katz and Carl Lerche
1aadafda8d
Updated old AC::Base for small changes to AV
2009-04-08 17:33:41 -07:00
Yehuda Katz and Carl Lerche
6c05b5e938
Temporarily modifies setup to call super directly. This can support more T::U runners.
2009-04-08 17:33:41 -07: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
Doug McInnes
c877857d59
Fix for TestResponse.cookies returning cookies unescaped [ #1867 state:resolved]
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com >
2009-04-07 13:21:41 -05:00
Kenny Ortmann
f448c70b3f
added tests for session options being defaulted correctly to rack defaults [ #2403 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com >
2009-04-07 09:18:42 -05:00
Pratik Naik
632bbbfe1c
Merge docrails
2009-04-05 12:36:36 +01:00
José Valim
1ab7c37671
Object names with underscore do the wrong lookup in I18n on error_messages_for.
...
Signed-off-by: Michael Koziarski <michael@koziarski.com >
[#2390 state:committed]
2009-04-05 21:08:14 +12:00
Ryan Angilly
dd2eb1ea7c
adding session_options initialization and test [ #2303 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com >
2009-03-24 10:54:19 -05:00
thedarkone
ae9f258e03
Fix template extension parsing. [ #2315 state:resolved] [ #2284 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com >
2009-03-24 10:54:18 -05:00
thedarkone
e3b166aab3
Simplify handling of absolute path templates. [ #2276 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com >
2009-03-24 10:54:17 -05:00
Peter Marklund
8fa4275a72
Reset request_parameters in TestRequest#recycle! to avoid multiple posts clobbering each other [ #2271 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com >
2009-03-24 10:54:15 -05:00
Pratik Naik
f97832b1e4
Merge docrails
2009-03-24 12:15:43 +00: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
Yehuda Katz
34f058e082
Add a bunch of tests for various render :action, layout combinations
2009-03-23 12:07:34 -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
Jeremy Kemper
0d5b50ee3a
pluginize concurrent block body part
2009-03-19 03:31:55 -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
