Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Deleted all references to ActionView::SafeBuffer in favor of ActiveSu…

…pport::SafeBuffer

Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
  • Loading branch information...
commit 1adfb9213576bd4a548a66bb46e2a2272e15e48d 1 parent 9987a00
@spastorino spastorino authored Yehuda Katz committed
View
2  actionpack/lib/action_view.rb
@@ -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"
View
2  actionpack/lib/action_view/helpers/capture_helper.rb
@@ -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
View
2  actionpack/lib/action_view/template/handlers/erb.rb
@@ -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)
View
6 actionpack/test/template/safe_buffer_test.rb → activesupport/test/safe_buffer_test.rb
@@ -1,8 +1,8 @@
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
Please sign in to comment.
Something went wrong with that request. Please try again.