Merge commit 'mainstream/master'

10 files changed, 245 insertions, 80 deletions

diff --git a/activesupport/lib/active_support/core_ext/hash/deep_merge.rb b/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
index b009be3d84..ffde34a741 100644
--- a/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
+++ b/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
@@ -4,7 +4,7 @@ class Hash
     merge(other_hash) do |key, oldval, newval|
       oldval = oldval.to_hash if oldval.respond_to?(:to_hash)
       newval = newval.to_hash if newval.respond_to?(:to_hash)
-      oldval.class.to_s == 'Hash' && newval.class.to_s == 'Hash' ? oldval.deep_merge(newval) : newval
+      oldval.is_a?( Hash ) && newval.is_a?( Hash ) ? oldval.deep_merge(newval) : newval
     end
   end
 
diff --git a/activesupport/lib/active_support/core_ext/hash/diff.rb b/activesupport/lib/active_support/core_ext/hash/diff.rb
index da98593458..b904f49fa8 100644
--- a/activesupport/lib/active_support/core_ext/hash/diff.rb
+++ b/activesupport/lib/active_support/core_ext/hash/diff.rb
@@ -8,6 +8,6 @@ class Hash
   #   {}.diff(1 => 2)               # => {1 => 2}
   #   {1 => 2, 3 => 4}.diff(1 => 2) # => {3 => 4}
   def diff(h2)
-    dup.delete_if { |k, v| h2[k] == v }.merge(h2.dup.delete_if { |k, v| has_key?(k) })
+    dup.delete_if { |k, v| h2[k] == v }.merge!(h2.dup.delete_if { |k, v| has_key?(k) })
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb b/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
index ebfdcb2cf0..d7ebd5feef 100644
--- a/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
+++ b/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
@@ -21,7 +21,7 @@ class Hash
   # Performs the opposite of <tt>merge</tt>, with the keys and values from the first hash taking precedence over the second.
   # Modifies the receiver in place.
   def reverse_merge!(other_hash)
-    replace(reverse_merge(other_hash))
+    merge!( other_hash ){|k,o,n| o }
   end
 
   alias_method :reverse_update, :reverse_merge!
diff --git a/activesupport/lib/active_support/core_ext/string.rb b/activesupport/lib/active_support/core_ext/string.rb
index 98ad75429e..d06a5a32fb 100644
--- a/activesupport/lib/active_support/core_ext/string.rb
+++ b/activesupport/lib/active_support/core_ext/string.rb
@@ -7,3 +7,4 @@ require 'active_support/core_ext/string/access'
 require 'active_support/core_ext/string/iterators'
 require 'active_support/core_ext/string/xchar'
 require 'active_support/core_ext/string/behavior'
+require 'active_support/core_ext/string/interpolation'
\ No newline at end of file
diff --git a/activesupport/lib/active_support/core_ext/string/interpolation.rb b/activesupport/lib/active_support/core_ext/string/interpolation.rb
new file mode 100644
index 0000000000..d459c03d39
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/string/interpolation.rb
@@ -0,0 +1,93 @@
+=begin
+  heavily based on Masao Mutoh's gettext String interpolation extension
+  http://github.com/mutoh/gettext/blob/f6566738b981fe0952548c421042ad1e0cdfb31e/lib/gettext/core_ext/string.rb
+  Copyright (C) 2005-2009 Masao Mutoh
+  You may redistribute it and/or modify it under the same license terms as Ruby.
+=end
+
+if RUBY_VERSION < '1.9'
+
+  # KeyError is raised by String#% when the string contains a named placeholder
+  # that is not contained in the given arguments hash. Ruby 1.9 includes and
+  # raises this exception natively. We define it to mimic Ruby 1.9's behaviour
+  # in Ruby 1.8.x
+
+  class KeyError < IndexError
+    def initialize(message = nil)
+      super(message || "key not found")
+    end
+  end unless defined?(KeyError)
+
+  # Extension for String class. This feature is included in Ruby 1.9 or later but not occur TypeError.
+  #
+  # String#% method which accept "named argument". The translator can know
+  # the meaning of the msgids using "named argument" instead of %s/%d style.
+
+  class String
+    # For older ruby versions, such as ruby-1.8.5
+    alias :bytesize :size unless instance_methods.find {|m| m.to_s == 'bytesize'}
+    alias :interpolate_without_ruby_19_syntax :% # :nodoc:
+
+    INTERPOLATION_PATTERN = Regexp.union(
+      /%%/,
+      /%\{(\w+)\}/,                               # matches placeholders like "%{foo}"
+      /%<(\w+)>(.*?\d*\.?\d*[bBdiouxXeEfgGcps])/  # matches placeholders like "%<foo>.d"
+    )
+
+    # % uses self (i.e. the String) as a format specification and returns the
+    # result of applying it to the given arguments. In other words it interpolates
+    # the given arguments to the string according to the formats the string
+    # defines.
+    #
+    # There are three ways to use it:
+    #
+    # * Using a single argument or Array of arguments.
+    #
+    #   This is the default behaviour of the String class. See Kernel#sprintf for
+    #   more details about the format string.
+    #
+    #   Example:
+    #
+    #     "%d %s" % [1, "message"]
+    #     # => "1 message"
+    #
+    # * Using a Hash as an argument and unformatted, named placeholders.
+    #
+    #   When you pass a Hash as an argument and specify placeholders with %{foo}
+    #   it will interpret the hash values as named arguments.
+    #
+    #   Example:
+    #
+    #     "%{firstname}, %{lastname}" % {:firstname => "Masao", :lastname => "Mutoh"}
+    #     # => "Masao Mutoh"
+    #
+    # * Using a Hash as an argument and formatted, named placeholders.
+    #
+    #   When you pass a Hash as an argument and specify placeholders with %<foo>d
+    #   it will interpret the hash values as named arguments and format the value
+    #   according to the formatting instruction appended to the closing >.
+    #
+    #   Example:
+    #
+    #     "%<integer>d, %<float>.1f" % { :integer => 10, :float => 43.4 }
+    #     # => "10, 43.3"
+    def %(args)
+      if args.kind_of?(Hash)
+        dup.gsub(INTERPOLATION_PATTERN) do |match|
+          if match == '%%'
+            '%'
+          else
+            key = ($1 || $2).to_sym
+            raise KeyError unless args.has_key?(key)
+            $3 ? sprintf("%#{$3}", args[key]) : args[key]
+          end
+        end
+      elsif self =~ INTERPOLATION_PATTERN
+        raise ArgumentError.new('one hash required')
+      else
+        result = gsub(/%([{<])/, '%%\1')
+        result.send :'interpolate_without_ruby_19_syntax', args
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/hash_with_indifferent_access.rb b/activesupport/lib/active_support/hash_with_indifferent_access.rb
index 61fc6475a0..543dab4a75 100644
--- a/activesupport/lib/active_support/hash_with_indifferent_access.rb
+++ b/activesupport/lib/active_support/hash_with_indifferent_access.rb
@@ -98,6 +98,10 @@ module ActiveSupport
       super other_hash.with_indifferent_access
     end
 
+    def reverse_merge!(other_hash)
+      replace(reverse_merge( other_hash ))
+    end
+
     # Removes a specified key from the hash.
     def delete(key)
       super(convert_key(key))
@@ -109,7 +113,7 @@ module ActiveSupport
 
     # Convert to a Hash with String keys.
     def to_hash
-      Hash.new(default).merge(self)
+      Hash.new(default).merge!(self)
     end
 
     protected
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index d5282bad6a..c915bf799d 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -19,7 +19,8 @@ module ActiveSupport
   class TestCase < ::Test::Unit::TestCase
     if defined? MiniTest
       Assertion = MiniTest::Assertion
-      alias_method :method_name, :name
+      alias_method :method_name, :name if method_defined? :name
+      alias_method :method_name, :__name__ if method_defined? :__name__
     else
       # TODO: Figure out how to get the Rails::BacktraceFilter into minitest/unit
       if defined?(Rails) && ENV['BACKTRACE'].nil?
diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
index dd13abcd5d..30e194536b 100644
--- a/activesupport/lib/active_support/testing/isolation.rb
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -1,94 +1,96 @@
-module ActiveSupport::Testing
-  class ProxyTestResult
-    def initialize
-      @calls = []
-    end
-
-    def __replay__(result)
-      @calls.each do |name, args|
-        result.send(name, *args)
+module ActiveSupport
+  module Testing
+    class ProxyTestResult
+      def initialize
+        @calls = []
       end
-    end
-
-    def method_missing(name, *args)
-      @calls << [name, args]
-    end
-  end
 
-  module Isolation
-    def self.forking_env?
-      !ENV["NO_FORK"] && RUBY_PLATFORM !~ /mswin|mingw|java/
-    end
-
-    def run(result)
-      unless defined?(@@ran_class_setup)
-        self.class.setup
-        @@ran_class_setup = true
+      def __replay__(result)
+        @calls.each do |name, args|
+          result.send(name, *args)
+        end
       end
 
-      yield(Test::Unit::TestCase::STARTED, name)
-
-      @_result = result
+      def method_missing(name, *args)
+        @calls << [name, args]
+      end
+    end
 
-      proxy = run_in_isolation do |proxy|
-        super(proxy) { }
+    module Isolation
+      def self.forking_env?
+        !ENV["NO_FORK"] && RUBY_PLATFORM !~ /mswin|mingw|java/
       end
 
-      proxy.__replay__(@_result)
+      def run(result)
+        unless defined?(@@ran_class_setup)
+          self.class.setup if self.class.respond_to?(:setup)
+          @@ran_class_setup = true
+        end
 
-      yield(Test::Unit::TestCase::FINISHED, name)
-    end
+        yield(Test::Unit::TestCase::STARTED, name)
 
-    module Forking
-      def run_in_isolation(&blk)
-        read, write = IO.pipe
+        @_result = result
 
-        pid = fork do
-          read.close
-          proxy = ProxyTestResult.new
-          yield proxy
-          write.puts [Marshal.dump(proxy)].pack("m")
-          exit!
+        proxy = run_in_isolation do |proxy|
+          super(proxy) { }
         end
 
-        write.close
-        result = read.read
-        Process.wait2(pid)
-        Marshal.load(result.unpack("m")[0])
+        proxy.__replay__(@_result)
+
+        yield(Test::Unit::TestCase::FINISHED, name)
       end
-    end
 
-    module Subprocess
-      # Crazy H4X to get this working in windows / jruby with
-      # no forking.
-      def run_in_isolation(&blk)
-        require "tempfile"
-
-        if ENV["ISOLATION_TEST"]
-          proxy = ProxyTestResult.new
-          yield proxy
-          File.open(ENV["ISOLATION_OUTPUT"], "w") do |file|
-            file.puts [Marshal.dump(proxy)].pack("m")
-          end
-          exit!
-        else
-          Tempfile.open("isolation") do |tmpfile|
-            ENV["ISOLATION_TEST"]   = @method_name
-            ENV["ISOLATION_OUTPUT"] = tmpfile.path
+      module Forking
+        def run_in_isolation(&blk)
+          read, write = IO.pipe
 
-            load_paths = $-I.map {|p| "-I\"#{File.expand_path(p)}\"" }.join(" ")
-            `#{Gem.ruby} #{load_paths} #{$0} #{ORIG_ARGV.join(" ")} -t\"#{self.class}\"`
+          pid = fork do
+            read.close
+            proxy = ProxyTestResult.new
+            yield proxy
+            write.puts [Marshal.dump(proxy)].pack("m")
+            exit!
+          end
 
-            ENV.delete("ISOLATION_TEST")
-            ENV.delete("ISOLATION_OUTPUT")
+          write.close
+          result = read.read
+          Process.wait2(pid)
+          Marshal.load(result.unpack("m")[0])
+        end
+      end
 
-            return Marshal.load(tmpfile.read.unpack("m")[0])
+      module Subprocess
+        # Crazy H4X to get this working in windows / jruby with
+        # no forking.
+        def run_in_isolation(&blk)
+          require "tempfile"
+
+          if ENV["ISOLATION_TEST"]
+            proxy = ProxyTestResult.new
+            yield proxy
+            File.open(ENV["ISOLATION_OUTPUT"], "w") do |file|
+              file.puts [Marshal.dump(proxy)].pack("m")
+            end
+            exit!
+          else
+            Tempfile.open("isolation") do |tmpfile|
+              ENV["ISOLATION_TEST"]   = @method_name
+              ENV["ISOLATION_OUTPUT"] = tmpfile.path
+
+              load_paths = $-I.map {|p| "-I\"#{File.expand_path(p)}\"" }.join(" ")
+              `#{Gem.ruby} #{load_paths} #{$0} #{ORIG_ARGV.join(" ")} -t\"#{self.class}\"`
+
+              ENV.delete("ISOLATION_TEST")
+              ENV.delete("ISOLATION_OUTPUT")
+
+              return Marshal.load(tmpfile.read.unpack("m")[0])
+            end
           end
         end
       end
-    end
 
-    include forking_env? ? Forking : Subprocess
+      include forking_env? ? Forking : Subprocess
+    end
   end
 end
 
diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb
index b6223fe20a..ca64c5ebe3 100644
--- a/activesupport/lib/active_support/vendor.rb
+++ b/activesupport/lib/active_support/vendor.rb
@@ -19,10 +19,9 @@ rescue Gem::LoadError
   $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.13"
 end
 
-# TODO I18n gem has not been released yet
-# begin
-#   gem 'i18n', '~> 0.1.3'
-# rescue Gem::LoadError
+begin
+  gem 'i18n', '~> 0.1.3'
+rescue Gem::LoadError
   $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.1.3/lib"
   require 'i18n'
-# end
+end
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index 6991b174b7..a23d3f6fef 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -280,3 +280,68 @@ class CoreExtStringMultibyteTest < ActiveSupport::TestCase
     end
   end
 end
+
+=begin
+  string.rb - Interpolation for String.
+
+  Copyright (C) 2005-2009 Masao Mutoh
+ 
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+=end
+class TestGetTextString < Test::Unit::TestCase
+  def test_sprintf
+    assert_equal("foo is a number", "%{msg} is a number" % {:msg => "foo"})
+    assert_equal("bar is a number", "%s is a number" % ["bar"])
+    assert_equal("bar is a number", "%s is a number" % "bar")
+    assert_equal("1, test", "%{num}, %{record}" % {:num => 1, :record => "test"})
+    assert_equal("test, 1", "%{record}, %{num}" % {:num => 1, :record => "test"})
+    assert_equal("1, test", "%d, %s" % [1, "test"])
+    assert_equal("test, 1", "%2$s, %1$d" % [1, "test"])
+    assert_raise(ArgumentError) { "%-%" % [1] }
+  end
+
+  def test_percent
+    assert_equal("% 1", "%% %<num>d" % {:num => 1.0})
+    assert_equal("%{num} %<num>d", "%%{num} %%<num>d" % {:num => 1})
+  end
+
+  def test_sprintf_percent_in_replacement
+    assert_equal("%<not_translated>s", "%{msg}" % { :msg => '%<not_translated>s', :not_translated => 'should not happen' })
+  end
+
+  def test_sprintf_lack_argument
+    assert_raises(KeyError) { "%{num}, %{record}" % {:record => "test"} }
+    assert_raises(KeyError) { "%{record}" % {:num => 1} }
+  end
+
+  def test_no_placeholder
+    assert_equal("aaa", "aaa" % {:num => 1})
+    assert_equal("bbb", "bbb" % [1])
+  end
+
+  def test_sprintf_ruby19_style
+    assert_equal("1", "%<num>d" % {:num => 1})
+    assert_equal("0b1", "%<num>#b" % {:num => 1})
+    assert_equal("foo", "%<msg>s" % {:msg => "foo"})
+    assert_equal("1.000000", "%<num>f" % {:num => 1.0})
+    assert_equal("  1", "%<num>3.0f" % {:num => 1.0})
+    assert_equal("100.00", "%<num>2.2f" % {:num => 100.0})
+    assert_equal("0x64", "%<num>#x" % {:num => 100.0})
+    assert_raise(ArgumentError) { "%<num>,d" % {:num => 100} }
+    assert_raise(ArgumentError) { "%<num>/d" % {:num => 100} }
+  end
+
+  def test_sprintf_old_style
+    assert_equal("foo 1.000000", "%s %f" % ["foo", 1.0])
+  end
+
+  def test_sprintf_mix_unformatted_and_formatted_named_placeholders
+    assert_equal("foo 1.000000", "%{name} %<num>f" % {:name => "foo", :num => 1.0})
+  end
+
+  def test_string_interpolation_raises_an_argument_error_when_mixing_named_and_unnamed_placeholders
+    assert_raises(ArgumentError) { "%{name} %f" % [1.0] }
+    assert_raises(ArgumentError) { "%{name} %f" % [1.0, 2.0] }
+  end
+end