Merge pull request #1096 from beauby/fix-attribute

Fix definition of serializer attributes with multiple calls to `attri…
rails-api · Sep 1, 2015 · e0b74d8 · e0b74d8
2 parents 8d3a89e + 995bbcc
commit e0b74d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
@@ -70,7 +70,7 @@ def self.attribute(attr, options = {})
       ActiveModelSerializers.silence_warnings do
         define_method key do
           object.read_attribute_for_serialization(attr)
-        end unless respond_to?(key, false) || _fragmented.respond_to?(attr)
+        end unless (key != :id && method_defined?(key)) || _fragmented.respond_to?(attr)
       end
     end
 

diff --git a/test/fixtures/poro.rb b/test/fixtures/poro.rb
@@ -134,7 +134,8 @@ def custom_options
 
 AuthorSerializer = Class.new(ActiveModel::Serializer) do
   cache key:'writer', skip_digest: true
-  attributes :id, :name
+  attribute :id
+  attribute :name
 
   has_many :posts
   has_many :roles