From 251fdc7ba46776f9ac01b281844eddc1e2f6df33 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Tue, 14 May 2013 17:26:38 -0700
Subject: [PATCH] Rename opts to klass_options

---
 lib/active_model/serializer.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index 4fec41a5..3468a09d 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -366,10 +366,10 @@ module ActiveModel
         end
       end
 
-      klass, opts = _associations[name]
+      klass, klass_options = _associations[name]
       association_class =
         if klass
-          options = opts.merge options
+          options = klass_options.merge options
           klass
         elsif value.respond_to?(:to_ary)
           Associations::HasMany