diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-07-02 19:23:00 -0700 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-07-02 19:23:00 -0700 |
commit | b296edd2d89623f97218fd1693b7a188b01e2171 (patch) | |
tree | 41c70eb7dc7a10e6a87d3479bacd107174300da5 /activesupport | |
parent | 161c3afc9c4d5bc861093c768452cb1cacd9ca0c (diff) | |
parent | 748d3f38df5d32c5e1eb1d82c07b8abffbb44973 (diff) | |
download | rails-b296edd2d89623f97218fd1693b7a188b01e2171.tar.gz rails-b296edd2d89623f97218fd1693b7a188b01e2171.tar.bz2 rails-b296edd2d89623f97218fd1693b7a188b01e2171.zip |
Merge pull request #10909 from dockyard/master
Use symbols instead of strings in ActiveSupport::Concern
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/lib/active_support/concern.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/activesupport/lib/active_support/concern.rb b/activesupport/lib/active_support/concern.rb index b6ae86b583..b796d01dfd 100644 --- a/activesupport/lib/active_support/concern.rb +++ b/activesupport/lib/active_support/concern.rb @@ -105,25 +105,25 @@ module ActiveSupport end def self.extended(base) #:nodoc: - base.instance_variable_set("@_dependencies", []) + base.instance_variable_set(:@_dependencies, []) end def append_features(base) - if base.instance_variable_defined?("@_dependencies") - base.instance_variable_get("@_dependencies") << self + if base.instance_variable_defined?(:@_dependencies) + base.instance_variable_get(:@_dependencies) << self return false else return false if base < self @_dependencies.each { |dep| base.send(:include, dep) } super - base.extend const_get("ClassMethods") if const_defined?("ClassMethods") - base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block") + base.extend const_get(:ClassMethods) if const_defined?(:ClassMethods) + base.class_eval(&@_included_block) if instance_variable_defined?(:@_included_block) end end def included(base = nil, &block) if base.nil? - raise MultipleIncludedBlocks if instance_variable_defined?("@_included_block") + raise MultipleIncludedBlocks if instance_variable_defined?(:@_included_block) @_included_block = block else |