Cleanup methods, missing spacing and missing nodocs

Add missing nodoc's
Change `assoc_klass` argument name to `association_klass`
Change `prev_reflection` argument name to `previous_reflection`
Change `prev` to `previous_reflection` in `#get_chain`
Switch use of `refl` and `reflection` in `#get_chain` so main parameter
is not abbreviated.
Add missing space in `#add_constraints`

2 files changed, 34 insertions, 33 deletions

diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb
index 170ae58b9f..d06b7b3508 100644
--- a/activerecord/lib/active_record/associations/association_scope.rb
+++ b/activerecord/lib/active_record/associations/association_scope.rb
@@ -80,8 +80,8 @@ module ActiveRecord
         bind_value scope, column, value, connection
       end
 
-      def last_chain_scope(scope, table, reflection, owner, connection, assoc_klass)
-        join_keys = reflection.join_keys(assoc_klass)
+      def last_chain_scope(scope, table, reflection, owner, connection, association_klass)
+        join_keys = reflection.join_keys(association_klass)
         key = join_keys.key
         foreign_key = join_keys.foreign_key
 
@@ -97,8 +97,8 @@ module ActiveRecord
         end
       end
 
-      def next_chain_scope(scope, table, reflection, connection, assoc_klass, foreign_table, next_reflection)
-        join_keys = reflection.join_keys(assoc_klass)
+      def next_chain_scope(scope, table, reflection, connection, association_klass, foreign_table, next_reflection)
+        join_keys = reflection.join_keys(association_klass)
         key = join_keys.key
         foreign_key = join_keys.foreign_key
 
@@ -113,7 +113,7 @@ module ActiveRecord
         scope = scope.joins(join(foreign_table, constraint))
       end
 
-      class ReflectionProxy < SimpleDelegator
+      class ReflectionProxy < SimpleDelegator # :nodoc:
         attr_accessor :next
         attr_reader :alias_name
 
@@ -125,23 +125,23 @@ module ActiveRecord
         def all_includes; nil; end
       end
 
-      def get_chain(refl, association, tracker)
-        name = refl.name
-        runtime_reflection = ActiveRecord::Reflection::RuntimeReflection.new(refl, association)
-        prev = runtime_reflection
-        refl.chain.drop(1).each { |reflection|
-          alias_name = tracker.aliased_table_for(reflection.table_name, reflection.alias_candidate(name))
-          proxy = ReflectionProxy.new(reflection, alias_name)
-          prev.next = proxy
-          prev = proxy
-        }
-        [runtime_reflection, prev]
+      def get_chain(reflection, association, tracker)
+        name = reflection.name
+        runtime_reflection = Reflection::RuntimeReflection.new(reflection, association)
+        previous_reflection = runtime_reflection
+        reflection.chain.drop(1).each do |refl|
+          alias_name = tracker.aliased_table_for(refl.table_name, refl.alias_candidate(name))
+          proxy = ReflectionProxy.new(refl, alias_name)
+          previous_reflection.next = proxy
+          previous_reflection = proxy
+        end
+        [runtime_reflection, previous_reflection]
       end
 
-      def add_constraints(scope, owner, assoc_klass, refl, connection, chain_head, chain_tail)
+      def add_constraints(scope, owner, association_klass, refl, connection, chain_head, chain_tail)
         owner_reflection = chain_tail
         table = owner_reflection.alias_name
-        scope = last_chain_scope(scope, table, owner_reflection, owner, connection, assoc_klass)
+        scope = last_chain_scope(scope, table, owner_reflection, owner, connection, association_klass)
 
         reflection = chain_head
         loop do
@@ -151,7 +151,7 @@ module ActiveRecord
           unless reflection == chain_tail
             next_reflection = reflection.next
             foreign_table = next_reflection.alias_name
-            scope = next_chain_scope(scope, table, reflection, connection, assoc_klass, foreign_table, next_reflection)
+            scope = next_chain_scope(scope, table, reflection, connection, association_klass, foreign_table, next_reflection)
           end
 
           # Exclude the scope of the association itself, because that
@@ -171,6 +171,7 @@ module ActiveRecord
             scope.bind_values  += item.bind_values
             scope.order_values |= item.order_values
           end
+
           reflection = reflection.next
         end
 
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index 25fda8f110..7696ef13c7 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -149,7 +149,7 @@ module ActiveRecord
 
       JoinKeys = Struct.new(:key, :foreign_key) # :nodoc:
 
-      def join_keys(assoc_klass)
+      def join_keys(association_klass)
         JoinKeys.new(foreign_key, active_record_primary_key)
       end
 
@@ -610,8 +610,8 @@ module ActiveRecord
 
       def belongs_to?; true; end
 
-      def join_keys(assoc_klass)
-        key = polymorphic? ? association_primary_key(assoc_klass) : association_primary_key
+      def join_keys(association_klass)
+        key = polymorphic? ? association_primary_key(association_klass) : association_primary_key
         JoinKeys.new(key, foreign_key)
       end
 
@@ -706,7 +706,7 @@ module ActiveRecord
       def chain
         @chain ||= begin
           a = source_reflection.chain
-          b = through_reflection.chain.map(&:dup)
+          b = through_reflection.chain
 
           if options[:source_type]
             b[0] = PolymorphicReflection.new(b[0], self)
@@ -759,8 +759,8 @@ module ActiveRecord
         end
       end
 
-      def join_keys(assoc_klass)
-        source_reflection.join_keys(assoc_klass)
+      def join_keys(association_klass)
+        source_reflection.join_keys(association_klass)
       end
 
       # The macro used by the source association
@@ -898,10 +898,10 @@ module ActiveRecord
 
     end
 
-    class PolymorphicReflection < ThroughReflection
-      def initialize(reflection, prev_reflection)
+    class PolymorphicReflection < ThroughReflection # :nodoc:
+      def initialize(reflection, previous_reflection)
         @reflection = reflection
-        @prev_reflection = prev_reflection
+        @previous_reflection = previous_reflection
       end
 
       def klass
@@ -920,8 +920,8 @@ module ActiveRecord
         @reflection.plural_name
       end
 
-      def join_keys(assoc_klass)
-        @reflection.join_keys(assoc_klass)
+      def join_keys(association_klass)
+        @reflection.join_keys(association_klass)
       end
 
       def type
@@ -933,13 +933,13 @@ module ActiveRecord
       end
 
       def source_type_info
-        type = @prev_reflection.foreign_type
-        source_type = @prev_reflection.options[:source_type]
+        type = @previous_reflection.foreign_type
+        source_type = @previous_reflection.options[:source_type]
         lambda { |object| where(type => source_type) }
       end
     end
 
-    class RuntimeReflection < PolymorphicReflection
+    class RuntimeReflection < PolymorphicReflection # :nodoc:
       attr_accessor :next
 
       def initialize(reflection, association)