moved checking whether the cached collection needs normalizing into normalize_collection

Author: Oaphi

lib/namespaced_env_cache.rb

@@ -98,10 +98,7 @@ def read_collection(name, **opts)
       data = @underlying.read(namespaced, **opts)
       return nil if data.nil?
 
-      if data.is_a?(ActiveRecord::Relation)
-        data = NamespacedEnvCache.normalize_collection(data)
-      end
-
+      data = NamespacedEnvCache.normalize_collection(data)
       type = data.slice!(0)
       begin
         type.constantize.where(id: data)
@@ -134,10 +131,14 @@ def fetch_collection(name, **opts, &block)
     end
 
     # Normalizes a given ActiveRecord collection for use with the cache
-    # @param value [ActiveRecord::Relation] collection to normalize
+    # @param value [ActiveRecord::Relation, [String, Integer, Integer, ...]] collection to normalize
     # @return [[String, Integer, Integer, ...]]
     def self.normalize_collection(value)
-      [value[0].class.to_s, *value.map(&:id)]
+      if value.is_a?(ActiveRecord::Relation)
+        [value[0].class.to_s, *value.map(&:id)]
+      else
+        value
+      end
     end
 
     # We have to statically report that we support cache versioning even though this depends on the underlying class.