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

Allow :instance_reader to be given to superclass_delegating_accessor as well.

Browse Source
This commit is contained in:
José Valim
2009-10-28 09:50:18 -02:00
committed by Yehuda Katz
parent 2aafdc8396
commit a107103e85
2 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
View File

@@ -1,39 +1,57 @@
require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/object/duplicable'
require 'active_support/core_ext/array/extract_options'
class Class
def superclass_delegating_reader(*names)
class_name_to_stop_searching_on = superclass.name.blank? ? "Object" : superclass.name
class_to_stop_searching_on = superclass.name.blank? ? "Object" : superclass.name
options = names.extract_options!
names.each do |name|
class_eval(<<-EOS, __FILE__, __LINE__ + 1)
def self.#{name} # def self.only_reader
if defined?(@#{name}) # if defined?(@only_reader)
@#{name} # @only_reader
elsif superclass < #{class_name_to_stop_searching_on} && # elsif superclass < Object &&
superclass.respond_to?(:#{name}) # superclass.respond_to?(:only_reader)
superclass.#{name} # superclass.only_reader
end # end
end # end
def #{name} # def only_reader
self.class.#{name} # self.class.only_reader
end # end
def self.#{name}? # def self.only_reader?
!!#{name} # !!only_reader
end # end
def #{name}? # def only_reader?
!!#{name} # !!only_reader
end # end
# def self.only_reader
# if defined?(@only_reader)
# @only_reader
# elsif superclass < Object && superclass.respond_to?(:only_reader)
# superclass.only_reader
# end
# end
class_eval <<-EOS, __FILE__, __LINE__ + 1
def self.#{name}
if defined?(@#{name})
@#{name}
elsif superclass < #{class_to_stop_searching_on} && superclass.respond_to?(:#{name})
superclass.#{name}
end
end
EOS
unless options[:instance_reader] == false
class_eval <<-EOS, __FILE__, __LINE__ + 1
def #{name} # def only_reader
self.class.#{name} # self.class.only_reader
end # end
def self.#{name}? # def self.only_reader?
!!#{name} # !!only_reader
end # end
def #{name}? # def only_reader?
!!#{name} # !!only_reader
end # end
EOS
end
end
end
def superclass_delegating_writer(*names, &block)
options = names.extract_options!
names.each do |name|
class_eval(<<-EOS, __FILE__, __LINE__ + 1)
class_eval <<-EOS, __FILE__, __LINE__ + 1
def self.#{name}=(value) # def self.property=(value)
@#{name} = value # @property = value
end # end
EOS
self.send("#{name}=", yield) if block_given?
self.send(:"#{name}=", yield) if block_given?
end
end

7
activesupport/test/core_ext/class/delegating_attributes_test.rb
View File

@@ -52,6 +52,13 @@ class DelegatingAttributesTest < Test::Unit::TestCase
assert !single_class.public_instance_methods.map(&:to_s).include?("both=")
end
def test_simple_accessor_declaration_with_instance_reader_false
single_class.superclass_delegating_accessor :no_instance_reader, :instance_reader => false
assert single_class.respond_to?(:no_instance_reader)
assert single_class.respond_to?(:no_instance_reader=)
assert !single_class.public_instance_methods.map(&:to_s).include?("no_instance_reader")
end
def test_working_with_simple_attributes
single_class.superclass_delegating_accessor :both