lib/determinator/cache/fetch_wrapper.rb in determinator-2.3.0 vs lib/determinator/cache/fetch_wrapper.rb in determinator-2.3.1

@@ -2,23 +2,28 @@
   module Cache
     class FetchWrapper
       # @param *caches [ActiveSupport::Cache] If a list then the head of the the
       # list should will be checked before the  tail. If the head is empty but
       # the tail is not then the head will be filled with the value of the tail.
-      def initialize(*caches)
+      def initialize(*caches, cache_missing: true)
+        @cache_missing = cache_missing
         @caches = caches
       end
 
       # Call walks through each cache, returning a value if the item exists in
       # any cache, otherwise popularing each cache with the value of yield.
       def call(feature_name)
         value = read_and_upfill(feature_name)
-        # nil is an acceptable value in the case of a missing feature definition
-        return nil if value.nil?
-        return value if value != false
 
+        # if the value is missing and we cache it, return the missing response
+        return value if value.is_a?(MissingResponse) && @cache_missing
+
+        #otherwise only return the non nil/notice_missing_feature value
+        return value if !value.nil? && !(value.is_a?(MissingResponse) && !@cache_missing)
+
         value_to_write = yield
+        return value_to_write if value_to_write.is_a?(ErrorResponse)
         @caches.each do |cache|
           cache.write(key(feature_name), value_to_write)
         end
         return value_to_write
       end
@@ -37,22 +42,21 @@
       #
       # If a value is found in a cache after the first then all caches earlier
       # in that list will be backfilled.
       #
       # @param url [String] a feature name
-      # @return [false, nil, Feature] false when no value is found, otherwise
-      # the value stored in the cache (including nil)
+      # @return [Feature, MissingResponse] nil when no value is found
       def read_and_upfill(feature_name)
         @caches.each.with_index do |cache, index|
           if cache.exist?(key(feature_name))
             value = cache.read(key(feature_name))
             @caches[0...index].each do |cache|
               cache.write(key(feature_name), value)
             end
             return value
           end
         end
-        return false
+        return nil
       end
     end
   end
 end