Created
October 15, 2014 22:27
-
-
Save guilleiguaran/730221837088a7eec5fe to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/active_model/serializer/adapter.rb b/lib/active_model/serializer/adapter.rb | |
index 8eacc39..f0a8257 100644 | |
--- a/lib/active_model/serializer/adapter.rb | |
+++ b/lib/active_model/serializer/adapter.rb | |
@@ -17,13 +17,7 @@ module ActiveModel | |
end | |
def to_json(options = {}) | |
- result = serializable_hash(options) | |
- | |
- if root = options.fetch(:root, serializer.json_key) | |
- result = { root => result } | |
- end | |
- | |
- result.to_json | |
+ serializable_hash(options).to_json | |
end | |
end | |
end | |
diff --git a/lib/active_model/serializer/adapter/json.rb b/lib/active_model/serializer/adapter/json.rb | |
index 82bc319..3b56819 100644 | |
--- a/lib/active_model/serializer/adapter/json.rb | |
+++ b/lib/active_model/serializer/adapter/json.rb | |
@@ -3,18 +3,26 @@ module ActiveModel | |
class Adapter | |
class Json < Adapter | |
def serializable_hash(options = {}) | |
- @hash = serializer.attributes(options) | |
+ if serializer.respond_to?(:each) | |
+ @result = serializer.map{|s| self.class.new(s).serializable_hash } | |
+ else | |
+ @result = serializer.attributes(options) | |
- serializer.each_association do |name, association, options| | |
- if association.respond_to?(:each) | |
- array_serializer = association | |
- @hash[name] = array_serializer.map { |item| item.attributes(options) } | |
- else | |
- @hash[name] = association.attributes(options) | |
+ serializer.each_association do |name, association, opts| | |
+ if association.respond_to?(:each) | |
+ array_serializer = association | |
+ @result[name] = array_serializer.map { |item| item.attributes(opts) } | |
+ else | |
+ @result[name] = association.attributes(options) | |
+ end | |
end | |
end | |
- @hash | |
+ if root = options.fetch(:root, serializer.json_key) | |
+ @result = { root => @result } | |
+ end | |
+ | |
+ @result | |
end | |
end | |
end | |
diff --git a/lib/active_model/serializer/adapter/json_api.rb b/lib/active_model/serializer/adapter/json_api.rb | |
index 7634061..2d4977e 100644 | |
--- a/lib/active_model/serializer/adapter/json_api.rb | |
+++ b/lib/active_model/serializer/adapter/json_api.rb | |
@@ -4,22 +4,29 @@ module ActiveModel | |
class JsonApi < Adapter | |
def initialize(serializer, options = {}) | |
super | |
- serializer.root ||= true | |
+ serializer.root = true | |
end | |
- def serializable_hash(opts = {}) | |
- @hash = serializer.attributes | |
- | |
- serializer.each_association do |name, association, options| | |
- @hash[:links] ||= {} | |
- unless options[:embed] == :ids | |
- @hash[:linked] ||= {} | |
- end | |
- | |
- if association.respond_to?(:each) | |
- add_links(name, association, options) | |
- else | |
- add_link(name, association, options) | |
+ def serializable_hash(options = {}) | |
+ @root = (options[:root] || serializer.json_key).to_s.pluralize.to_sym | |
+ @hash = {} | |
+ | |
+ if serializer.respond_to?(:each) | |
+ @hash[@root] = serializer.map{|s| self.class.new(s).serializable_hash[@root] } | |
+ else | |
+ @hash[@root] = serializer.attributes | |
+ | |
+ serializer.each_association do |name, association, opts| | |
+ @hash[@root][:links] ||= {} | |
+ unless options[:embed] == :ids | |
+ @hash[:linked] ||= {} | |
+ end | |
+ | |
+ if association.respond_to?(:each) | |
+ add_links(name, association, opts) | |
+ else | |
+ add_link(name, association, opts) | |
+ end | |
end | |
end | |
@@ -27,8 +34,8 @@ module ActiveModel | |
end | |
def add_links(name, serializers, options) | |
- @hash[:links][name] ||= [] | |
- @hash[:links][name] += serializers.map(&:id) | |
+ @hash[@root][:links][name] ||= [] | |
+ @hash[@root][:links][name] += serializers.map(&:id) | |
unless options[:embed] == :ids | |
@hash[:linked][name] ||= [] | |
@@ -37,7 +44,7 @@ module ActiveModel | |
end | |
def add_link(name, serializer, options) | |
- @hash[:links][name] = serializer.id | |
+ @hash[@root][:links][name] = serializer.id | |
unless options[:embed] == :ids | |
plural_name = name.to_s.pluralize.to_sym | |
diff --git a/lib/active_model/serializer/array_serializer.rb b/lib/active_model/serializer/array_serializer.rb | |
index 697c445..b52a4f5 100644 | |
--- a/lib/active_model/serializer/array_serializer.rb | |
+++ b/lib/active_model/serializer/array_serializer.rb | |
@@ -10,6 +10,14 @@ module ActiveModel | |
serializer_class.new(object) | |
end | |
end | |
+ | |
+ def json_key | |
+ @objects.first.json_key if @objects.first | |
+ end | |
+ | |
+ def root=(root) | |
+ @objects.first.root = root if @objects.first | |
+ end | |
end | |
end | |
end | |
diff --git a/test/action_controller/serialization_test.rb b/test/action_controller/serialization_test.rb | |
index dcfd9ea..4103e27 100644 | |
--- a/test/action_controller/serialization_test.rb | |
+++ b/test/action_controller/serialization_test.rb | |
@@ -23,6 +23,14 @@ module ActionController | |
ensure | |
ActiveModel::Serializer.config.adapter = old_adapter | |
end | |
+ | |
+ def render_array_using_implicit_serializer | |
+ array = [ | |
+ Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }), | |
+ Profile.new({ name: 'Name 2', description: 'Description 2', comments: 'Comments 2' }) | |
+ ] | |
+ render json: array | |
+ end | |
end | |
tests MyController | |
@@ -46,7 +54,25 @@ module ActionController | |
get :render_using_default_adapter_root | |
assert_equal 'application/json', @response.content_type | |
- assert_equal '{"profile":{"name":"Name 1","description":"Description 1"}}', @response.body | |
+ assert_equal '{"profiles":{"name":"Name 1","description":"Description 1"}}', @response.body | |
+ end | |
+ | |
+ def test_render_array_using_implicit_serializer | |
+ get :render_array_using_implicit_serializer | |
+ assert_equal 'application/json', @response.content_type | |
+ | |
+ expected = [ | |
+ { | |
+ name: 'Name 1', | |
+ description: 'Description 1', | |
+ }, | |
+ { | |
+ name: 'Name 2', | |
+ description: 'Description 2', | |
+ } | |
+ ] | |
+ | |
+ assert_equal expected.to_json, @response.body | |
end | |
end | |
end | |
diff --git a/test/adapter/json_api/belongs_to_test.rb b/test/adapter/json_api/belongs_to_test.rb | |
index 151fd8c..5c1df9f 100644 | |
--- a/test/adapter/json_api/belongs_to_test.rb | |
+++ b/test/adapter/json_api/belongs_to_test.rb | |
@@ -16,7 +16,7 @@ module ActiveModel | |
end | |
def test_includes_post_id | |
- assert_equal(42, @adapter.serializable_hash[:links][:post]) | |
+ assert_equal(42, @adapter.serializable_hash[:comments][:links][:post]) | |
end | |
def test_includes_linked_post | |
diff --git a/test/adapter/json_api/has_many_embed_ids.rb b/test/adapter/json_api/has_many_embed_ids.rb | |
index d3e4215..f7755b7 100644 | |
--- a/test/adapter/json_api/has_many_embed_ids.rb | |
+++ b/test/adapter/json_api/has_many_embed_ids.rb | |
@@ -18,7 +18,7 @@ module ActiveModel | |
end | |
def test_includes_comment_ids | |
- assert_equal([1, 2], @adapter.serializable_hash[: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 | |
index 435079d..9fad0f8 100644 | |
--- a/test/adapter/json_api/has_many_test.rb | |
+++ b/test/adapter/json_api/has_many_test.rb | |
@@ -18,7 +18,7 @@ module ActiveModel | |
end | |
def test_includes_comment_ids | |
- assert_equal([1, 2], @adapter.serializable_hash[:links][:comments]) | |
+ assert_equal([1, 2], @adapter.serializable_hash[:posts][:links][:comments]) | |
end | |
def test_includes_linked_comments | |
diff --git a/test/array_serializer_test.rb b/test/array_serializer_test.rb | |
index 66840a4..4c9b63e 100644 | |
--- a/test/array_serializer_test.rb | |
+++ b/test/array_serializer_test.rb | |
@@ -5,7 +5,7 @@ module ActiveModel | |
class ArraySerializerTest < Minitest::Test | |
def setup | |
@comment = Comment.new | |
- @post= Post.new | |
+ @post = Post.new | |
@serializer = ArraySerializer.new([@comment, @post]) | |
end | |
@@ -13,7 +13,7 @@ module ActiveModel | |
assert_respond_to @serializer, :each | |
end | |
- def test_each_object_should_be_serializer_with_appropriate_serializer | |
+ def test_each_object_should_be_serialized_with_appropriate_serializer | |
serializers = @serializer.to_a | |
assert_kind_of CommentSerializer, serializers.first |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment