Ticket #10822: document_attribute_accessors.diff

activesupport/test/core_ext/module/attribute_accessor_test.rb

@@ -5 +5 @@
-    m = @module = Module.new do
-      mattr_accessor :foo
-      mattr_accessor :bar, :instance_writer => false
+      mattr_accessor :first, :second
-    end
-    @class = Class.new
-    @class.instance_eval { include m }
-    @object = @class.new
-  end
-
-
+_of_nil
-    assert_nil @module.foo
-    assert_nil @object.foo
-  end
@@ -30 +31 @@
-    assert @object.respond_to?(:bar)
-    assert !@object.respond_to?(:bar=)
-  end
+
+  def test_should_work_with_multiple_args
+    assert @module.respond_to?(:first)
+    assert @module.respond_to?(:first=)
+    assert @object.respond_to?(:first)
+    assert @object.respond_to?(:first=)
+
+    assert @module.respond_to?(:second=)
+    assert @module.respond_to?(:second)
+    assert @object.respond_to?(:second=)
+    assert @object.respond_to?(:second)
+  end
+
+  def test_should_not_create_class_accessors
+    assert !@class.respond_to?(:foo)
+    assert !@class.respond_to?(:foo=)
+  end
-end

activesupport/test/core_ext/class/attribute_accessor_test.rb

@@ -5 +5 @@
-    @class = Class.new do
-      cattr_accessor :foo
-      cattr_accessor :bar, :instance_writer => false
+      cattr_accessor :first, :second
-    end
-    @object = @class.new
-  end
-
-mattr_default
+
+cattr_default_of_nil
-    assert_nil @class.foo
-    assert_nil @object.foo
-  end
-
-m
+
+c
-    @class.foo = :test
-    assert_equal :test, @object.foo
-
+
-    @object.foo = :test2
-    assert_equal :test2, @class.foo
-  end
-
+
-  def test_should_not_create_instance_writer
-    assert @class.respond_to?(:foo)
-    assert @class.respond_to?(:foo=)
-    assert @object.respond_to?(:bar)
-    assert !@object.respond_to?(:bar=)
-  end
+
+  def test_should_work_with_multiple_args
+    assert @class.respond_to?(:first)
+    assert @class.respond_to?(:first=)
+    assert @object.respond_to?(:first)
+    assert @object.respond_to?(:first=)
+
+    assert @class.respond_to?(:second=)
+    assert @class.respond_to?(:second)
+    assert @object.respond_to?(:second=)
+    assert @object.respond_to?(:second)
+  end
-end

activesupport/lib/active_support/core_ext/module/attribute_accessors.rb

@@ -1 +1 @@
-# Extends the module object with module and instance accessors for class attributes, 
-# just like the native attr* accessors for instance attributes.
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  def mattr_reader(*syms)
-    syms.each do |sym|
-      next if sym.is_a?(Hash)
@@ -8 +36 @@
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
-
+
-        def self.#{sym}
-          @@#{sym}
-        end
@@ -19 +47 @@
-      EOS
-    end
-  end
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  def mattr_writer(*syms)
-    options = syms.extract_options!
-    syms.each do |sym|
@@ -27 +86 @@
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
-
+
-        def self.#{sym}=(obj)
-          @@#{sym} = obj
-        end
-
+
-        #{"
-        def #{sym}=(obj)
-          @@#{sym} = obj
@@ -40 +99 @@
-      EOS
-    end
-  end
-
+
+
+
+
+
+
-  def mattr_accessor(*syms)
-    mattr_reader(*syms)
-    mattr_writer(*syms)

activesupport/lib/active_support/core_ext/class/attribute_accessors.rb

@@ -1 +1 @@
-# Extends the class object with class and instance accessors for class attributes,
-# just like the native attr* accessors for instance attributes.
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  def cattr_reader(*syms)
-flatten.
+
-      next if sym.is_a?(Hash)
-      class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}
@@ -20 +40 @@
-    end
-  end
-
+  # Creates class attributes and corresponding class and instance methods that allow
+  # assignment to each class attribute.
+  #
+  # ==== Options
+  # * <tt>:instance_writer</tt> - Set to false if you don't want the instance method to be defined. Defaults to true.
+  #
+  # ==== Example
+  #   class Foo
+  #     cattr_writer :size
+  #   end
+  #
+  # is equivalent to:
+  #
+  #    class Foo
+  #      def self.size=(val)
+  #        @@size = val
+  #      end
+  #      def size=(val)
+  #        @@size = val
+  #      end
+  #    end
+  #
+  # The <code>@@size</code> class variable is set to <code>nil</code> (unless it is already defined).
-  def cattr_writer(*syms)
-    options = syms.extract_options!
-flatten.
+
-      class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}
-          @@#{sym} = nil
@@ -41 +84 @@
-    end
-  end
-
+  # Creates class attributes and corresponding class and instance accessor methods for
+  # reading and writing each class attribute.
+  #
+  # This is equivalent to calling <code>cattr_reader</code> and <code>cattr_accessor</code>
+  # with the same arguments.
-  def cattr_accessor(*syms)
-    cattr_reader(*syms)
-    cattr_writer(*syms)