diff options
| author | Kabari Hendrick <kabari@gmail.com> | 2010-03-14 01:33:45 -0600 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-27 02:07:04 -0700 |
| commit | b081948bb3e1a6874f133140bf07e7fb9d3359d9 (patch) | |
| tree | ba4ad456cf94d4e563c539f2249f5a4555836fea /activesupport/lib/active_support/core_ext/class/attribute_accessors.rb | |
| parent | 334983eca042b5016d3d79d7ed5761b60ba871ed (diff) | |
| download | rails-b081948bb3e1a6874f133140bf07e7fb9d3359d9.tar.gz rails-b081948bb3e1a6874f133140bf07e7fb9d3359d9.tar.bz2 rails-b081948bb3e1a6874f133140bf07e7fb9d3359d9.zip | |
fixing inconsistency with cattr_reader and matter_reader [#4172 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
Diffstat (limited to 'activesupport/lib/active_support/core_ext/class/attribute_accessors.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/class/attribute_accessors.rb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb index 1602a609eb..83d154be5c 100644 --- a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb +++ b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb @@ -10,8 +10,8 @@ require 'active_support/core_ext/array/extract_options' # Person.hair_colors = [:brown, :black, :blonde, :red] class Class def cattr_reader(*syms) + options = syms.extract_options! syms.flatten.each do |sym| - next if sym.is_a?(Hash) class_eval(<<-EOS, __FILE__, __LINE__ + 1) unless defined? @@#{sym} # unless defined? @@hair_colors @@#{sym} = nil # @@hair_colors = nil @@ -20,11 +20,14 @@ class Class def self.#{sym} # def self.hair_colors @@#{sym} # @@hair_colors end # end - # - def #{sym} # def hair_colors - @@#{sym} # @@hair_colors - end # end EOS + unless options[:instance_reader] == false + class_eval(<<-EOS, __FILE__, __LINE__) + def #{sym} # def hair_colors + @@#{sym} # @@hair_colors + end # end + EOS + end end end |