#2494 #2456

app/lib/mulukhiya/renderer/rss20_feed_renderer.rb

@@ -17,25 +17,31 @@ def cache
       command.exec
       raise command.stderr unless command.status.zero?
       self.entries = JSON.parse(command.stdout)
-      clear
-      storage[command] = to_s
+      storage[command] = render(update: true)
     end
 
     alias save cache
 
     def clear
-      storage[command] = nil
+      storage.del(command)
     end
 
-    def to_s
-      return storage[command] if storage[command].present? rescue super
-      return super
+    def render(params = {})
+      return feed.to_s if params[:update]
+      return feed.to_s unless storage.key?(command)
+      return storage[command]
+    rescue => e
+      logger.error(error: e)
+      return feed.to_s
     end
 
+    alias to_s render
+
     private
 
     def fetch_image(uri)
-      return storage[uri] if storage[uri].present?
+      return nil unless uri
+      return storage[uri] if storage.key?(uri)
       return storage[uri] = super
     rescue => e
       logger.error(error: e)

app/lib/mulukhiya/storage/render_storage.rb

@@ -12,6 +12,12 @@ def set(command, value)
       setex(command, ttl, value)
     end
 
+    def key?(key)
+      return keys(create_key(key)).present?
+    end
+
+    alias exist? key?
+
     def setex(command, ttl, value)
       if value.is_a?(Enumerable)
         super(command, ttl, value.to_json)