Further simplify singleton_class checking in class_attribute
This commit is contained in:
parent
5e6fc81d63
commit
cdf7a6013d
@ -81,21 +81,13 @@ def self.#{name}=(val)
|
||||
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 @@ def #{name}?
|
||||
attr_writer name if instance_writer
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
def singleton_class?
|
||||
!name || '' == name
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user