Merge pull request #1037 from engineyard/type-attribute

allow for type attribute

Author: joaomdmoura

lib/active_model/serializer.rb

@@ -134,7 +134,7 @@ def id
       object.id if object
     end
 
-    def type
+    def json_api_type
       object.class.model_name.plural
     end
 

lib/active_model/serializer/adapter/json_api.rb

@@ -44,15 +44,15 @@ def fragment_cache(cached_hash, non_cached_hash)
         def add_relationships(resource, name, serializers)
           resource[:relationships] ||= {}
           resource[:relationships][name] ||= { data: [] }
-          resource[:relationships][name][:data] += serializers.map { |serializer| { type: serializer.type, id: serializer.id.to_s } }
+          resource[:relationships][name][:data] += serializers.map { |serializer| { type: serializer.json_api_type, id: serializer.id.to_s } }
         end
 
         def add_relationship(resource, name, serializer, val=nil)
           resource[:relationships] ||= {}
           resource[:relationships][name] = { data: val }
 
           if serializer && serializer.object
-            resource[:relationships][name][:data] = { type: serializer.type, id: serializer.id.to_s }
+            resource[:relationships][name][:data] = { type: serializer.json_api_type, id: serializer.id.to_s }
           end
         end
 
@@ -97,14 +97,14 @@ def attributes_for_serializer(serializer, options)
 
         def resource_object_for(serializer, options)
           options[:fields] = @fieldset && @fieldset.fields_for(serializer)
-          options[:required_fields] = [:id, :type]
+          options[:required_fields] = [:id, :json_api_type]
 
           cache_check(serializer) do
             attributes = serializer.attributes(options)
 
             result = {
               id: attributes.delete(:id).to_s,
-              type: attributes.delete(:type)
+              type: attributes.delete(:json_api_type)
             }
 
             result[:attributes] = attributes if attributes.any?
@@ -151,8 +151,8 @@ def add_resource_relationships(attrs, serializer, options = {})
             end
 
             if options[:add_included]
-              Array(serializer).each do |serializer|
-                add_included(key, serializer)
+              Array(serializer).each do |s|
+                add_included(key, s)
               end
             end
           end

test/serializers/attribute_test.rb

@@ -4,7 +4,7 @@ module ActiveModel
   class Serializer
     class AttributeTest < Minitest::Test
       def setup
-        @blog = Blog.new({ id: 1, name: 'AMS Hints' })
+        @blog = Blog.new({ id: 1, name: 'AMS Hints', type: "stuff" })
         @blog_serializer = AlternateBlogSerializer.new(@blog)
       end
 
@@ -42,6 +42,21 @@ def test_id_attribute_override
         adapter = ActiveModel::Serializer::Adapter::Json.new(serializer.new(@blog))
         assert_equal({ blog: { id: "AMS Hints" } }, adapter.serializable_hash)
       end
+
+      def test_type_attribute
+        attribute_serializer = Class.new(ActiveModel::Serializer) do
+          attribute :id, key: :type
+        end
+        attributes_serializer = Class.new(ActiveModel::Serializer) do
+          attributes :type
+        end
+
+        adapter = ActiveModel::Serializer::Adapter::Json.new(attribute_serializer.new(@blog))
+        assert_equal({ blog: { type: 1} }, adapter.serializable_hash)
+
+        adapter = ActiveModel::Serializer::Adapter::Json.new(attributes_serializer.new(@blog))
+        assert_equal({ blog: { type: "stuff" } }, adapter.serializable_hash)
+      end
     end
   end
 end