Commit Graph

41 Commits

Author SHA1 Message Date
Rick Olson
da6f5a1cb4 Change ActionView template defaults. Look for templates using the request format first, such as show.html.erb or show.xml.builder, before looking for the old defaults like show.erb or show.builder [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6499 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-04-02 00:02:11 +00:00
David Heinemeier Hansson
94fa0ed053 Its ETag not Etag
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6168 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-02-19 02:10:19 +00:00
David Heinemeier Hansson
7ec0204ecd Move etagging down to response, so renders with layouts dont screw it up [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6165 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-02-19 00:27:19 +00:00
David Heinemeier Hansson
aad7fbde68 Added caching option to AssetTagHelper#stylesheet_link_tag and AssetTagHelper#javascript_include_tag [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6164 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-02-18 23:54:20 +00:00
David Heinemeier Hansson
109d4ac954 Allow people to set their own etags, if they want more control over the process (closes #7580) []
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6163 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-02-18 16:32:05 +00:00
Jeremy Kemper
4fd84aae90 Etagging ignores appended and block responses.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6160 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-02-18 00:47:18 +00:00
David Heinemeier Hansson
2e55095f6f Added that rendering will automatically insert the etag header on 200 OK responses. The etag is calculated using MD5 of the response body. If a request comes in that has a matching etag, the response will be changed to a 304 Not Modified and the response body will be set to an empty string. [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6158 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-02-17 18:16:44 +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
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
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
Jeremy Kemper
a307b8c7dc render_text may optionally append to the response body. render_javascript appends by default. This allows you to chain multiple render :update calls by setting @performed_render = false between them (awaiting a better public API).
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5253 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-10-09 01:26:35 +00:00
Jeremy Kemper
d7674637f9 Deprecation: @request will be removed after 1.2. Use the request method instead.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5201 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-09-29 07:34:02 +00:00
Rick Olson
5360e47431 added passing test for using partials with an xml builder
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5044 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-09-06 03:51:45 +00:00
David Heinemeier Hansson
83313fccc0 Backed out of locals hash as it caused trouble with Builder, see ticket for more
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5043 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-09-06 03:38:11 +00:00
David Heinemeier Hansson
df70e28e03 Added locals hash to partials, which makes for convenient access of some times available/some times not variables (closes #5491) [wbruce@gmail.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4997 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-09-04 20:01:52 +00:00
Jeremy Kemper
da8d7a7011 deprecated render assertions
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4977 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-09-04 05:51:48 +00:00
David Heinemeier Hansson
653bfe9600 Dont raise deprecation warning on render :action => "stuff"
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4975 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-09-04 05:24:08 +00:00
Jeremy Kemper
d4a3eff89d no more render_to_string deprecation warnings
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4970 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-09-04 04:59:05 +00:00
Jeremy Kemper
7818cf1123 deprecated render tests
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4968 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-09-04 04:05:38 +00:00
David Heinemeier Hansson
de660957a5 Added defaults to respond_to [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3842 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-12 03:39:58 +00:00
David Heinemeier Hansson
6e3e5cadfb Added option to render action/template/file of a specific extension (and here by template type). This means you can have multiple templates with the same name but a different extension [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3841 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-12 01:56:55 +00:00
David Heinemeier Hansson
8896efd41a Ensure backwards compatibility with symbolized action names for render_action (closes #3869) [anna@wota.jp]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3606 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-02-19 00:46:34 +00:00
Nicholas Seckar
86a571090c Reset template variables after using render_to_string. Closes #2559
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2723 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-25 02:15:08 +00:00
Nicholas Seckar
cb8bb70aa7 Make string-keys locals assigns optional
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2665 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-17 15:51:07 +00:00
Nicholas Seckar
e625d27633 Add temporary support for passing locals to render using string keys
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2630 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-16 00:04:33 +00:00
David Heinemeier Hansson
43b6a74fb1 Added :locals support for render :inline #2463 [mdabney@cavoksolutions.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2567 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-13 20:26:39 +00:00
David Heinemeier Hansson
b366dbd952 Improved performance with 5-30% through a series of Action Pack optimizations #1811 [Stefan Kaes]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1905 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-07-23 09:00:05 +00:00
David Heinemeier Hansson
93ec99c246 Partly tuned docs for release (AP)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1728 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-07-06 08:27:11 +00:00
Jeremy Kemper
063956b93c r2879@asus: jeremy | 2005-07-05 16:15:16 -0700
Rollback changesets for Ticket #1229.
 r2880@asus:  jeremy | 2005-07-05 16:17:08 -0700
 Ticket #1229 does not affect Ticket #1614.  Reinstating the changesets.
 r2881@asus:  jeremy | 2005-07-05 16:24:04 -0700
 @test_unchanged in deprecated render test :partials_list action


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1718 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-07-05 18:31:51 +00:00
Jeremy Kemper
8a2fec8d31 r2874@asus: jeremy | 2005-07-05 16:13:39 -0700
Unit test for Ticket #1614.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1717 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-07-05 18:21:26 +00:00
Jamis Buck
14c378cc7f render(:template) applies a layout by default. render("foo/bar") works with a layout again.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1424 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-06-15 13:20:17 +00:00
Jamis Buck
f8542a64b3 Make sure the benchmarking render method always returns the result of the render, regardless of whether logging is enabled or not.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1371 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-05-30 09:00:46 +00:00
David Heinemeier Hansson
aa20834222 Added accessors to logger, params, response, session, and headers from the view, so you can write <% logger.info "stuff" %> instead of <% @logger.info "others" %> -- more consistent with the preferred way of accessing these attributes and collections from the controller
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1307 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-05-19 16:00:04 +00:00
David Heinemeier Hansson
e5b3d08a0a Added that render_partial called from a controller will use the action name as default #828 [Dan Peterson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1182 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-04-17 09:25:54 +00:00
David Heinemeier Hansson
41ea6963a3 Added Base#render_to_string to parse a template and get the result back as a string #479
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@766 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-02-23 14:57:08 +00:00
David Heinemeier Hansson
b1999be5a7 A hopefully more successful attempt at the Routing branch merge
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@617 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-02-15 01:45:35 +00:00
David Heinemeier Hansson
88a3343ed5 Backed out of routing merge.. investigating missing patches
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@616 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-02-15 01:24:55 +00:00
David Heinemeier Hansson
c844755e5a Merged back the Routing branch
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@614 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-02-15 00:51:02 +00:00
David Heinemeier Hansson
75fca04590 Added authentication framework to protect actions behind a condition and redirect on failure. See ActionController::Authentication for more.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@351 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-01-09 15:20:00 +00:00
David Heinemeier Hansson
db045dbbf6 Initial
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2004-11-24 01:04:44 +00:00