0
@@ -232,6 +232,10 @@ module ActiveRecord
0
     def method_missing(method_id, *args, &block)
0
       method_name = method_id.to_s
0
 
0
+      if self.class.private_method_defined?(method_name)
0
+        raise NoMethodError("Attempt to call private method", method_name, args)
0
+      end
0
+
0
       # If we haven't generated any methods yet, generate them, then
0
       # see if we've created the method we're looking for.
0
       if !self.class.generated_methods?
0
@@ -334,10 +338,12 @@ module ActiveRecord
0
     # <tt>person.respond_to?(:name=)</tt>, and <tt>person.respond_to?(:name?)</tt>
0
     # which will all return +true+.
0
     alias :respond_to_without_attributes? :respond_to?
0
-    def respond_to?(method, include_priv = false)
0
+    def respond_to?(method, include_private_methods = false)
0
       method_name = method.to_s
0
       if super
0
         return true
0
+      elsif self.private_methods.include?(method_name) && !include_private_methods
0
+        return false
0
       elsif !self.class.generated_methods?
0
         self.class.define_attribute_methods
0
         if self.class.generated_methods.include?(method_name)

0
@@ -58,19 +58,19 @@ class AttributeMethodsTest < ActiveRecord::TestCase
0
 
0
   def test_kernel_methods_not_implemented_in_activerecord
0
     %w(test name display y).each do |method|
0
-      assert_equal false, ActiveRecord::Base.instance_method_already_implemented?(method), "##{method} is defined"
0
+      assert !ActiveRecord::Base.instance_method_already_implemented?(method), "##{method} is defined"
0
     end
0
   end
0
 
0
   def test_primary_key_implemented
0
-    assert_equal true, Class.new(ActiveRecord::Base).instance_method_already_implemented?('id')
0
+    assert Class.new(ActiveRecord::Base).instance_method_already_implemented?('id')
0
   end
0
 
0
   def test_defined_kernel_methods_implemented_in_model
0
     %w(test name display y).each do |method|
0
       klass = Class.new ActiveRecord::Base
0
       klass.class_eval "def #{method}() 'defined #{method}' end"
0
-      assert_equal true, klass.instance_method_already_implemented?(method), "##{method} is not defined"
0
+      assert klass.instance_method_already_implemented?(method), "##{method} is not defined"
0
     end
0
   end
0
 
0
@@ -80,7 +80,7 @@ class AttributeMethodsTest < ActiveRecord::TestCase
0
       abstract.class_eval "def #{method}() 'defined #{method}' end"
0
       abstract.abstract_class = true
0
       klass = Class.new abstract
0
-      assert_equal true, klass.instance_method_already_implemented?(method), "##{method} is not defined"
0
+      assert klass.instance_method_already_implemented?(method), "##{method} is not defined"
0
     end
0
   end
0
 
0
@@ -228,6 +228,40 @@ class AttributeMethodsTest < ActiveRecord::TestCase
0
     assert_equal [:field_b], Minimalistic.skip_time_zone_conversion_for_attributes 
0
   end
0
 
0
+  def test_read_attributes_respect_access_control
0
+    privatize("title")
0
+
1
+    topic = @target.new(:title => "The pros and cons of programming naked.")
0
+    assert !topic.respond_to?(:title)
0
+    assert_raise(NoMethodError) { topic.title }
0
+    topic.send(:title)
0
+  end
0
+
0
+  def test_write_attributes_respect_access_control
0
+    privatize("title=(value)")
0
+
0
+    topic = @target.new
0
+    assert !topic.respond_to?(:title=)
0
+    assert_raise(NoMethodError) { topic.title = "Pants"}
0
+    topic.send(:title=, "Very large pants")
0
+  end
0
+
0
+  def test_question_attributes_respect_access_control
0
+    privatize("title?")
0
+
0
+    topic = @target.new(:title => "Isaac Newton's pants")
0
+    assert !topic.respond_to?(:title?)
0
+    assert_raise(NoMethodError) { topic.title? }
0
+    assert topic.send(:title?)
0
+  end
0
+
0
+  def test_bulk_update_respects_access_control
0
+    privatize("title=(value)")
0
+
0
+    assert_raise(ActiveRecord::UnknownAttributeError) { topic = @target.new(:title => "Rants about pants") }
0
+    assert_raise(ActiveRecord::UnknownAttributeError) { @target.new.attributes = { :title => "Ants in pants" } }
0
+  end
0
+
0
   private
0
   def time_related_columns_on_topic
0
     Topic.columns.select{|c| [:time, :date, :datetime, :timestamp].include?(c.type)}.map(&:name)
0
@@ -244,4 +278,13 @@ class AttributeMethodsTest < ActiveRecord::TestCase
0
     Time.zone = old_zone
0
     ActiveRecord::Base.time_zone_aware_attributes = old_tz
0
   end
0
+
0
+  def privatize(method_signature)
0
+    @target.class_eval <<-private_method
0
+      private
0
+      def #{method_signature}
0
+        "I'm private"
0
+      end
0
+    private_method
0
+  end
0
 end