提交 1adfb921 编写于 作者: S Santiago Pastorino 提交者: Yehuda Katz

Deleted all references to ActionView::SafeBuffer in favor of ActiveSupport::SafeBuffer

Signed-off-by: NYehuda Katz <wycats@Yehuda-Katz.local>
上级 9987a007
......@@ -58,6 +58,4 @@ module ActionView
require 'active_support/core_ext/string/output_safety'
require 'action_view/base'
ActionView::SafeBuffer = ActiveSupport::SafeBuffer
I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"
......@@ -143,7 +143,7 @@ def content_for?(name)
# Defaults to a new empty string.
def with_output_buffer(buf = nil) #:nodoc:
unless buf
buf = ActionView::SafeBuffer.new
buf = ActiveSupport::SafeBuffer.new
buf.force_encoding(output_buffer.encoding) if buf.respond_to?(:force_encoding)
end
self.output_buffer, old_buffer = buf, output_buffer
......
......@@ -6,7 +6,7 @@ module ActionView
module Template::Handlers
class Erubis < ::Erubis::Eruby
def add_preamble(src)
src << "@output_buffer = ActionView::SafeBuffer.new;"
src << "@output_buffer = ActiveSupport::SafeBuffer.new;"
end
def add_text(src, text)
......
require 'abstract_unit'
class SafeBufferTest < ActionView::TestCase
class SafeBufferTest < ActiveSupport::TestCase
def setup
@buffer = ActionView::SafeBuffer.new
@buffer = ActiveSupport::SafeBuffer.new
end
test "Should look like a string" do
......@@ -36,6 +36,6 @@ def setup
test "Should return a safe buffer when calling to_s" do
new_buffer = @buffer.to_s
assert_equal ActionView::SafeBuffer, new_buffer.class
assert_equal ActiveSupport::SafeBuffer, new_buffer.class
end
end
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册