From ed5d5b4ca49248a59b770f327384bad97c4b9ad8 Mon Sep 17 00:00:00 2001 From: Darren Cheng Date: Sat, 22 Apr 2017 17:10:22 -0700 Subject: [PATCH] Ensure support for Sequel models and datasets. --- .../serializer_resolver.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/grape-active_model_serializers/serializer_resolver.rb b/lib/grape-active_model_serializers/serializer_resolver.rb index b9949e3..13220a1 100644 --- a/lib/grape-active_model_serializers/serializer_resolver.rb +++ b/lib/grape-active_model_serializers/serializer_resolver.rb @@ -48,8 +48,9 @@ module Grape end def collection_class - return nil unless resource.respond_to?(:to_ary) - ActiveModel::Serializer.config.collection_serializer + if resource.respond_to?(:to_ary) || resource.respond_to?(:all) + ActiveModel::Serializer.config.collection_serializer + end end def namespace_inferred_class @@ -84,8 +85,10 @@ module Grape end def resource_class - if resource.respond_to?(:to_ary) - resource.try(:klass) || resource.compact.first.class + if resource.respond_to?(:klass) + resource.klass + elsif resource.respond_to?(:to_ary) || resource.respond_to?(:all) + resource.first.class else resource.class end