From 0f50847c7d9f1177929e39153a236c2b402d17d0 Mon Sep 17 00:00:00 2001
From: Benjamin Fleischer <github@benjaminfleischer.com>
Date: Wed, 7 Oct 2015 06:07:22 -0500
Subject: [PATCH] Make more class attributes inheritable

---
 lib/active_model/serializer.rb | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index 0d6eae75..bc553b9d 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -27,12 +27,12 @@ module ActiveModel
       )
     /x
 
-    class << self
-      attr_accessor :_attributes
-      attr_accessor :_attributes_keys
-    end
-
     with_options instance_writer: false, instance_reader: false do |serializer|
+      class_attribute :_type, instance_reader: true
+      class_attribute :_attributes
+      self._attributes ||= []
+      class_attribute :_attributes_keys
+      self._attributes_keys ||= {}
       serializer.class_attribute :_cache
       serializer.class_attribute :_fragmented
       serializer.class_attribute :_cache_key
@@ -43,8 +43,8 @@ module ActiveModel
     end
 
     def self.inherited(base)
-      base._attributes = _attributes.try(:dup) || []
-      base._attributes_keys = _attributes_keys.try(:dup) || {}
+      base._attributes = _attributes.dup
+      base._attributes_keys = _attributes_keys.dup
       base._cache_digest = digest_caller_file(caller.first)
       super
     end
@@ -125,7 +125,6 @@ module ActiveModel
     end
 
     attr_accessor :object, :root, :scope
-    class_attribute :_type, instance_writer: false
 
     def initialize(object, options = {})
       self.object = object
@@ -149,10 +148,10 @@ module ActiveModel
       attributes = self.class._attributes.dup
 
       attributes.each_with_object({}) do |name, hash|
-        unless self.class._fragmented
-          hash[name] = send(name)
-        else
+        if self.class._fragmented
           hash[name] = self.class._fragmented.public_send(name)
+        else
+          hash[name] = send(name)
         end
       end
     end