Fix #1759, Grape integration, adds serialization_context

- improves improves serialization_context to take options and not depend
on a `request` object.
- adds descriptive error on missing serialization_context.
- Document overriding `CollectionSerializer#paginated?`.
This commit is contained in:
Benjamin Fleischer 2016-05-29 16:21:45 -05:00
parent a52189c9c0
commit a7296e8a92
6 changed files with 63 additions and 14 deletions

View File

@ -9,6 +9,8 @@ Features:
- [#1426](https://github.com/rails-api/active_model_serializers/pull/1426) Add ActiveModelSerializers.config.default_includes (@empact) - [#1426](https://github.com/rails-api/active_model_serializers/pull/1426) Add ActiveModelSerializers.config.default_includes (@empact)
Fixes: Fixes:
- [#1754](https://github.com/rails-api/active_model_serializers/pull/1754) Fixes #1759, Grape integration, improves serialization_context
missing error message on pagination. Document overriding CollectionSerializer#paginated?. (@bf4)
- [#1287](https://github.com/rails-api/active_model_serializers/pull/1287) Pass `fields` options from adapter to serializer. (@vasilakisfil) - [#1287](https://github.com/rails-api/active_model_serializers/pull/1287) Pass `fields` options from adapter to serializer. (@vasilakisfil)
- [#1710](https://github.com/rails-api/active_model_serializers/pull/1710) Prevent association loading when `include_data` option - [#1710](https://github.com/rails-api/active_model_serializers/pull/1710) Prevent association loading when `include_data` option
is set to `false`. (@groyoh) is set to `false`. (@groyoh)

View File

@ -2,6 +2,7 @@ module ActiveModelSerializers
module Adapter module Adapter
class JsonApi < Base class JsonApi < Base
class PaginationLinks class PaginationLinks
MissingSerializationContextError = Class.new(KeyError)
FIRST_PAGE = 1 FIRST_PAGE = 1
attr_reader :collection, :context attr_reader :collection, :context
@ -9,7 +10,13 @@ module ActiveModelSerializers
def initialize(collection, adapter_options) def initialize(collection, adapter_options)
@collection = collection @collection = collection
@adapter_options = adapter_options @adapter_options = adapter_options
@context = adapter_options.fetch(:serialization_context) @context = adapter_options.fetch(:serialization_context) do
fail MissingSerializationContextError, <<-EOF.freeze
JsonApi::PaginationLinks requires a ActiveModelSerializers::SerializationContext.
Please pass a ':serialization_context' option or
override CollectionSerializer#paginated? to return 'false'.
EOF
end
end end
def as_json def as_json

View File

@ -1,3 +1,4 @@
require 'active_support/core_ext/array/extract_options'
module ActiveModelSerializers module ActiveModelSerializers
class SerializationContext class SerializationContext
class << self class << self
@ -22,9 +23,15 @@ module ActiveModelSerializers
attr_reader :request_url, :query_parameters, :key_transform attr_reader :request_url, :query_parameters, :key_transform
def initialize(request, options = {}) def initialize(*args)
@request_url = request.original_url[/\A[^?]+/] options = args.extract_options!
@query_parameters = request.query_parameters if args.size == 1
request = args.pop
options[:request_url] = request.original_url[/\A[^?]+/]
options[:query_parameters] = request.query_parameters
end
@request_url = options.delete(:request_url)
@query_parameters = options.delete(:query_parameters)
@url_helpers = options.delete(:url_helpers) || self.class.url_helpers @url_helpers = options.delete(:url_helpers) || self.class.url_helpers
@default_url_options = options.delete(:default_url_options) || self.class.default_url_options @default_url_options = options.delete(:default_url_options) || self.class.default_url_options
end end

View File

@ -1,4 +1,7 @@
# Helpers can be included in your Grape endpoint as: helpers Grape::Helpers::ActiveModelSerializers # Helpers can be included in your Grape endpoint as: helpers Grape::Helpers::ActiveModelSerializers
require 'active_model_serializers/serialization_context'
module Grape module Grape
module Helpers module Helpers
module ActiveModelSerializers module ActiveModelSerializers
@ -8,6 +11,12 @@ module Grape
# #
# Example: To include pagination meta data: render(posts, meta: { page: posts.page, total_pages: posts.total_pages }) # Example: To include pagination meta data: render(posts, meta: { page: posts.page, total_pages: posts.total_pages })
def render(resource, active_model_serializer_options = {}) def render(resource, active_model_serializer_options = {})
active_model_serializer_options.fetch(:serialization_context) do
active_model_serializer_options[:serialization_context] = ::ActiveModelSerializers::SerializationContext.new(
original_url: request.url[/\A[^?]+/],
query_parameters: request.params
)
end
env[:active_model_serializer_options] = active_model_serializer_options env[:active_model_serializer_options] = active_model_serializer_options
resource resource
end end

View File

@ -5,13 +5,19 @@ require 'minitest/mock'
class SerializationContextTest < ActiveSupport::TestCase class SerializationContextTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation include ActiveSupport::Testing::Isolation
def create_request
request = Minitest::Mock.new
request.expect(:original_url, 'original_url')
request.expect(:query_parameters, 'query_parameters')
end
class WithRails < SerializationContextTest class WithRails < SerializationContextTest
def create_request
request = ActionDispatch::Request.new({})
def request.original_url
'http://example.com/articles?page=2'
end
def request.query_parameters
{ 'page' => 2 }
end
request
end
setup do setup do
require 'rails' require 'rails'
require 'active_model_serializers' require 'active_model_serializers'
@ -20,8 +26,8 @@ class SerializationContextTest < ActiveSupport::TestCase
end end
test 'create context with request url and query parameters' do test 'create context with request url and query parameters' do
assert_equal @context.request_url, 'original_url' assert_equal @context.request_url, 'http://example.com/articles'
assert_equal @context.query_parameters, 'query_parameters' assert_equal @context.query_parameters, 'page' => 2
end end
test 'url_helpers is set up for Rails url_helpers' do test 'url_helpers is set up for Rails url_helpers' do
@ -36,14 +42,21 @@ class SerializationContextTest < ActiveSupport::TestCase
end end
class WithoutRails < SerializationContextTest class WithoutRails < SerializationContextTest
def create_request
{
request_url: 'http://example.com/articles',
query_parameters: { 'page' => 2 }
}
end
setup do setup do
require 'active_model_serializers/serialization_context' require 'active_model_serializers/serialization_context'
@context = ActiveModelSerializers::SerializationContext.new(create_request) @context = ActiveModelSerializers::SerializationContext.new(create_request)
end end
test 'create context with request url and query parameters' do test 'create context with request url and query parameters' do
assert_equal @context.request_url, 'original_url' assert_equal @context.request_url, 'http://example.com/articles'
assert_equal @context.query_parameters, 'query_parameters' assert_equal @context.query_parameters, 'page' => 2
end end
test 'url_helpers is a module when Rails is not present' do test 'url_helpers is a module when Rails is not present' do

View File

@ -161,6 +161,17 @@ module ActiveModelSerializers
assert_equal expected_response_without_pagination_links, adapter.serializable_hash assert_equal expected_response_without_pagination_links, adapter.serializable_hash
end end
def test_raises_descriptive_error_when_serialization_context_unset
render_options = { adapter: :json_api }
adapter = serializable(using_kaminari, render_options)
exception = assert_raises do
adapter.as_json
end
exception_class = ActiveModelSerializers::Adapter::JsonApi::PaginationLinks::MissingSerializationContextError
assert_equal exception_class, exception.class
assert_match(/CollectionSerializer#paginated\?/, exception.message)
end
end end
end end
end end