Fixed a bug that appears when a nil association is included

2026-01-25 07:16:49 +00:00 · 2015-04-03 12:50:05 +02:00
parent 48ed7cf9ba
commit 6a0564a241
2 changed files with 28 additions and 3 deletions
--- a/lib/active_model/serializer/adapter/json_api.rb
+++ b/lib/active_model/serializer/adapter/json_api.rb
@@ -53,10 +53,11 @@ module ActiveModel
        end

        def add_included(resource_name, serializers, parent = nil)
-          serializers = Array(serializers) unless serializers.respond_to?(:each)
-
+          unless serializers.respond_to?(:each)
+            return unless serializers.object
+            serializers = Array(serializers)
+          end
          resource_path = [parent, resource_name].compact.join('.')
-
          if include_assoc?(resource_path)
            @hash[:included] ||= []