diff options
| author | Sean Walbran <swalbran@socialcast.com> | 2014-02-05 17:19:51 -0600 |
|---|---|---|
| committer | Sean Walbran <swalbran@socialcast.com> | 2014-02-05 17:19:51 -0600 |
| commit | 26698fb91d88dca0f860adcb80528d8d3f0f6285 (patch) | |
| tree | 732a6821d5eb50a7d68c37514c109edce87eef89 | |
| parent | 84fe7b7db64352c0186a9d2a51f4eb32d2825d2a (diff) | |
| download | rails-26698fb91d88dca0f860adcb80528d8d3f0f6285.tar.gz rails-26698fb91d88dca0f860adcb80528d8d3f0f6285.tar.bz2 rails-26698fb91d88dca0f860adcb80528d8d3f0f6285.zip | |
fix interplay of humanize and html_escape
| -rw-r--r-- | activesupport/lib/active_support/inflector/methods.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/core_ext/string_ext_test.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb index cdee4c2ca5..b642d87d76 100644 --- a/activesupport/lib/active_support/inflector/methods.rb +++ b/activesupport/lib/active_support/inflector/methods.rb @@ -117,7 +117,7 @@ module ActiveSupport result.gsub!(/([a-z\d]*)/i) { |match| "#{inflections.acronyms[match] || match.downcase}" } - result.gsub!(/^\w/) { $&.upcase } if options.fetch(:capitalize, true) + result.gsub!(/^\w/) { |match| match.upcase } if options.fetch(:capitalize, true) result end diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb index d4f8ba8cdd..072b970a2d 100644 --- a/activesupport/test/core_ext/string_ext_test.rb +++ b/activesupport/test/core_ext/string_ext_test.rb @@ -161,6 +161,10 @@ class StringInflectionsTest < ActiveSupport::TestCase end end + def test_humanize_with_html_escape + assert_equal 'Hello', ERB::Util.html_escape("hello").humanize + end + def test_ord assert_equal 97, 'a'.ord assert_equal 97, 'abc'.ord |