added normalize_collection method to NamespacedEnvCache & ensured collects are normalized on read too

Author: Oaphi

lib/namespaced_env_cache.rb

@@ -85,7 +85,7 @@ def write_collection(name, value, **opts)
         raise TypeError, "Can't cache more than one type of object via write_collection"
       end
 
-      data = [types[0].to_s, *value.map(&:id)]
+      data = normalize_collection(value)
       namespaced = construct_ns_key(name, include_community: include_community(opts))
       @underlying.write(namespaced, data, **opts)
     end
@@ -100,6 +100,11 @@ def read_collection(name, **opts)
       namespaced = construct_ns_key(name, include_community: include_community(opts))
       data = @underlying.read(namespaced, **opts)
       return nil if data.nil?
+
+      if data.is_a?(ActiveRecord::Relation)
+        data = normalize_collection(data)
+      end
+
       type = data.slice!(0)
       begin
         type.constantize.where(id: data)
@@ -145,5 +150,12 @@ def construct_ns_key(key, include_community: true)
       c_id = RequestContext.community_id if include_community
       "#{Rails.env}://#{[c_id, key].compact.join('/')}"
     end
+
+    # Normalizes a given ActiveRecord collection for use with the cache
+    # @param value [ActiveRecord::Relation] collection to normalize
+    # @return [Array(String, *Integer)]
+    def normalize_collection(value)
+      [value[0].class.to_s, *value.map(&:id)]
+    end
   end
 end