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

48 files changed, 0 insertions, 91 deletions

diff --git a/actionpack/test/fixtures/addresses/list.rhtml b/actionpack/test/fixtures/addresses/list.rhtml
index c75e01eece..e69de29bb2 100644
--- a/actionpack/test/fixtures/addresses/list.rhtml
+++ b/actionpack/test/fixtures/addresses/list.rhtml
@@ -1 +0,0 @@
-We only need to get this far!
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml
index 4e8a2d804c..e69de29bb2 100644
--- a/actionpack/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml
@@ -1 +0,0 @@
-<%= @cookies[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml
index 68e88bb746..e69de29bb2 100644
--- a/actionpack/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml
@@ -1 +0,0 @@
-<%= cookies[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_flash_ivar.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_flash_ivar.rhtml
index 4b4782b287..e69de29bb2 100644
--- a/actionpack/test/fixtures/deprecated_instance_variables/_flash_ivar.rhtml
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_flash_ivar.rhtml
@@ -1 +0,0 @@
-<%= @flash[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_flash_method.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_flash_method.rhtml
index f7f9d0913a..e69de29bb2 100644
--- a/actionpack/test/fixtures/deprecated_instance_variables/_flash_method.rhtml
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_flash_method.rhtml
@@ -1 +0,0 @@
-<%= flash[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_headers_ivar.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_headers_ivar.rhtml
index 1176c93ad8..e69de29bb2 100644
--- a/actionpack/test/fixtures/deprecated_instance_variables/_headers_ivar.rhtml
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_headers_ivar.rhtml
@@ -1 +0,0 @@
-<%= @headers[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_headers_method.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_headers_method.rhtml
index 308c4eb6ba..e69de29bb2 100644
--- a/actionpack/test/fixtures/deprecated_instance_variables/_headers_method.rhtml
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_headers_method.rhtml
@@ -1 +0,0 @@
-<%= headers[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_params_ivar.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_params_ivar.rhtml
index 1eea68757f..e69de29bb2 100644
--- a/actionpack/test/fixtures/deprecated_instance_variables/_params_ivar.rhtml
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_params_ivar.rhtml
@@ -1 +0,0 @@
-<%= @params[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_params_method.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_params_method.rhtml
index 7e349b4ca0..e69de29bb2 100644
--- a/actionpack/test/fixtures/deprecated_instance_variables/_params_method.rhtml
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_params_method.rhtml
@@ -1 +0,0 @@
-<%= params[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_request_ivar.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_request_ivar.rhtml
index a1680c23d5..e69de29bb2 100644
--- a/actionpack/test/fixtures/deprecated_instance_variables/_request_ivar.rhtml
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_request_ivar.rhtml
@@ -1 +0,0 @@
-<%= @request.method %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_request_method.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_request_method.rhtml
index 0c74cf1c1b..e69de29bb2 100644
--- a/actionpack/test/fixtures/deprecated_instance_variables/_request_method.rhtml
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_request_method.rhtml
@@ -1 +0,0 @@
-<%= request.method %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_response_ivar.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_response_ivar.rhtml
index 2f12d2ce32..e69de29bb2 100644
--- a/actionpack/test/fixtures/deprecated_instance_variables/_response_ivar.rhtml
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_response_ivar.rhtml
@@ -1 +0,0 @@
-<%= @response.body %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_response_method.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_response_method.rhtml
index 948c75929a..e69de29bb2 100644
--- a/actionpack/test/fixtures/deprecated_instance_variables/_response_method.rhtml
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_response_method.rhtml
@@ -1 +0,0 @@
-<%= response.body %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_session_ivar.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_session_ivar.rhtml
index 3acc1b8529..e69de29bb2 100644
--- a/actionpack/test/fixtures/deprecated_instance_variables/_session_ivar.rhtml
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_session_ivar.rhtml
@@ -1 +0,0 @@
-<%= @session[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_session_method.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_session_method.rhtml
index a899387c47..e69de29bb2 100644
--- a/actionpack/test/fixtures/deprecated_instance_variables/_session_method.rhtml
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_session_method.rhtml
@@ -1 +0,0 @@
-<%= session[:test] %>
diff --git a/actionpack/test/fixtures/fun/games/hello_world.rhtml b/actionpack/test/fixtures/fun/games/hello_world.rhtml
index 1ebfbe2539..e69de29bb2 100644
--- a/actionpack/test/fixtures/fun/games/hello_world.rhtml
+++ b/actionpack/test/fixtures/fun/games/hello_world.rhtml
@@ -1 +0,0 @@
-Living in a nested world
\ No newline at end of file
diff --git a/actionpack/test/fixtures/layouts/builder.rxml b/actionpack/test/fixtures/layouts/builder.rxml
index 729af4b8bc..e69de29bb2 100644
--- a/actionpack/test/fixtures/layouts/builder.rxml
+++ b/actionpack/test/fixtures/layouts/builder.rxml
@@ -1,3 +0,0 @@
-xml.wrapper do
-  xml << @content_for_layout
-end
\ No newline at end of file
diff --git a/actionpack/test/fixtures/layouts/standard.rhtml b/actionpack/test/fixtures/layouts/standard.rhtml
index 368764e6f4..e69de29bb2 100644
--- a/actionpack/test/fixtures/layouts/standard.rhtml
+++ b/actionpack/test/fixtures/layouts/standard.rhtml
@@ -1 +0,0 @@
-<html><%= @content_for_layout %><%= @variable_for_layout %></html>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/layouts/talk_from_action.rhtml b/actionpack/test/fixtures/layouts/talk_from_action.rhtml
index 187aab07a2..e69de29bb2 100644
--- a/actionpack/test/fixtures/layouts/talk_from_action.rhtml
+++ b/actionpack/test/fixtures/layouts/talk_from_action.rhtml
@@ -1,2 +0,0 @@
-<title><%= @title || @content_for_title %></title>
-<%= @content_for_layout -%>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/layouts/yield.rhtml b/actionpack/test/fixtures/layouts/yield.rhtml
index 482dc9022e..e69de29bb2 100644
--- a/actionpack/test/fixtures/layouts/yield.rhtml
+++ b/actionpack/test/fixtures/layouts/yield.rhtml
@@ -1,2 +0,0 @@
-<title><%= yield :title %></title>
-<%= yield %>
diff --git a/actionpack/test/fixtures/override/test/hello_world.rhtml b/actionpack/test/fixtures/override/test/hello_world.rhtml
index 3e308d3d86..e69de29bb2 100644
--- a/actionpack/test/fixtures/override/test/hello_world.rhtml
+++ b/actionpack/test/fixtures/override/test/hello_world.rhtml
@@ -1 +0,0 @@
-Hello overridden world!
\ No newline at end of file
diff --git a/actionpack/test/fixtures/scope/test/modgreet.rhtml b/actionpack/test/fixtures/scope/test/modgreet.rhtml
index 8947726e89..e69de29bb2 100644
--- a/actionpack/test/fixtures/scope/test/modgreet.rhtml
+++ b/actionpack/test/fixtures/scope/test/modgreet.rhtml
@@ -1 +0,0 @@
-<p>Beautiful modules!</p>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_customer.rhtml b/actionpack/test/fixtures/test/_customer.rhtml
index 872d8c44e6..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/_customer.rhtml
+++ b/actionpack/test/fixtures/test/_customer.rhtml
@@ -1 +0,0 @@
-Hello: <%= customer.name %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_customer_greeting.rhtml b/actionpack/test/fixtures/test/_customer_greeting.rhtml
index 6acbcb20c4..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/_customer_greeting.rhtml
+++ b/actionpack/test/fixtures/test/_customer_greeting.rhtml
@@ -1 +0,0 @@
-<%= greeting %>: <%= customer_greeting.name %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_hash_object.rhtml b/actionpack/test/fixtures/test/_hash_object.rhtml
index 037a7368d6..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/_hash_object.rhtml
+++ b/actionpack/test/fixtures/test/_hash_object.rhtml
@@ -1 +0,0 @@
-<%= hash_object[:first_name] %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_hello.rxml b/actionpack/test/fixtures/test/_hello.rxml
index ef52f632d1..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/_hello.rxml
+++ b/actionpack/test/fixtures/test/_hello.rxml
@@ -1 +0,0 @@
-xm.hello
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_partial_only.rhtml b/actionpack/test/fixtures/test/_partial_only.rhtml
index a44b3eed40..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/_partial_only.rhtml
+++ b/actionpack/test/fixtures/test/_partial_only.rhtml
@@ -1 +0,0 @@
-only partial
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_person.rhtml b/actionpack/test/fixtures/test/_person.rhtml
index b2e5688956..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/_person.rhtml
+++ b/actionpack/test/fixtures/test/_person.rhtml
@@ -1,2 +0,0 @@
-Second: <%= name %>
-Third: <%= @name %>
diff --git a/actionpack/test/fixtures/test/action_talk_to_layout.rhtml b/actionpack/test/fixtures/test/action_talk_to_layout.rhtml
index 36e896daa8..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/action_talk_to_layout.rhtml
+++ b/actionpack/test/fixtures/test/action_talk_to_layout.rhtml
@@ -1,2 +0,0 @@
-<% @title = "Talking to the layout" -%>
-Action was here!
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/block_content_for.rhtml b/actionpack/test/fixtures/test/block_content_for.rhtml
index 9510337365..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/block_content_for.rhtml
+++ b/actionpack/test/fixtures/test/block_content_for.rhtml
@@ -1,2 +0,0 @@
-<% block_content_for :title do 'Putting stuff in the title!' end %>
-Great stuff!
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/capturing.rhtml b/actionpack/test/fixtures/test/capturing.rhtml
index 1addaa40d9..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/capturing.rhtml
+++ b/actionpack/test/fixtures/test/capturing.rhtml
@@ -1,4 +0,0 @@
-<% days = capture do %>
-  Dreamy days
-<% end %>
-<%= days %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/content_for.rhtml b/actionpack/test/fixtures/test/content_for.rhtml
index 0e47ca8c3d..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/content_for.rhtml
+++ b/actionpack/test/fixtures/test/content_for.rhtml
@@ -1,2 +0,0 @@
-<% content_for :title do %>Putting stuff in the title!<% end %>
-Great stuff!
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/dot.directory/render_file_with_ivar.rhtml b/actionpack/test/fixtures/test/dot.directory/render_file_with_ivar.rhtml
index 8b8a449236..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/dot.directory/render_file_with_ivar.rhtml
+++ b/actionpack/test/fixtures/test/dot.directory/render_file_with_ivar.rhtml
@@ -1 +0,0 @@
-The secret is <%= @secret %>
diff --git a/actionpack/test/fixtures/test/erb_content_for.rhtml b/actionpack/test/fixtures/test/erb_content_for.rhtml
index c3bdd13643..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/erb_content_for.rhtml
+++ b/actionpack/test/fixtures/test/erb_content_for.rhtml
@@ -1,2 +0,0 @@
-<% erb_content_for :title do %>Putting stuff in the title!<% end %>
-Great stuff!
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/greeting.rhtml b/actionpack/test/fixtures/test/greeting.rhtml
index 62fb0293f0..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/greeting.rhtml
+++ b/actionpack/test/fixtures/test/greeting.rhtml
@@ -1 +0,0 @@
-<p>This is grand!</p>
diff --git a/actionpack/test/fixtures/test/hello.rxml b/actionpack/test/fixtures/test/hello.rxml
index 82a4a310d3..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/hello.rxml
+++ b/actionpack/test/fixtures/test/hello.rxml
@@ -1,4 +0,0 @@
-xml.html do
-  xml.p "Hello #{@name}"
-  xml << render_file("test/greeting")
-end
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/hello_world.rhtml b/actionpack/test/fixtures/test/hello_world.rhtml
index 6769dd60bd..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/hello_world.rhtml
+++ b/actionpack/test/fixtures/test/hello_world.rhtml
@@ -1 +0,0 @@
-Hello world!
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/hello_world.rxml b/actionpack/test/fixtures/test/hello_world.rxml
index bffd2191ba..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/hello_world.rxml
+++ b/actionpack/test/fixtures/test/hello_world.rxml
@@ -1,3 +0,0 @@
-xml.html do
-  xml.p "Hello"
-end
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/hello_world_container.rxml b/actionpack/test/fixtures/test/hello_world_container.rxml
index e48d75c405..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/hello_world_container.rxml
+++ b/actionpack/test/fixtures/test/hello_world_container.rxml
@@ -1,3 +0,0 @@
-xml.test do
-  render :partial => 'hello', :locals => { :xm => xml }
-end
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/hello_world_with_layout_false.rhtml b/actionpack/test/fixtures/test/hello_world_with_layout_false.rhtml
index 6769dd60bd..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/hello_world_with_layout_false.rhtml
+++ b/actionpack/test/fixtures/test/hello_world_with_layout_false.rhtml
@@ -1 +0,0 @@
-Hello world!
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/hello_xml_world.rxml b/actionpack/test/fixtures/test/hello_xml_world.rxml
index 02b14fe87c..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/hello_xml_world.rxml
+++ b/actionpack/test/fixtures/test/hello_xml_world.rxml
@@ -1,11 +0,0 @@
-xml.html do
-  xml.head do
-    xml.title "Hello World"
-  end
-  
-  xml.body do
-    xml.p "abes"
-    xml.p "monks"
-    xml.p "wiseguys"
-  end
-end
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/list.rhtml b/actionpack/test/fixtures/test/list.rhtml
index cd0ab45d26..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/list.rhtml
+++ b/actionpack/test/fixtures/test/list.rhtml
@@ -1 +0,0 @@
-<%= @test_unchanged = 'goodbye' %><%= render_collection_of_partials "customer", @customers %><%= @test_unchanged %>
diff --git a/actionpack/test/fixtures/test/non_erb_block_content_for.rxml b/actionpack/test/fixtures/test/non_erb_block_content_for.rxml
index 6ff6db0f95..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/non_erb_block_content_for.rxml
+++ b/actionpack/test/fixtures/test/non_erb_block_content_for.rxml
@@ -1,4 +0,0 @@
-content_for :title do
-  'Putting stuff in the title!'
-end
-xml << "\nGreat stuff!"
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/potential_conflicts.rhtml b/actionpack/test/fixtures/test/potential_conflicts.rhtml
index a5e964e359..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/potential_conflicts.rhtml
+++ b/actionpack/test/fixtures/test/potential_conflicts.rhtml
@@ -1,4 +0,0 @@
-First: <%= @name %>
-<%= render :partial => "person", :locals => { :name => "Stephan" } -%>
-Fourth: <%= @name %>
-Fifth: <%= name %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/render_file_with_ivar.rhtml b/actionpack/test/fixtures/test/render_file_with_ivar.rhtml
index 8b8a449236..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/render_file_with_ivar.rhtml
+++ b/actionpack/test/fixtures/test/render_file_with_ivar.rhtml
@@ -1 +0,0 @@
-The secret is <%= @secret %>
diff --git a/actionpack/test/fixtures/test/render_file_with_locals.rhtml b/actionpack/test/fixtures/test/render_file_with_locals.rhtml
index ebe09faee6..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/render_file_with_locals.rhtml
+++ b/actionpack/test/fixtures/test/render_file_with_locals.rhtml
@@ -1 +0,0 @@
-The secret is <%= secret %>
diff --git a/actionpack/test/fixtures/test/render_to_string_test.rhtml b/actionpack/test/fixtures/test/render_to_string_test.rhtml
index 6e267e8634..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/render_to_string_test.rhtml
+++ b/actionpack/test/fixtures/test/render_to_string_test.rhtml
@@ -1 +0,0 @@
-The value of foo is: ::<%= @foo %>::
diff --git a/actionpack/test/fixtures/test/update_element_with_capture.rhtml b/actionpack/test/fixtures/test/update_element_with_capture.rhtml
index fa3ef200f9..e69de29bb2 100644
--- a/actionpack/test/fixtures/test/update_element_with_capture.rhtml
+++ b/actionpack/test/fixtures/test/update_element_with_capture.rhtml
@@ -1,9 +0,0 @@
-<% replacement_function = update_element_function("products", :action => :update) do %>
-  <p>Product 1</p>
-  <p>Product 2</p>
-<% end %>
-<%= javascript_tag(replacement_function) %>
-
-<% update_element_function("status", :action => :update, :binding => binding) do %>
-  <b>You bought something!</b>
-<% end %>