Merge pull request #5156 from avakhov/class-attribute-instance-accessor

Add instance_accessor option to class_attribute
rails · May 21, 2012 · f260dc5 · f260dc5
2 parents 776ea10 + e4569b5
commit f260dc5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
@@ -203,8 +203,7 @@ module Layouts
     include Rendering
 
     included do
-      class_attribute :_layout, :_layout_conditions,
+      class_attribute :_layout, :_layout_conditions, :instance_accessor => false
-        :instance_reader => false, :instance_writer => false
       self._layout = nil
       self._layout_conditions = {}
       _write_layout_method

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Add `:instance_accessor` option for `class_attribute`. *Alexey Vakhov*
+
 *   `constantize` now looks in the ancestor chain. *Marc-Andre Lafortune & Andrew White*
 
 *   `Object#try` can't call private methods. *Vasiliy Ermolovich*

diff --git a/activesupport/lib/active_support/core_ext/class/attribute.rb b/activesupport/lib/active_support/core_ext/class/attribute.rb
@@ -65,10 +65,12 @@ class Class
   # To opt out of the instance writer method, pass :instance_writer => false.
   #
   #   object.setting = false  # => NoMethodError
+  #
+  # To opt out of both instance methods, pass :instance_accessor => false.
   def class_attribute(*attrs)
     options = attrs.extract_options!
-    instance_reader = options.fetch(:instance_reader, true)
+    instance_reader = options.fetch(:instance_accessor, true) && options.fetch(:instance_reader, true)
-    instance_writer = options.fetch(:instance_writer, true)
+    instance_writer = options.fetch(:instance_accessor, true) && options.fetch(:instance_writer, true)
 
     attrs.each do |name|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1

diff --git a/activesupport/test/core_ext/class/attribute_test.rb b/activesupport/test/core_ext/class/attribute_test.rb
@@ -66,6 +66,13 @@ def setup
     assert_raise(NoMethodError) { object.setting? }
   end
 
+  test 'disabling both instance writer and reader' do
+    object = Class.new { class_attribute :setting, :instance_accessor => false }.new
+    assert_raise(NoMethodError) { object.setting }
+    assert_raise(NoMethodError) { object.setting? }
+    assert_raise(NoMethodError) { object.setting = 'boom' }
+  end
+
   test 'works well with singleton classes' do
     object = @klass.new
     object.singleton_class.setting = 'foo'