diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-02-01 04:12:01 -0200 |
|---|---|---|
| committer | Yehuda Katz <wycats@Yehuda-Katz.local> | 2010-01-31 22:14:18 -0800 |
| commit | 1adfb9213576bd4a548a66bb46e2a2272e15e48d (patch) | |
| tree | 6bd8fdaee3a24042df3cddbe4ae734a5109f7680 | |
| parent | 9987a0073829d4ba91585913967cdebe5cc706e4 (diff) | |
| download | rails-1adfb9213576bd4a548a66bb46e2a2272e15e48d.tar.gz rails-1adfb9213576bd4a548a66bb46e2a2272e15e48d.tar.bz2 rails-1adfb9213576bd4a548a66bb46e2a2272e15e48d.zip | |
Deleted all references to ActionView::SafeBuffer in favor of ActiveSupport::SafeBuffer
Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
| -rw-r--r-- | actionpack/lib/action_view.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/capture_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/template/handlers/erb.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/safe_buffer_test.rb (renamed from actionpack/test/template/safe_buffer_test.rb) | 6 |
4 files changed, 5 insertions, 7 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb index 325338dc7d..483be47adf 100644 --- a/actionpack/lib/action_view.rb +++ b/actionpack/lib/action_view.rb @@ -58,6 +58,4 @@ end 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" diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb index b62df75dbb..8c48300ed3 100644 --- a/actionpack/lib/action_view/helpers/capture_helper.rb +++ b/actionpack/lib/action_view/helpers/capture_helper.rb @@ -143,7 +143,7 @@ module ActionView # 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 diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb index 93a4315108..51753aaad3 100644 --- a/actionpack/lib/action_view/template/handlers/erb.rb +++ b/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) diff --git a/actionpack/test/template/safe_buffer_test.rb b/activesupport/test/safe_buffer_test.rb index 41a95e068b..bf61f9e58c 100644 --- a/actionpack/test/template/safe_buffer_test.rb +++ b/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 @@ class SafeBufferTest < ActionView::TestCase 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 |