Merge pull request #685 from ride/ids-as-strings-2

Serialize ids as strings in JSON-API adapter
rails-api · Oct 20, 2014 · 47deb87 · 47deb87
2 parents 9360a10 + 7c03031
commit 47deb87
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/lib/active_model/serializer/adapter/json_api.rb b/lib/active_model/serializer/adapter/json_api.rb
@@ -14,7 +14,7 @@ def serializable_hash(options = {})
           if serializer.respond_to?(:each)
             @hash[@root] = serializer.map{|s| self.class.new(s).serializable_hash[@root] }
           else
-            @hash[@root] = serializer.attributes
+            @hash[@root] = attributes_for_serializer(serializer, {})
 
             serializer.each_association do |name, association, opts|
               @hash[@root][:links] ||= {}
@@ -35,24 +35,32 @@ def serializable_hash(options = {})
 
         def add_links(name, serializers, options)
           @hash[@root][:links][name] ||= []
-          @hash[@root][:links][name] += serializers.map(&:id)
+          @hash[@root][:links][name] += serializers.map{|serializer| serializer.id.to_s }
 
           unless options[:embed] == :ids
             @hash[:linked][name] ||= []
-            @hash[:linked][name] += serializers.map { |item| item.attributes(options) }
+            @hash[:linked][name] += serializers.map { |item| attributes_for_serializer(item, options) }
           end
         end
 
         def add_link(name, serializer, options)
-          @hash[@root][:links][name] = serializer.id
+          @hash[@root][:links][name] = serializer.id.to_s
 
           unless options[:embed] == :ids
             plural_name = name.to_s.pluralize.to_sym
 
             @hash[:linked][plural_name] ||= []
-            @hash[:linked][plural_name].push serializer.attributes(options)
+            @hash[:linked][plural_name].push attributes_for_serializer(serializer, options)
           end
         end
+
+        private
+
+        def attributes_for_serializer(serializer, options)
+          attributes = serializer.attributes(options)
+          attributes[:id] = attributes[:id].to_s if attributes[:id]
+          attributes
+        end
       end
     end
   end

diff --git a/test/adapter/json_api/belongs_to_test.rb b/test/adapter/json_api/belongs_to_test.rb
@@ -16,11 +16,11 @@ def setup
           end
 
           def test_includes_post_id
-            assert_equal(42, @adapter.serializable_hash[:comments][:links][:post])
+            assert_equal("42", @adapter.serializable_hash[:comments][:links][:post])
           end
 
           def test_includes_linked_post
-            assert_equal([{id: 42, title: 'New Post', body: 'Body'}], @adapter.serializable_hash[:linked][:posts])
+            assert_equal([{id: "42", title: 'New Post', body: 'Body'}], @adapter.serializable_hash[:linked][:posts])
           end
         end
       end

diff --git a/test/adapter/json_api/collection_test.rb b/test/adapter/json_api/collection_test.rb
@@ -17,8 +17,8 @@ def setup
 
           def test_include_multiple_posts
             assert_equal([
-                           {title: "Hello!!", body: "Hello, world!!", id: 1, links: {comments: []}},
-                           {title: "New Post", body: "Body", id: 2, links: {comments: []}}
+                           {title: "Hello!!", body: "Hello, world!!", id: "1", links: {comments: []}},
+                           {title: "New Post", body: "Body", id: "2", links: {comments: []}}
                          ], @adapter.serializable_hash[:posts])
           end
         end

diff --git a/test/adapter/json_api/has_many_embed_ids.rb b/test/adapter/json_api/has_many_embed_ids.rb
@@ -18,7 +18,7 @@ def setup
           end
 
           def test_includes_comment_ids
-            assert_equal([1, 2], @adapter.serializable_hash[:authors][:links][:posts])
+            assert_equal(["1", "2"], @adapter.serializable_hash[:authors][:links][:posts])
           end
 
           def test_no_includes_linked_comments

diff --git a/test/adapter/json_api/has_many_test.rb b/test/adapter/json_api/has_many_test.rb
@@ -18,13 +18,13 @@ def setup
           end
 
           def test_includes_comment_ids
-            assert_equal([1, 2], @adapter.serializable_hash[:posts][:links][:comments])
+            assert_equal(["1", "2"], @adapter.serializable_hash[:posts][:links][:comments])
           end
 
           def test_includes_linked_comments
             assert_equal([
-                           {id: 1, body: 'ZOMG A COMMENT'},
-                           {id: 2, body: 'ZOMG ANOTHER COMMENT'}
+                           {id: "1", body: 'ZOMG A COMMENT'},
+                           {id: "2", body: 'ZOMG ANOTHER COMMENT'}
                          ], @adapter.serializable_hash[:linked][:comments])
           end
         end