Permalink
Browse files

Revert "Merge pull request #8156 from fredwu/acronym_fix-master"

This reverts commit 867dc17, reversing
changes made to 9a421aa.

This breaks anyone who's using ForceSSL: https://travis-ci.org/rails-api/rails-api/jobs/5556065

Please see comments on #8156 for some discussion.
  • Loading branch information...
1 parent 19797df commit feaa6e2048fe86bcf07e967d6e47b865e42e055b @steveklabnik steveklabnik committed Mar 16, 2013
View
5 activesupport/CHANGELOG.md
@@ -1,10 +1,5 @@
## Rails 4.0.0 (unreleased) ##
-* Fixed a bug in `ActiveSupport::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!(/(?!#{inflections.acronym_regex})\b([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
+ word.gsub!(/([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,13 +167,11 @@ 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 feaa6e2

Please sign in to comment.