ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-24 14:56:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #65 from teeparham/array-root

Browse Source 
use :root option in render :json
This commit is contained in:
Yehuda Katz 2012-06-05 00:31:13 -07:00
commit 3cb74887df
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/action_controller/serialization.rb
View File

@ -41,7 +41,7 @@ module ActionController
def _render_option_json(json, options) def _render_option_json(json, options)
if json.respond_to?(:to_ary) if json.respond_to?(:to_ary)
options[:root] ||= controller_name options[:root] ||= controller_name unless options[:root] == false
end end
serializer = options.delete(:serializer) || serializer = options.delete(:serializer) ||

10
test/serialization_test.rb
View File

@ -140,6 +140,11 @@ class RenderJsonTest < ActionController::TestCase
render :json => HypermediaSerializable.new render :json => HypermediaSerializable.new
end end
def render_json_array_with_no_root
render :json => [], :root => false
end
private private
def default_serializer_options def default_serializer_options
if params[:check_defaults] if params[:check_defaults]
@ -250,4 +255,9 @@ class RenderJsonTest < ActionController::TestCase
get :render_json_with_links get :render_json_with_links
assert_match '{"link":"http://www.nextangle.com/hypermedia"}', @response.body assert_match '{"link":"http://www.nextangle.com/hypermedia"}', @response.body
end end
def test_render_json_array_with_no_root
get :render_json_array_with_no_root
assert_equal '[]', @response.body
end
end end