aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJames Miller <bensie@gmail.com>2011-12-28 09:19:46 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-12-28 09:47:36 -0800
commit520918aad9b84eee807eb42fcb32f57c152d50e0 (patch)
treef760bc9543b25030c74b1b75f877b1793ad2174d /activesupport
parent40cab62560046181daded741956faa20a17cbb09 (diff)
downloadrails-520918aad9b84eee807eb42fcb32f57c152d50e0.tar.gz
rails-520918aad9b84eee807eb42fcb32f57c152d50e0.tar.bz2
rails-520918aad9b84eee807eb42fcb32f57c152d50e0.zip
Further simplify singleton_class checking in class_attribute
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/class/attribute.rb15
1 files changed, 1 insertions, 14 deletions
diff --git a/activesupport/lib/active_support/core_ext/class/attribute.rb b/activesupport/lib/active_support/core_ext/class/attribute.rb
index 45bec264ff..a04445d34d 100644
--- a/activesupport/lib/active_support/core_ext/class/attribute.rb
+++ b/activesupport/lib/active_support/core_ext/class/attribute.rb
@@ -81,21 +81,13 @@ class Class
define_method(:#{name}) { val }
end
- if singleton_class?
- class_eval do
- remove_possible_method(:#{name})
- def #{name}
- defined?(@#{name}) ? @#{name} : singleton_class.#{name}
- end
- end
- end
val
end
if instance_reader
remove_possible_method :#{name}
def #{name}
- defined?(@#{name}) ? @#{name} : self.class.#{name}
+ defined?(@#{name}) ? @#{name} : singleton_class.#{name}
end
def #{name}?
@@ -107,9 +99,4 @@ class Class
attr_writer name if instance_writer
end
end
-
- private
- def singleton_class?
- !name || '' == name
- end
end