lib/active_support/configurable.rb in activesupport-3.1.0.beta1 vs lib/active_support/configurable.rb in activesupport-3.1.0.rc1

@@ -1,9 +1,10 @@
 require 'active_support/concern'
 require 'active_support/ordered_options'
 require 'active_support/core_ext/kernel/singleton_class'
 require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/array/extract_options'
 
 module ActiveSupport
   # Configurable provides a <tt>config</tt> method to store and retrieve
   # configuration options as an <tt>OrderedHash</tt>.
   module Configurable
@@ -49,17 +50,19 @@
       #   user = User.new
       #   user.allowed_access = true
       #   user.allowed_access # => true
       #
       def config_accessor(*names)
+        options = names.extract_options!
+
         names.each do |name|
-          code, line = <<-RUBY, __LINE__ + 1
-            def #{name}; config.#{name}; end
-            def #{name}=(value); config.#{name} = value; end
-          RUBY
+          reader, line = "def #{name}; config.#{name}; end", __LINE__
+          writer, line = "def #{name}=(value); config.#{name} = value; end", __LINE__
 
-          singleton_class.class_eval code, __FILE__, line
-          class_eval code, __FILE__, line
+          singleton_class.class_eval reader, __FILE__, line
+          singleton_class.class_eval writer, __FILE__, line
+          class_eval reader, __FILE__, line unless options[:instance_reader] == false
+          class_eval writer, __FILE__, line unless options[:instance_writer] == false
         end
       end
     end
 
     # Reads and writes attributes from a configuration <tt>OrderedHash</tt>.