aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-04-04 10:43:24 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2012-04-04 10:43:24 -0700
commita9398a7da4fa845a0182bd53273c607dae55b1ee (patch)
treed3b3f2f95a45ce19f10b774d6d07b41b318afa99 /actionpack/lib/action_dispatch
parentc6bd8a9d3ac2ebd5d0af4573d6d799085ac2219b (diff)
parent2d8396fc9fbea9189e9e945e41e643925da5b2cb (diff)
downloadrails-a9398a7da4fa845a0182bd53273c607dae55b1ee.tar.gz
rails-a9398a7da4fa845a0182bd53273c607dae55b1ee.tar.bz2
rails-a9398a7da4fa845a0182bd53273c607dae55b1ee.zip
Merge pull request #5716 from jurriaan/tr-gsub-cleanup
Updated/changed unneeded tr/gsubs
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb4
-rw-r--r--actionpack/lib/action_dispatch/testing/assertions/response.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index fccbff1749..ba4cfb482d 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -244,7 +244,7 @@ module ActionDispatch
end
def self.normalize_name(name)
- normalize_path(name)[1..-1].gsub("/", "_")
+ normalize_path(name)[1..-1].tr("/", "_")
end
module Base
@@ -441,7 +441,7 @@ module ActionDispatch
app.railtie_name
else
class_name = app.class.is_a?(Class) ? app.name : app.class.name
- ActiveSupport::Inflector.underscore(class_name).gsub("/", "_")
+ ActiveSupport::Inflector.underscore(class_name).tr("/", "_")
end
end
diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index 33f8f526b5..40d38c59d6 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -81,7 +81,7 @@ module ActionDispatch
refer
else
@controller.url_for(fragment)
- end.gsub(/[\0\r\n]/, '')
+ end.delete("\0\r\n")
end
end
end