Commit Graph

9420 Commits

Author SHA1 Message Date
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
Jeremy Kemper
ecdc0643f2 Merge branch 'master' of git@github.com:rails/rails 2009-04-17 13:45:18 -05:00
Jeremy Kemper
60896ca6f4 Clearer String#first and #last edge cases. Fix that foo.first(0) == instead of foo. 2009-04-17 13:44:59 -05:00
lifo
5b92dcb675 Merge docrails 2009-04-17 14:28:46 +01:00
David Heinemeier Hansson
abb899c54e Added :touch option to belongs_to associations that will touch the parent record when the current record is saved or destroyed [DHH] 2009-04-16 17:25:55 -05:00
David Heinemeier Hansson
fdb61f02c5 Added ActiveRecord::Base#touch to update the updated_at/on attributes with the current time [DHH] 2009-04-16 16:48:37 -05: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
Jeremy Kemper
1120aaceae Fix requires so tests run 2009-04-14 10:53:46 -05:00
Carl Lerche & Yehuda Katz
d9afc51391 Rails server boots again 2009-04-13 17:16:07 -07: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:

2259ecf368
AR not available
  * This will be reimplemented with ActionORM or equivalent

06182ea02e
implicitly rendering a js response should not use the default layout
[#1844 state:resolved]
  * This will be handled generically

893e9eb995
Improve view rendering performance in development mode and reinstate
template recompiling in production [#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:

      199e750d46
      3942cb406e
      f8ea9f85d4
      e3b166aab3
      ae9f258e03
      44423126c6

0cb020b4d6
workaround for picking layouts based on wrong view_paths
[#1974 state:resolved]
  * The specifics of this commit no longer apply. Since it is a two-line
    commit, we will reimplement this change.

8c5cc66a83
make action_controller/layouts pick templates from the current instance's
view_paths instead of the class view_paths [#1974 state:resolved]
  * This does not apply at all. It should be trivial to apply the feature
    to the reimplemented ActionController::Base.

87e8b16246
fix HTML fallback for explicit templates [#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
Carl Lerche & Yehuda Katz
2036d3ba75 Revert rspec-runner change. TODO: Add back support for the rspec T::U runner. 2009-04-09 12:33:39 -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
91402bdd31 Reverts changes made to AS::TC 2009-04-08 10:10:06 -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
Manfred Stienstra
f209d3898f Improve tests and code for Rails::InfoController and Rails::Info [#2411 state:resolved]
- Refactor Rails::InfoController tests.
- Return forbidden status from the InfoController for remote requests instead of a 500.
- Add tests for displaying middleware in Rails::Info.

Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-04-07 09:16:48 -05:00
Yehuda Katz and Carl Lerche
9c8eaf8e25 Merge branch 'abstract_controller' of git@github.com:wycats/rails into abstract_controller 2009-04-06 12:35:44 -07:00
Yehuda Katz and Carl Lerche
4d3cd9b43f Changes necessary to run the T::U tests with the rspec runner 2009-04-06 12:35:24 -07:00
Geoff Buesing
660fc93942 Test cleanup 2009-04-05 10:19:03 -05:00
Geoff Buesing
7685ea20b4 Hash::XML_TYPE_NAMES: no longer a need for a TimeWithZone entry; this class will now match "Time" 2009-04-05 10:15:54 -05:00
Geoff Buesing
c00f2d25de TimeWithZone.name returns 'Time', to further thwart type checking 2009-04-05 10:08:54 -05:00
Max Lapshin
70de8e64e3 Support multiple schemas in table names for postgresql [#390 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-04-05 12:36:36 +01: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
Luca Guidi
42cdc7571d Ensure SqlBypass use ActiveRecord::Base connection
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#https://rails.lighthouseapp.com/attachments/106066/0001-Ensure-SqlBypass-use-ActiveRecord-Base-connection.patch state:committed]
2009-04-05 21:00:50 +12:00
Joshua Peek
0e9efae474 Nicer name for anonymous local cache middleware class 2009-04-02 12:05:21 -05:00
Cezary Baginski
44423126c6 Additional template render test for backup files [#2367 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-04-02 11:58:29 -05:00
Michael Schuerig
cad3e8b261 Show installed middleware in builtin rails info (/rails/info/properties) [#2396 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-04-02 11:54:52 -05:00