github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-03 18:55:29 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,440 Commits 34 Branches 105 Tags
f7fdbae770275ccbc277c42287b9783cb00fa9fa
Commit Graph

70 Commits

Author SHA1 Message Date
Joshua Peek
73b34e9f75 Refactor template preloading. New abstractions include Renderable mixins and a refactored Template class. 2008-07-12 14:33:46 -05:00
Joshua Peek
ad772402c4 Made ActionView::Base#render_file private 2008-06-25 05:57:24 -05:00
Joshua Peek
bec4b69a3b Replaced TemplateFinder abstraction with ViewLoadPaths 2008-06-17 21:21:07 -05:00
Pratik Naik
ef4c65088f Move missing template logic to ActionView 2008-04-19 18:59:13 +01:00
Jeremy Kemper
30fa377f33 Ruby 1.9 compat: encoding and multibyte test fixes 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9194 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-04-01 07:39:04 +00:00
Michael Koziarski
46356100d1 Make sure render :update support the options hash. Closes #11088 [ernesto.jimenez] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8862 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-02-12 22:42:36 +00:00
Michael Koziarski
61c90a4ad6 Reapply the TemplateFinder first applied in [8669] then reverted in [8676]. Closes #10800 [lifofifo] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8683 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-01-21 20:45:04 +00:00
Jeremy Kemper
88bc014acc Revert r8669 for now, breaks Action Mailer. Reopens #10800. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8676 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-01-19 06:01:57 +00:00
Jeremy Kemper
84b0f9c739 Introduce TemplateFinder to handle view paths and lookups. Closes #10800. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8669 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-01-19 03:20:39 +00:00
Jeremy Kemper
a3bfb661e3 Update layout docs. Closes #10584 [Cheah Chu Yeow] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8471 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-12-21 12:30:29 +00:00
Marcel Molina
b4dd1e6879 Explain how the layout macro behaves when passed a path that contains a directory. Closes #10492 [loincloth] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8378 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-12-13 03:33:06 +00:00
Marcel Molina
57c9630944 Adding missing space to documentation of the layout method. Closes #7126 [orangechicken, jeremymcanally] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8317 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-12-05 22:19:10 +00:00
David Heinemeier Hansson
2af36bbbd4 Fix typos (closes #10378) 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8301 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-12-05 18:54:41 +00:00
Jeremy Kemper
0ee1cb2cd3 Ruby 1.9 compat, consistent load paths 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7719 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-10-02 05:32:14 +00:00
David Heinemeier Hansson
860cf2d44e Fixed that render template did not honor exempt_from_layout (closes #9698) [pezra] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7701 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-30 22:59:24 +00:00
David Heinemeier Hansson
3c695356ae Fixed the layout defaults (closes #9564) [lifo] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7661 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-28 01:23:20 +00:00
David Heinemeier Hansson
55a9c86e62 Added failing tests for iphone 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7629 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-25 14:57:15 +00:00
David Heinemeier Hansson
0d99423727 Fixed that default layouts did not take the format into account #9564 [lifofifo] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7514 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-18 23:10:34 +00:00
David Heinemeier Hansson
ff9ca2ca1e Random hits from the style nazi 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7438 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-09 23:12:57 +00:00
Jeremy Kemper
f1b12b62f4 Fix layout overriding response status. Closes #9476. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7418 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-08 03:12:03 +00:00
Michael Koziarski
f81dae3fca Remove deprecated functionality from actionpack. Closes #8958 [lifofifo] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7403 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-03 00:18:30 +00:00
Rick Olson
0127e586d0 Find layouts even if they're not in the first view_paths directory. Closes #9258 [caio] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7321 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-08-15 18:59:37 +00:00
Rick Olson
ebf9b3737b Add some performance enhancements to ActionView. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6736 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-15 06:36:34 +00:00
Rick Olson
f5b8fc0335 Allow layouts with extension of .html.erb. Closes #8032 [Josh Knowles] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6516 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-04-12 17:11:48 +00:00
Jeremy Kemper
07d8f46b85 Consistent public/protected/private visibility for chained methods. Closes #7813. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6396 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-03-13 02:14:31 +00:00
David Heinemeier Hansson
e69390dffe Options are more often than not meaningless babble, just go nondescript instead 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6275 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-03-01 23:27:04 +00:00
David Heinemeier Hansson
e105653066 Added .erb and .builder as preferred aliases to the now deprecated .rhtml and .rxml extensions [Chad Fowler]. This is done to separate the renderer from the mime type. .erb templates are often used to render emails, atom, csv, whatever. So labeling them .rhtml doesn't make too much sense. The same goes for .rxml, which can be used to build everything from HTML to Atom to whatever. .rhtml and .rxml will continue to work until Rails 3.0, though. So this is a slow phasing out. All generators and examples will start using the new aliases, though. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6178 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-02-20 22:09:12 +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
7ed7930769 Make RDoc not spew errors on install because of HTML comments in code comments 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5813 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-31 19:28:28 +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
d15d15b2c2 Deprecate @response 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5207 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-09-29 08:26:45 +00:00
Nicholas Seckar
74165eb6ac New dependencies implementation 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4728 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-08-08 21:21:04 +00:00
David Heinemeier Hansson
11c715a53f Added exception handling of missing layouts (closes #5373) [chris@ozmm.org] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4550 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-07-05 02:38:55 +00:00
Marcel Molina
7252666b74 Add layout attribute to response object with the name of the layout that was rendered, or nil if none rendered. [Kevin Clark kevin.clark@gmail.com] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4346 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-05-17 07:25:36 +00:00
Marcel Molina
9f92dd3984 Replace alias method chaining with Module#alias_method_chain. [Marcel Molina Jr.] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4312 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-04-29 20:20:22 +00:00
Marcel Molina
7bb20659c2 Update layout and content_for documentation to use yield rather than magic @content_for instance variables. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4262 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-04-25 04:03:51 +00:00
David Heinemeier Hansson
d19e8f412f Performance speedup for ActionController (closes #4174) [Stefan Kaes] Includes caching of filter chains -- be on the lookout for problems with that! 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3989 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-03-20 04:01:10 +00:00
Nicholas Seckar
8ff4463193 Simplify controller_path 
Cache File.directory? calls to avoid filesystem calls when using layouts


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3861 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-03-13 15:54:33 +00:00
David Heinemeier Hansson
06c2b43f36 Rendering xml shouldnt happen inside any layout. Added class proxying to RJS, so you can call page.field.clear("my_field") to generate Field.clear("my_field");. Added :content_type option to render, so you can change the content type on the fly. Do type/subtype reordering of Accept header preferences for xml types (aka make Firefox work with respond_to). CHANGED DEFAULT: The default content type for .rxml is now application/xml instead of type/xml, see http://www.xml.com/pub/a/2004/07/21/dive.html for reason 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3852 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-03-13 01:33:57 +00:00
Marcel Molina
73ed47ddec Replace dubious controller parent class in filter docs. Closes #3655, #3722. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3551 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-02-08 05:24:53 +00:00
David Heinemeier Hansson
01b1a87729 Added reusable reloading support through the inclusion of the Relodable module that all subclasses of ActiveRecord::Base, ActiveRecord::Observer, ActiveController::Base, and ActionMailer::Base automatically gets [DHH]. Added auto-loading support for classes in modules, so Conductor::Migration will look for conductor/migration.rb and Conductor::Database::Settings will look for conductor/database/settings.rb [Nicholas Seckar]. Refactored extensions to module, class, and object in active support [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3493 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-01-29 00:37:39 +00:00
Sam Stephenson
4d49f2ca09 Fix render(:update) to not render layouts 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3472 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-01-23 16:29:37 +00:00
Marcel Molina
8d4d88a4f0 Change layout discovery to take into account the change in semantics with File.join and nil arguments. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3462 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-01-22 07:41:27 +00:00
Sam Stephenson
06dd1f2ca3 Add render :update for inline RJS 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3441 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-01-20 22:04:07 +00:00
Marcel Molina
4793a2f5cd Automatically discover layouts when a controller is namespaced. Closes #2199, #3424. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3423 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-01-15 11:28:55 +00:00
Marcel Molina
751b6be464 Allow auto-discovery of third party template library layouts. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3397 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-01-12 07:16:23 +00:00
Marcel Molina
39766a9b4c Don't include a layout when rendering an rjs template using render's :template option. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3316 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-17 06:38:06 +00:00
Marcel Molina
55a3979a09 Correct docs for automatic layout assignment. Closes #2610. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3111 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-20 18:50:09 +00:00
Marcel Molina
62fe5bbfb1 Make rjs templates always implicitly skip out on layouts. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3084 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-18 08:32:17 +00:00
David Heinemeier Hansson
cb0e27cee9 Fix that render :text didn't interpolate instance variables (Closes #2629, #2626) [skaes] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2777 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-10-28 07:33:54 +00:00