activesupport 2.3.6 → 2.3.7

data/CHANGELOG

@@ -1,3 +1,8 @@
+*2.3.7 (May 24, 2010)*
+
+* HTML safety: fix compatibility with the optional rails_xss plugin.  [Nathan Weizenbaum, Santiago Pastorino]
+
+
 *2.3.6 (May 23, 2010)*
 
 * 1.9 compat: deprecated last_(month|year) in favor of prev_(month|year). [fxn]

data/lib/active_support/core_ext/string/output_safety.rb

@@ -1,22 +1,6 @@
 require 'erb'
 
 class ERB
-  undef :set_eoutvar
-  def set_eoutvar(compiler, eoutvar = '_erbout')
-    compiler.put_cmd = "#{eoutvar}.safe_concat"
-    compiler.insert_cmd = "#{eoutvar}.safe_concat"
-
-    cmd = []
-    cmd.push "#{eoutvar} = ActiveSupport::SafeBuffer.new"
-
-    compiler.pre_cmd = cmd
-
-    cmd = []
-    cmd.push(eoutvar)
-
-    compiler.post_cmd = cmd
-  end
-
   module Util
     HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;' }
     JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003E', '<' => '\u003C' }
@@ -112,7 +96,7 @@ module ActiveSupport #:nodoc:
 end
 
 class String
-  alias_method :add_without_safety, :+
+  alias safe_concat concat
 
   def as_str
     self
@@ -123,38 +107,6 @@ class String
   end
 
   def html_safe?
-    defined?(@_rails_html_safe)
-  end
-
-  def html_safe!
-    ActiveSupport::Deprecation.warn("Use html_safe with your strings instead of html_safe! See http://yehudakatz.com/2010/02/01/safebuffers-and-rails-3-0/ for the full story.", caller)
-    @_rails_html_safe = true
-    self
-  end
-
-  def add_with_safety(other)
-    result = add_without_safety(other)
-    if html_safe? && also_html_safe?(other)
-      result.html_safe!
-    else
-      result
-    end
-  end
-  alias_method :+, :add_with_safety
-
-  def concat_with_safety(other_or_fixnum)
-    result = concat_without_safety(other_or_fixnum)
-    unless html_safe? && also_html_safe?(other_or_fixnum)
-      remove_instance_variable(:@_rails_html_safe) if defined?(@_rails_html_safe)
-    end
-    result
+    false
   end
-  alias_method_chain :concat, :safety
-  undef_method :<<
-  alias_method :<<, :concat_with_safety
-
-  private
-   def also_html_safe?(other)
-     other.respond_to?(:html_safe?) && other.html_safe?
-   end
 end

data/lib/active_support/version.rb

@@ -2,7 +2,7 @@ module ActiveSupport
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 6
+    TINY  = 7
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 3
-  - 6
-  version: 2.3.6
+  - 7
+  version: 2.3.7
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-23 00:00:00 -07:00
+date: 2010-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: []