Merge pull request #7669 from guilleiguaran/rename-rb-handler

Rename .rb template handler to .ruby to avoid conflicts with mustache classes

4 files changed, 5 insertions, 5 deletions

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 339b4197df..f9af8934fd 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -33,7 +33,7 @@
 
     *Sergey Nartimov*
 
-*   Add .rb template handler, this handler simply allows arbitrary Ruby code as a template. *Guillermo Iguaran*
+*   Add .ruby template handler, this handler simply allows arbitrary Ruby code as a template. *Guillermo Iguaran*
 
 *   Add `separator` option for `ActionView::Helpers::TextHelper#excerpt`:
 
diff --git a/actionpack/lib/action_view/template/handlers.rb b/actionpack/lib/action_view/template/handlers.rb
index 47e572967a..d9cddc0040 100644
--- a/actionpack/lib/action_view/template/handlers.rb
+++ b/actionpack/lib/action_view/template/handlers.rb
@@ -10,7 +10,7 @@ module ActionView #:nodoc:
         base.register_default_template_handler :erb, ERB.new
         base.register_template_handler :builder, Builder.new
         base.register_template_handler :raw, Raw.new
-        base.register_template_handler :rb, :source.to_proc
+        base.register_template_handler :ruby, :source.to_proc
       end
 
       @@template_handlers = {}
diff --git a/actionpack/test/fixtures/ruby_template.rb b/actionpack/test/fixtures/ruby_template.ruby
index 5097bce47c..5097bce47c 100644
--- a/actionpack/test/fixtures/ruby_template.rb
+++ b/actionpack/test/fixtures/ruby_template.ruby
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 16a43fa0df..ddf5c6a1b3 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -97,12 +97,12 @@ module RenderTestCases
     assert_equal %q;Here are some characters: !@#$%^&*()-="'}{`; + "\n", @view.render(:template => "plain_text_with_characters")
   end
 
-  def test_render_rb_template_with_handlers
+  def test_render_ruby_template_with_handlers
     assert_equal "Hello from Ruby code", @view.render(:template => "ruby_template")
   end
 
-  def test_render_rb_template_inline
-    assert_equal '4', @view.render(:inline => "(2**2).to_s", :type => :rb)
+  def test_render_ruby_template_inline
+    assert_equal '4', @view.render(:inline => "(2**2).to_s", :type => :ruby)
   end
 
   def test_render_file_with_localization_on_context_level