From f6ea07dd2261770bbee15d29fb2b3fe8d5b88a9d Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 16 Sep 2013 10:39:21 -0300
Subject: [PATCH] Do not convert attrs to String until needed

---
 lib/active_model/serializer.rb              | 2 --
 lib/active_model/serializer/associations.rb | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index ee63417c..26929181 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -64,8 +64,6 @@ module ActiveModel
         options = attrs.extract_options!
 
         attrs.each do |attr|
-          attr = attr.to_s
-
           unless method_defined?(attr)
             define_method attr do
               object.send attr
diff --git a/lib/active_model/serializer/associations.rb b/lib/active_model/serializer/associations.rb
index dd65c51c..31cf2eda 100644
--- a/lib/active_model/serializer/associations.rb
+++ b/lib/active_model/serializer/associations.rb
@@ -5,7 +5,7 @@ module ActiveModel
   class Serializer
     class Association
       def initialize(name, options={})
-        @name          = name
+        @name          = name.to_s
         @options       = options
 
         self.embed     = options[:embed] || SETTINGS[:embed]