From 64d587f654f4226c8aa2e8305f5b8cfd774da3f4 Mon Sep 17 00:00:00 2001 From: Kristopher Murata Date: Sun, 4 Apr 2010 02:03:41 -0400 Subject: [PATCH] Parameterize should accept malformed utf8 characters [#4323 state:resolved] --- .../lib/active_support/inflector/transliterate.rb | 4 +++- activesupport/test/inflector_test_cases.rb | 12 ++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/activesupport/lib/active_support/inflector/transliterate.rb b/activesupport/lib/active_support/inflector/transliterate.rb index 2ce27cf..2041267 100644 --- a/activesupport/lib/active_support/inflector/transliterate.rb +++ b/activesupport/lib/active_support/inflector/transliterate.rb @@ -44,6 +44,8 @@ module ActiveSupport # <%= link_to(@person.name, person_path(@person)) %> # # => Donald E. Knuth def parameterize(string, sep = '-') + # remove malformed utf8 characters + string = string.toutf8 unless string.is_utf8? # replace accented chars with their ascii equivalents parameterized_string = transliterate(string) # Turn unwanted chars into the separator @@ -58,4 +60,4 @@ module ActiveSupport parameterized_string.downcase end end -end \ No newline at end of file +end diff --git a/activesupport/test/inflector_test_cases.rb b/activesupport/test/inflector_test_cases.rb index 5637290..8dad9d8 100644 --- a/activesupport/test/inflector_test_cases.rb +++ b/activesupport/test/inflector_test_cases.rb @@ -159,7 +159,8 @@ module InflectorTestCases "Trailing bad characters!@#" => "trailing-bad-characters", "!@#Leading bad characters" => "leading-bad-characters", "Squeeze separators" => "squeeze-separators", - "Test with + sign" => "test-with-sign" + "Test with + sign" => "test-with-sign", + "Test with malformed utf8 \251" => "test-with-malformed-utf8" } StringToParameterizeWithNoSeparator = { @@ -168,7 +169,8 @@ module InflectorTestCases "Trailing bad characters!@#" => "trailingbadcharacters", "!@#Leading bad characters" => "leadingbadcharacters", "Squeeze separators" => "squeezeseparators", - "Test with + sign" => "testwithsign" + "Test with + sign" => "testwithsign", + "Test with malformed utf8 \251" => "testwithmalformedutf8" } StringToParameterizeWithUnderscore = { @@ -177,12 +179,14 @@ module InflectorTestCases "Trailing bad characters!@#" => "trailing_bad_characters", "!@#Leading bad characters" => "leading_bad_characters", "Squeeze separators" => "squeeze_separators", - "Test with + sign" => "test_with_sign" + "Test with + sign" => "test_with_sign", + "Test with malformed utf8 \251" => "test_with_malformed_utf8" } StringToParameterizedAndNormalized = { "Malmö" => "malmo", - "Garçons" => "garcons" + "Garçons" => "garcons", + "Ops\331" => "ops" } UnderscoreToHuman = { -- 1.6.5.7