aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2012-06-05 04:59:34 +0900
committerAkira Matsuda <ronnie@dio.jp>2012-06-06 19:33:38 +0900
commitedee2c7b3bec824aa653b09d63aff06ab5542e06 (patch)
treee4cb8cbca333c14ce9ad2886e5c52a3791edb300 /activesupport
parent9fb70033d36f467d4eb858e9fac1282a0394876a (diff)
downloadrails-edee2c7b3bec824aa653b09d63aff06ab5542e06.tar.gz
rails-edee2c7b3bec824aa653b09d63aff06ab5542e06.tar.bz2
rails-edee2c7b3bec824aa653b09d63aff06ab5542e06.zip
stop `to_s`ing method names
Module#methods are Symbols in Ruby >= 1.9
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/date_time/conversions.rb2
-rw-r--r--activesupport/lib/active_support/log_subscriber.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time/conversions.rb b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
index 19925198c0..13d659f52a 100644
--- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
@@ -39,7 +39,7 @@ class DateTime
to_default_s
end
end
- alias_method :to_default_s, :to_s unless (instance_methods(false) & [:to_s, 'to_s']).empty?
+ alias_method :to_default_s, :to_s if instance_methods(false).include?(:to_s)
alias_method :to_s, :to_formatted_s
#
diff --git a/activesupport/lib/active_support/log_subscriber.rb b/activesupport/lib/active_support/log_subscriber.rb
index d2a6e1bd82..125e7b0e75 100644
--- a/activesupport/lib/active_support/log_subscriber.rb
+++ b/activesupport/lib/active_support/log_subscriber.rb
@@ -61,7 +61,7 @@ module ActiveSupport
@@flushable_loggers = nil
log_subscriber.public_methods(false).each do |event|
- next if 'call' == event.to_s
+ next if :call == event
notifier.subscribe("#{event}.#{namespace}", log_subscriber)
end