Permalink
Browse files

Merge pull request #8156 from fredwu/acronym_fix-master

Fix for inflector's incorrect camelCase replacement for acronyms
  • Loading branch information...
2 parents 9a421aa + 26aa265 commit 867dc1700f32aae6f98c4651bd501597e6b52bc0 @fxn fxn committed Mar 16, 2013
View
4 activesupport/CHANGELOG.md
@@ -1,5 +1,9 @@
## Rails 4.0.0 (unreleased) ##
+* Fixed a bug in Inflector#underscore where acroynms are incorrectly parsed as camelCases.
+
+ *Fred Wu*
+
* Fix deletion of empty directories in ActiveSupport::Cache::FileStore.
*Charles Jones*
View
2 activesupport/lib/active_support/inflector/methods.rb
@@ -91,7 +91,7 @@ def underscore(camel_cased_word)
word = camel_cased_word.to_s.dup
word.gsub!('::', '/')
word.gsub!(/(?:([A-Za-z\d])|^)(#{inflections.acronym_regex})(?=\b|[^a-z])/) { "#{$1}#{$1 && '_'}#{$2.downcase}" }
- word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
+ word.gsub!(/(?!#{inflections.acronym_regex})\b([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
word.tr!("-", "_")
word.downcase!
View
2 activesupport/test/inflector_test.rb
@@ -167,11 +167,13 @@ def test_acronyms_camelize_lower
def test_underscore_acronym_sequence
ActiveSupport::Inflector.inflections do |inflect|
inflect.acronym("API")
+ inflect.acronym("APIs")
inflect.acronym("JSON")
inflect.acronym("HTML")
end
assert_equal("json_html_api", ActiveSupport::Inflector.underscore("JSONHTMLAPI"))
+ assert_equal("namespaced/apis", ActiveSupport::Inflector.underscore("Namespaced::APIs"))
end
def test_underscore

0 comments on commit 867dc17

Please sign in to comment.