lib/filemanager.rb in vueck-1.0.3 vs lib/filemanager.rb in vueck-1.0.4

@@ -5,16 +5,18 @@
             @js_cache  = "#{DIRS[:cache]}#{FILES[:javascript]}"
             @css_cache = "#{DIRS[:cache]}#{FILES[:style]}"
         end
 
         def serve
-            return render unless cachedir_exists?
-            return render unless cachefiles_exist?
-            return render unless cachefiles_fresh?
+            return render unless cache_valid?
             read_file
         end
 
         private
+
+        def cache_valid?
+            cachedir_exists? and cachefiles_exist? and cachefiles_fresh?
+        end
 
         def render
             renders = BatchRenderer.new.render
             File.write(@js_cache,  renders[:components])
             File.write(@css_cache, renders[:style])