Commit Graph

482 Commits

Author SHA1 Message Date
Rick Olson
92195e68a0 Fix issue with deprecation messing up #template_root= usage. Add #prepend_view_path and #append_view_path to allow modification of a copy of the
superclass' view_paths.  [Rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6125 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-02-04 22:27:45 +00:00
Rick Olson
69b0e5c44a Allow Controllers to have multiple view_paths instead of a single template_root. Closes #2754 [John Long]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6120 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-02-04 20:47:05 +00:00
David Heinemeier Hansson
8f614a80e7 Fix gem deprecation warnings, which also means depending on RubyGems 0.9.0+ [Chad Fowler]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6119 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-02-04 20:44:45 +00:00
Rick Olson
19fbb31464 Add much-needed html-scanner tests. Fixed CDATA parsing bug. [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6117 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-02-04 20:04:40 +00:00
Rick Olson
7a49cb058f fix form_for example in ActionController::Resources documentation. Closes #7362 [gnarg], Added enhanced docs to routing assertions. Closes #7359 [Rob Sanheim], improve error message for Routing for named routes. Closes #7346 [Rob Sanheim]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6113 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-02-04 19:07:08 +00:00
Jeremy Kemper
09c708981c TestSession supports indifferent access so session['foo'] == session[:foo] in your tests. Closes #7372.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6086 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-28 18:24:46 +00:00
Nicholas Seckar
2cc9c8135c Allow Routes to generate all urls for a set of options by specifying :generate_all => true. References #1739.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6082 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-28 17:29:51 +00:00
Nicholas Seckar
17a9405b58 Change the query parser to map empty GET params to "" rather than nil. Closes #5694.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6081 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-28 17:00:17 +00:00
Jeremy Kemper
799f556fe1 Resource member routes require :id, eliminating the ambiguous overlap with collection routes. Closes #7229.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6062 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-28 08:20:04 +00:00
Jeremy Kemper
0eacdcf9a3 Use a consistent load path to avoid double requires. Fix some scattered Ruby warnings.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6057 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-28 07:16:55 +00:00
Jeremy Kemper
4ac332fa9a Fix Test::Unit::TestCase#clean_backtrace
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6056 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-28 07:10:35 +00:00
Jeremy Kemper
dde527440a Remove deprecated assertions.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6055 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-28 07:00:43 +00:00
Nicholas Seckar
35ec1c928f Fix doubly appearing parameters due to string and symbol mixups. Closes #2551.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6053 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-28 05:29:32 +00:00
Jeremy Kemper
7fce529b2a Mocha 0.4 mixes in more public instance methods, confusing controller identification of action methods. Closes #7347.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6030 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-24 12:04:08 +00:00
Rick Olson
fcd73821c2 Modernize cookie testing code, and increase coverage (Heckle++) #7101 [Kevin Clark]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5977 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-17 06:51:59 +00:00
Rick Olson
d2205ea5e9 Improve Test Coverage for ActionController::Routing::Route#matches_controller_and_action? (Heckle++) #7115 [Kevin Clark]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5976 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-17 06:49:43 +00:00
Rick Olson
582c028b14 Heckling ActionController::Resources::Resource revealed that set_prefixes didn't break when :name_prefix was munged. #7081 [Kevin Clark]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5974 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-17 06:46:02 +00:00
Jeremy Kemper
d38417fc02 RecordInvalid, RecordNotSaved => 422 Unprocessable Entity, StaleObjectError => 409 Conflict. References #7097.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5966 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-17 00:43:53 +00:00
Jeremy Kemper
55efae2720 Allow exempt_from_layout :rhtml. References #6742, closes #7026.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5927 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-14 13:57:44 +00:00
Jeremy Kemper
a6e12c0c21 Wrap and skip tests using mocha.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5926 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-14 12:49:55 +00:00
Jeremy Kemper
ba814a9033 Use mocha for rescue tests.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5916 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-13 07:14:46 +00:00
Rick Olson
dd6826eba3 Recognize the .txt extension as Mime::TEXT [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5912 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-12 20:54:04 +00:00
Jeremy Kemper
88e02f6e56 Failing test for exempt_from_layout :rhtml. References #6742.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5909 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-12 10:31:24 +00:00
Jeremy Kemper
41198ad3ad Fix parsing of array[] CGI parameters so extra empty values aren't included. Closes #6252.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5904 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-12 09:10:58 +00:00
Jeremy Kemper
fe736a54f9 Set request.env['REQUEST_URI'] when absent.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5895 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-12 07:01:39 +00:00
Jeremy Kemper
89b472aa0c Test proving render_to_string result passed to partial works. Closes #2541. [smeade]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5893 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-12 06:10:06 +00:00
Rick Olson
0727af86fc Fix bug where nested resources ignore a parent singleton parent's path prefix. Closes #6940 [Dan Kubb]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5872 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-01-08 01:07:48 +00:00
Jeremy Kemper
f9f84d9f6d Routing uses URI escaping for path components and CGI escaping for query parameters.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5803 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-28 21:04:44 +00:00
Rick Olson
64799454a2 Fix assert_redirected_to bug where redirecting from a nested to to a top-level controller incorrectly added the current controller's nesting. Closes #6128. [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5785 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-25 09:34:01 +00:00
Jeremy Kemper
68d2926ab0 Singleton resources: POST /singleton => create, GET /singleton/new => new
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5772 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-22 03:16:50 +00:00
Jeremy Kemper
a1ca37ec86 Use 400 Bad Request status for unrescued ActiveRecord::RecordInvalid exceptions.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5771 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-22 00:27:39 +00:00
Jeremy Kemper
9a27b29755 Silence log_error deprecation warnings from inspecting deprecated instance variables.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5757 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-19 23:16:10 +00:00
Jeremy Kemper
e56bd3a121 Only cache GET requests with a 200 OK response. Closes #6514, #6743.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5755 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-19 20:25:52 +00:00
Rick Olson
e7c2c7982f Ensure render :json => ... skips the layout. Closes #6808 [Josh Peek]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5746 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-19 04:41:57 +00:00
Jeremy Kemper
7d49da95a9 Another test that the deprecation spout is plugged.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5730 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-17 08:29:21 +00:00
Nicholas Seckar
d1a2449220 Fix a bug in Routing where a parameter taken from the path of the current request could not be used as a query parameter for the next. Closes #6752.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5709 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-09 04:42:32 +00:00
Jeremy Kemper
a454dcf012 Unrescued ActiveRecord::RecordNotFound responds with 404 instead of 500.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5706 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-08 22:19:00 +00:00
Rick Olson
90179a9ba5 added tests checking for nested singleton resources
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5703 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-07 16:31:41 +00:00
Rick Olson
d0fa4d3e33 Add singleton resources. [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5701 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-07 15:36:08 +00:00
Jeremy Kemper
953214bd23 Remove unrelated render :yaml changes. References #4185.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5697 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-06 23:16:25 +00:00
Jeremy Kemper
91d99e2f53 More thorough JSON tests. Use application/json by default, per rfc4627. References #4185.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5695 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-06 23:06:38 +00:00
Jeremy Kemper
42596543dc respond_to recognizes JSON. render :json => @person.to_json automatically sets the content type and takes a :callback option to specify a client-side function to call using the rendered JSON as an argument. References #4185.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5694 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-06 22:27:08 +00:00
David Heinemeier Hansson
2794f4164f Dropped the idea of automatically routing :format for the vanilla routes -- that will be a treat for map.resources. Deprecated the name route root as it'll be used as a shortcut for map.connect '' in Rails 2.0 (Rails 1.2). Added map.root as an alias for map.connect '' (Rails 2.0)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5671 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-04 00:12:00 +00:00
David Heinemeier Hansson
7611fa6d46 Added Request#format to return the format used for the request as a mime type. If no format is specified, the first Request#accepts type is used. This means you can stop using respond_to for anything else than responses [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5664 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-02 23:07:04 +00:00
David Heinemeier Hansson
5410f2cb74 Added the option for extension aliases to mime type registration [DHH] Refactored default mime types to use the extension framework instead of just declaring themselves verbosely
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5663 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-12-02 22:48:20 +00:00
Jeremy Kemper
ec75642e13 Merge [5645] from 1.2.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5646 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-11-28 23:41:04 +00:00
Jeremy Kemper
13e1d295d6 @response.redirect_url works with 201 Created responses: just return headers['Location'] rather than checking the response status.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5643 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-11-28 23:25:00 +00:00
Jeremy Kemper
ba1db2de63 uses_component_template_root looks at caller[0] which turns up the deprecation method rather than the controller. Use caller[1] instead.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5631 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-11-26 01:24:10 +00:00
David Heinemeier Hansson
396b3f2bef Dont set default charset if the response is sending a file. Closes #6689 [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5626 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-11-25 19:29:10 +00:00
David Heinemeier Hansson
efd0bdd9ea * Added GET-masquarading for HEAD, so request.method will return :get even for HEADs. This will help anyone relying on case request.method to automatically work with HEAD and map.resources will also allow HEADs to all GET actions. Rails automatically throws away the response content in a reply to HEAD, so you dont even need to worry about that. If you, for whatever reason, still need to distinguish between GET and HEAD in some edge case, you can use Request#head? and even Request.headers["REQUEST_METHOD"] for get the "real" answer. Closes #6694 [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5621 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-11-23 23:24:47 +00:00