activesupport 3.2.8.rc1 → 3.2.8.rc2

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## Rails 3.2.8 ##
 
+*   Fix ActiveSupport integration with Mocha > 0.12.1. *Mike Gunderloy*
+
 *   Reverted the deprecation of ActiveSupport::JSON::Variable. *Rafael Mendonça França*
 
 ## Rails 3.2.7 (Jul 26, 2012) ##

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

@@ -3,11 +3,10 @@ require 'active_support/core_ext/kernel/singleton_class'
 
 class ERB
   module Util
-    HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;' }
+    HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;', "'" => '&#x27;' }
     JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003E', '<' => '\u003C' }
 
-    # Detect whether 1.9 can transcode with XML escaping.
-    if '"&gt;&lt;&amp;&quot;"' == ('><&"'.encode('utf-8', :xml => :attr) rescue false)
+    if RUBY_VERSION >= '1.9'
       # A utility method for escaping HTML tag characters.
       # This method is also aliased as <tt>h</tt>.
       #
@@ -22,7 +21,7 @@ class ERB
         if s.html_safe?
           s
         else
-          s.encode(s.encoding, :xml => :attr)[1...-1].html_safe
+          s.gsub(/[&"'><]/, HTML_ESCAPE).html_safe
         end
       end
     else
@@ -31,7 +30,7 @@ class ERB
         if s.html_safe?
           s
         else
-          s.gsub(/[&"><]/n) { |special| HTML_ESCAPE[special] }.html_safe
+          s.gsub(/[&"'><]/n) { |special| HTML_ESCAPE[special] }.html_safe
         end
       end
     end

data/lib/active_support/testing/setup_and_teardown.rb

@@ -104,8 +104,10 @@ module ActiveSupport
           if respond_to?(:mocha_verify) # using mocha
             if defined?(Mocha::TestCaseAdapter::AssertionCounter)
               Mocha::TestCaseAdapter::AssertionCounter.new(result)
-            else
+            elsif defined?(Mocha::Integration::TestUnit::AssertionCounter)
               Mocha::Integration::TestUnit::AssertionCounter.new(result)
+            else
+              Mocha::MonkeyPatching::TestUnit::AssertionCounter.new(result)
             end
           end
         end

data/lib/active_support/version.rb

@@ -3,7 +3,7 @@ module ActiveSupport
     MAJOR = 3
     MINOR = 2
     TINY  = 8
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 3.2.8.rc1
+  version: 3.2.8.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n