rocket_pants 1.12.0 → 1.12.1

data/lib/rocket_pants/controller/respondable.rb

@@ -69,7 +69,7 @@ module RocketPants
       object = normalise_to_serializer object, options
 
       # Convert the object using a standard grape-like lookup chain.
-      if object.is_a?(Array) || object.is_a?(Set) || (options[:each_serializer] && !options[:serializer])
+      if object.respond_to?(:to_ary) || object.is_a?(Set) || (options[:each_serializer] && !options[:serializer])
         suboptions = options.dup
         if each_serializer = suboptions.delete(:each_serializer)
           suboptions[:serializer] = each_serializer
@@ -88,7 +88,7 @@ module RocketPants
       return object unless RocketPants.serializers_enabled?
       serializer = options.delete(:serializer)
       # AMS overrides active_model_serializer, so we ignore it and tell it to go away, generally...
-      serializer = object.active_model_serializer if object.respond_to?(:active_model_serializer) && serializer.nil? && !object.is_a?(Array)
+      serializer = object.active_model_serializer if object.respond_to?(:active_model_serializer) && serializer.nil? && !object.respond_to?(:to_ary)
       return object unless serializer
       SerializerWrapper.new serializer, object
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocket_pants
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack