8 files changed, 35 insertions, 30 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index c7cb88e64f..b84c9e78c3 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -36,8 +36,7 @@ module ActionController
       raise "MiddlewareStack#build requires an app" unless app
 
       middlewares.reverse.inject(app) do |a, middleware|
-        middleware.valid?(action) ?
-          middleware.build(a) : a
+        middleware.valid?(action) ? middleware.build(a) : a
       end
     end
   end
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 2237d747be..81f3391fcd 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -29,14 +29,6 @@ module RenderTestCases
     assert_equal "Hello world!", @view.render(:file => "test/hello_world")
   end
 
-  def test_render_file_not_using_full_path
-    assert_equal "Hello world!", @view.render(:file => "test/hello_world")
-  end
-
-  def test_render_file_without_specific_extension
-    assert_equal "Hello world!", @view.render(:file => "test/hello_world")
-  end
-
   # Test if :formats, :locale etc. options are passed correctly to the resolvers.
   def test_render_file_with_format
     assert_match "<h1>No Comment</h1>", @view.render(:file => "comments/empty", :formats => [:html])
diff --git a/activemodel/test/cases/validations/callbacks_test.rb b/activemodel/test/cases/validations/callbacks_test.rb
index 0015b3c196..6cd0f4ed4d 100644
--- a/activemodel/test/cases/validations/callbacks_test.rb
+++ b/activemodel/test/cases/validations/callbacks_test.rb
@@ -40,8 +40,29 @@ class DogWithMissingName < Dog
   validates_presence_of :name
 end
 
+class DogValidatorWithIfCondition < Dog
+  before_validation :set_before_validation_marker1, if: -> { true }
+  before_validation :set_before_validation_marker2, if: -> { false }
+
+  after_validation :set_after_validation_marker1, if: -> { true }
+  after_validation :set_after_validation_marker2, if: -> { false }
+
+  def set_before_validation_marker1; self.history << 'before_validation_marker1'; end
+  def set_before_validation_marker2; self.history << 'before_validation_marker2' ; end
+
+  def set_after_validation_marker1; self.history << 'after_validation_marker1'; end
+  def set_after_validation_marker2; self.history << 'after_validation_marker2' ; end
+end
+
+
 class CallbacksWithMethodNamesShouldBeCalled < ActiveModel::TestCase
 
+  def test_if_condition_is_respected_for_before_validation
+    d = DogValidatorWithIfCondition.new
+    d.valid?
+    assert_equal ["before_validation_marker1", "after_validation_marker1"], d.history
+  end
+
   def test_before_validation_and_after_validation_callbacks_should_be_called
     d = DogWithMethodCallbacks.new
     d.valid?
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index e46ca3bd07..ad766d3267 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,23 +1,13 @@
 ## Rails 4.0.0 (unreleased) ##
 
-*   If a query selects only a few columns and gives custom names to
-    those columns then `respond_to?` was returning true for the non
-    selected columns. However calling those non selected columns
-    raises exception.
+*   If a model was instantiated from the database using `select`, `respond_to?`
+    returns false for non-selected attributes. For example:
 
-        post = Post.select("'title' as post_title").first
+        post = Post.select(:title).first
+        post.respond_to?(:body) # => false
 
-    In the above case when `post.body` is invoked then an exception is
-    raised since `body` attribute is not selected. Howevere `respond_to?`
-    did not behave correctly.
-
-        pos.respond_to?(:body) #=> true
-
-    Reason was that Active Record calls `super` to pass the call to
-    Active Model and all the columns are defined on Active Model.
-
-    Fix is to actually check if the data returned from the db contains
-    the data for column in question.
+        post = Post.select('title as post_title').first
+        post.respond_to?(:title) # => false
 
     Fixes #4208.
 
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb
index d0c51b77c2..7f59d0b4c6 100644
--- a/activerecord/lib/active_record/attribute_methods.rb
+++ b/activerecord/lib/active_record/attribute_methods.rb
@@ -167,7 +167,7 @@ module ActiveRecord
       self.class.define_attribute_methods unless self.class.attribute_methods_generated?
       result = super
 
-      # If the result is false then it means this method is not supported by ActiveModel too
+      # If the result is false the answer is false.
       return false unless result
 
       # If the result is true then check for the select case.
diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb
index 22226b2f4f..e4c484d64b 100644
--- a/activerecord/lib/active_record/callbacks.rb
+++ b/activerecord/lib/active_record/callbacks.rb
@@ -83,7 +83,7 @@ module ActiveRecord
   #
   # In that case, <tt>Reply#destroy</tt> would only run +destroy_readers+ and _not_ +destroy_author+.
   # So, use the callback macros when you want to ensure that a certain callback is called for the entire
-  # hierarchy, and use the regular overwriteable methods when you want to leave it up to each descendant
+  # hierarchy, and use the regular overwritable methods when you want to leave it up to each descendant
   # to decide whether they want to call +super+ and trigger the inherited callbacks.
   #
   # *IMPORTANT:* In order for inheritance to work for the callback queues, you must specify the
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 09ba2e0d4a..f23521430d 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -383,7 +383,7 @@ module ActiveRecord
 
         TYPES = {}
 
-        # Register an MySQL +type_id+ with a typcasting object in
+        # Register an MySQL +type_id+ with a typecasting object in
         # +type+.
         def self.register_type(type_id, type)
           TYPES[type_id] = type
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 06723b9d7f..482c1b3d48 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -186,8 +186,11 @@ module ActiveRecord
     end
 
     def test_respond_to_for_non_selected_element
+      post = Post.select(:title).first
+      assert_equal false, post.respond_to?(:body), "post should not respond_to?(:body) since invoking it raises exception"
+
       post = Post.select("'title' as post_title").first
-      assert !post.respond_to?(:body), "post should not respond_to?(:body) since invoking it raises exception"
+      assert_equal false, post.respond_to?(:title), "post should not respond_to?(:body) since invoking it raises exception"
     end
 
   end