aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Rangel <adrian.rangel@gmail.com>2014-10-01 02:19:52 -0500
committerAdrian Rangel <adrian.rangel@gmail.com>2014-10-01 02:19:52 -0500
commit56d26d1d9fd82a39c38228759889df5173992db3 (patch)
tree7f0403c8ba48279670ee5eccec45f9e8726d916c
parent1f14b9f535682217d855ef382c3b85314066c5ab (diff)
downloadrails-56d26d1d9fd82a39c38228759889df5173992db3.tar.gz
rails-56d26d1d9fd82a39c38228759889df5173992db3.tar.bz2
rails-56d26d1d9fd82a39c38228759889df5173992db3.zip
use tr instead of gsub when possible
-rw-r--r--actionview/lib/action_view/template.rb2
-rw-r--r--activerecord/lib/active_record/connection_adapters/connection_specification.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/template.rb b/actionview/lib/action_view/template.rb
index eb0f2e8a57..f398f9bfa3 100644
--- a/actionview/lib/action_view/template.rb
+++ b/actionview/lib/action_view/template.rb
@@ -317,7 +317,7 @@ module ActionView
end
def method_name #:nodoc:
- @method_name ||= "_#{identifier_method_name}__#{@identifier.hash}_#{__id__}".gsub('-', "_")
+ @method_name ||= "_#{identifier_method_name}__#{@identifier.hash}_#{__id__}".tr('-', "_")
end
def identifier_method_name #:nodoc:
diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
index d28a54b8f9..e02824b33d 100644
--- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
@@ -33,7 +33,7 @@ module ActiveRecord
def initialize(url)
raise "Database URL cannot be empty" if url.blank?
@uri = uri_parser.parse(url)
- @adapter = @uri.scheme.gsub('-', '_')
+ @adapter = @uri.scheme.tr('-', '_')
@adapter = "postgresql" if @adapter == "postgres"
if @uri.opaque