aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-06-30 03:50:47 -0700
committerJosé Valim <jose.valim@gmail.com>2011-06-30 03:50:47 -0700
commitd1b61883162278e334e2892d193b31395bb47032 (patch)
tree97f19c0de3dc1213432d1dd3e65e431b56e3f30c /activesupport/lib/active_support
parent539752a54cf3426c98e65136206df9f9553d9e73 (diff)
parentbf526c2dbeb73bf11553004e43889a804b72866d (diff)
downloadrails-d1b61883162278e334e2892d193b31395bb47032.tar.gz
rails-d1b61883162278e334e2892d193b31395bb47032.tar.bz2
rails-d1b61883162278e334e2892d193b31395bb47032.zip
Merge pull request #1690 from vijaydev/mattr_accessor_changes
Added instance_accessor: false to Module#mattr_accessor
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/core_ext/module/attribute_accessors.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb b/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
index 871f5cef3b..be94ae1565 100644
--- a/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
+++ b/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
@@ -12,7 +12,7 @@ class Module
end
EOS
- unless options[:instance_reader] == false
+ unless options[:instance_reader] == false || options[:instance_accessor] == false
class_eval(<<-EOS, __FILE__, __LINE__ + 1)
def #{sym}
@@#{sym}
@@ -31,7 +31,7 @@ class Module
end
EOS
- unless options[:instance_writer] == false
+ unless options[:instance_writer] == false || options[:instance_accessor] == false
class_eval(<<-EOS, __FILE__, __LINE__ + 1)
def #{sym}=(obj)
@@#{sym} = obj
@@ -53,6 +53,10 @@ class Module
# end
#
# AppConfiguration.google_api_key = "overriding the api key!"
+ #
+ # To opt out of the instance writer method, pass :instance_writer => false.
+ # To opt out of the instance reader method, pass :instance_reader => false.
+ # To opt out of both instance methods, pass :instance_accessor => false.
def mattr_accessor(*syms)
mattr_reader(*syms)
mattr_writer(*syms)