github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Further simplify singleton_class checking in class_attribute

Browse Source
This commit is contained in:
James Miller
2011-12-28 09:19:46 -08:00
committed by Aaron Patterson
parent 40cab62560
commit 520918aad9
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
activesupport/lib/active_support/core_ext/class/attribute.rb
View File

@@ -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