Merge pull request #9406 from rails/3-2-stable-ruby-2

Rails 3.2.x is now compatible with Ruby 2.0.0

17 files changed, 50 insertions, 39 deletions

diff --git a/.travis.yml b/.travis.yml
index 0951d0cf92..e130252522 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,6 @@ env:
   - "GEM=ar:mysql2"
   - "GEM=ar:sqlite3"
   - "GEM=ar:postgresql"
-matrix:
-  allow_failures:
-    - rvm: 2.0.0
 notifications:
   email: false
   irc:
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index de3354d4f9..9d1ff8cbe4 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -58,7 +58,8 @@ module ActionController
     end
 
     def method_for_action(action_name)
-      super || (respond_to?(:method_missing) && "_handle_method_missing")
+      super || ((self.class.public_method_defined?(:method_missing) ||
+        self.class.protected_method_defined?(:method_missing)) && "_handle_method_missing")
     end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/hide_actions.rb b/actionpack/lib/action_controller/metal/hide_actions.rb
index b55c4643be..109484d88c 100644
--- a/actionpack/lib/action_controller/metal/hide_actions.rb
+++ b/actionpack/lib/action_controller/metal/hide_actions.rb
@@ -27,20 +27,14 @@ module ActionController
         self.hidden_actions = hidden_actions.dup.merge(args.map(&:to_s)).freeze
       end
 
-      def inherited(klass)
-        klass.class_eval { @visible_actions = {} }
-        super
-      end
-
       def visible_action?(action_name)
-        return @visible_actions[action_name] if @visible_actions.key?(action_name)
-        @visible_actions[action_name] = !hidden_actions.include?(action_name)
+        action_methods.include?(action_name)
       end
 
       # Overrides AbstractController::Base#action_methods to remove any methods
       # that are listed as hidden methods.
       def action_methods
-        @action_methods ||= Set.new(super.reject { |name| hidden_actions.include?(name) })
+        @action_methods ||= Set.new(super.reject { |name| hidden_actions.include?(name) }).freeze
       end
     end
   end
diff --git a/actionpack/test/template/html-scanner/sanitizer_test.rb b/actionpack/test/template/html-scanner/sanitizer_test.rb
index 62ad6be680..844484ee47 100644
--- a/actionpack/test/template/html-scanner/sanitizer_test.rb
+++ b/actionpack/test/template/html-scanner/sanitizer_test.rb
@@ -210,7 +210,7 @@ class SanitizerTest < ActionController::TestCase
 
   # TODO: Clean up
   def test_should_sanitize_attributes
-    assert_sanitized %(<SPAN title="'><script>alert()</script>">blah</SPAN>), %(<span title="'&gt;&lt;script&gt;alert()&lt;/script&gt;">blah</span>)
+    assert_sanitized %(<SPAN title="'><script>alert()</script>">blah</SPAN>), %(<span title="#{CGI.escapeHTML "'><script>alert()</script>"}">blah</span>)
   end
 
   def test_should_sanitize_illegal_style_properties
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index 56943381d8..b7f785fe3a 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -1,3 +1,4 @@
+# encoding: US-ASCII
 require "abstract_unit"
 require "logger"
 
diff --git a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
index 7d54c9fae6..e5042c6c18 100644
--- a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
+++ b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
@@ -1,7 +1,6 @@
 require 'active_support/hash_with_indifferent_access'
 
 class Hash
-
   # Returns an <tt>ActiveSupport::HashWithIndifferentAccess</tt> out of its receiver:
   #
   #   {:a => 1}.with_indifferent_access["a"] # => 1
diff --git a/activesupport/lib/active_support/core_ext/hash/slice.rb b/activesupport/lib/active_support/core_ext/hash/slice.rb
index 0484d8e5d8..a983cae39e 100644
--- a/activesupport/lib/active_support/core_ext/hash/slice.rb
+++ b/activesupport/lib/active_support/core_ext/hash/slice.rb
@@ -13,7 +13,7 @@ class Hash
   #   valid_keys = [:mass, :velocity, :time]
   #   search(options.slice(*valid_keys))
   def slice(*keys)
-    keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key)
+    keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
     hash = self.class.new
     keys.each { |k| hash[k] = self[k] if has_key?(k) }
     hash
@@ -23,7 +23,7 @@ class Hash
   # Returns a hash contained the removed key/value pairs
   #   {:a => 1, :b => 2, :c => 3, :d => 4}.slice!(:a, :b) # => {:c => 3, :d => 4}
   def slice!(*keys)
-    keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key)
+    keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
     omit = slice(*self.keys - keys)
     hash = slice(*keys)
     replace(hash)
diff --git a/activesupport/lib/active_support/core_ext/kernel/reporting.rb b/activesupport/lib/active_support/core_ext/kernel/reporting.rb
index 526b8378a5..84986dff3c 100644
--- a/activesupport/lib/active_support/core_ext/kernel/reporting.rb
+++ b/activesupport/lib/active_support/core_ext/kernel/reporting.rb
@@ -1,4 +1,6 @@
 require 'rbconfig'
+require 'stringio'
+
 module Kernel
   # Sets $VERBOSE to nil for the duration of the block and back to its original value afterwards.
   #
diff --git a/activesupport/lib/active_support/hash_with_indifferent_access.rb b/activesupport/lib/active_support/hash_with_indifferent_access.rb
index 9e7cb76307..9dc93de5a9 100644
--- a/activesupport/lib/active_support/hash_with_indifferent_access.rb
+++ b/activesupport/lib/active_support/hash_with_indifferent_access.rb
@@ -6,7 +6,7 @@ require 'active_support/core_ext/hash/keys'
 
 module ActiveSupport
   class HashWithIndifferentAccess < Hash
-    
+
     # Always returns true, so that <tt>Array#extract_options!</tt> finds members of this class.
     def extractable_options?
       true
diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
index 6b29ba4c10..77c04758ba 100644
--- a/activesupport/lib/active_support/testing/isolation.rb
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -12,8 +12,8 @@ module ActiveSupport
     end
 
     class ProxyTestResult
-      def initialize
-        @calls = []
+      def initialize(calls = [])
+        @calls = calls
       end
 
       def add_error(e)
@@ -27,6 +27,14 @@ module ActiveSupport
         end
       end
 
+      def marshal_dump
+        @calls
+      end
+
+      def marshal_load(calls)
+        initialize(calls)
+      end
+
       def method_missing(name, *args)
         @calls << [name, args]
       end
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index c4c753caed..6db1746672 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -690,7 +690,6 @@ uses_memcached 'memcached backed store' do
       @data = @cache.instance_variable_get(:@data)
       @cache.clear
       @cache.silence!
-      @cache.logger = Logger.new("/dev/null")
     end
 
     include CacheStoreBehavior
diff --git a/activesupport/test/ordered_hash_test.rb b/activesupport/test/ordered_hash_test.rb
index 0b5f912dc4..a7fd9402c8 100644
--- a/activesupport/test/ordered_hash_test.rb
+++ b/activesupport/test/ordered_hash_test.rb
@@ -221,7 +221,6 @@ class OrderedHashTest < Test::Unit::TestCase
     alternate = ActiveSupport::OrderedHash[ [
       [1, 2],
       [3, 4],
-      "bad key value pair",
       [ 'missing value' ]
     ]]
 
diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb
index c4653b1ae6..ab74d579fc 100644
--- a/activesupport/test/test_case_test.rb
+++ b/activesupport/test/test_case_test.rb
@@ -16,6 +16,9 @@ module ActiveSupport
       def options
         nil
       end
+
+      def record(*args)
+      end
     end
 
     if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index 6c53d8bebb..1b7f5dee2a 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -214,6 +214,18 @@ task :default => :test
 
       public_task :apply_rails_template, :run_bundle
 
+      def name
+        @name ||= begin
+          # same as ActiveSupport::Inflector#underscore except not replacing '-'
+          underscored = original_name.dup
+          underscored.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+          underscored.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+          underscored.downcase!
+
+          underscored
+        end
+      end
+
     protected
 
       def app_templates_dir
@@ -254,18 +266,6 @@ task :default => :test
         @original_name ||= File.basename(destination_root)
       end
 
-      def name
-        @name ||= begin
-          # same as ActiveSupport::Inflector#underscore except not replacing '-'
-          underscored = original_name.dup
-          underscored.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-          underscored.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-          underscored.downcase!
-
-          underscored
-        end
-      end
-
       def camelized
         @camelized ||= name.gsub(/\W/, '_').squeeze('_').camelize
       end
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 9e9702efb6..adec9533a9 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -2,6 +2,7 @@
 require 'isolation/abstract_unit'
 require 'active_support/core_ext/kernel/reporting'
 require 'rack/test'
+require 'yaml'
 
 module ApplicationTests
   class AssetsTest < Test::Unit::TestCase
diff --git a/railties/test/application/initializers/active_record_test.rb b/railties/test/application/initializers/active_record_test.rb
index edf78a8a0a..b62943a278 100644
--- a/railties/test/application/initializers/active_record_test.rb
+++ b/railties/test/application/initializers/active_record_test.rb
@@ -23,10 +23,17 @@ module ApplicationTests
       boot_rails
       simple_controller
 
-      get '/foo'
-      assert last_response.body.include?("We're sorry, but something went wrong (500)")
+      # ActiveSupport::LogSubscriber.flush_all! in lib/rails/rack/logger.rb blew up in Ruby 2.0
+      # because it tries to open the database. This behavior doesn't happen in Ruby 1.9.3.
+      # However, regardless, the server blew up.
+      if RUBY_VERSION >= '2.0.0'
+        assert_raises (Errno::ENOENT) { get '/foo' }
+      else
+        get '/foo'
+        assert last_response.body.include?("We're sorry, but something went wrong (500)")
+      end
     end
-    
+
     test "uses DATABASE_URL env var when config/database.yml doesn't exist" do
       database_path = "/db/foo.sqlite3"
       FileUtils.rm_rf("#{app_path}/config/database.yml")
@@ -35,7 +42,7 @@ module ApplicationTests
 
       get '/foo'
       assert_equal 'foo', last_response.body
-      
+
       # clean up
       FileUtils.rm("#{app_path}/#{database_path}")
     end
diff --git a/railties/test/application/route_inspect_test.rb b/railties/test/application/route_inspect_test.rb
index 5c920cb33a..dea0ee71c9 100644
--- a/railties/test/application/route_inspect_test.rb
+++ b/railties/test/application/route_inspect_test.rb
@@ -18,7 +18,7 @@ module ApplicationTests
 
     def test_displaying_routes_for_engines
       engine = Class.new(Rails::Engine) do
-        def self.to_s
+        def self.inspect
           "Blog::Engine"
         end
       end
@@ -136,7 +136,7 @@ module ApplicationTests
 
     def test_rake_routes_shows_route_with_rack_app_nested_with_dynamic_constraints
       constraint = Class.new do
-        def to_s
+        def inspect
           "( my custom constraint )"
         end
       end