aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/xml_mini.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/active_support/xml_mini.rb')
-rw-r--r--activesupport/lib/active_support/xml_mini.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/xml_mini.rb b/activesupport/lib/active_support/xml_mini.rb
index d8f40ab8b1..5cadcf634b 100644
--- a/activesupport/lib/active_support/xml_mini.rb
+++ b/activesupport/lib/active_support/xml_mini.rb
@@ -139,10 +139,9 @@ module ActiveSupport
protected
def _dasherize(key)
- left = key.strip.rpartition(/^_*/)
- right = left.pop.partition(/_*$/)
- right.first.tr!('_ ', '--')
- left.concat(right).join
+ # $2 must be a non-greedy regex for this to work
+ left, middle, right = /\A(_*)(.*?)(_*)\Z/.match(key.strip)[1,3]
+ "#{left}#{middle.tr('_', '-')}#{right}"
end
# TODO: Add support for other encodings