Be able to specify a static key for some set of files (essential if using HTML5 appcache manifest)

.gitignore

@@ -1 +1,4 @@
-*.DS_Store
+*.DS_Store
+/lib
+/dist
+/tmp

app/controllers/press/Press.java

@@ -1,48 +1,47 @@
 package controllers.press;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import play.exceptions.UnexpectedException;
 import play.mvc.Controller;
-import press.CachingStrategy;
-import press.PluginConfig;
-import press.ScriptCompressedFileManager;
-import press.ScriptCompressor;
-import press.ScriptRequestHandler;
-import press.StyleCompressedFileManager;
-import press.StyleCompressor;
-import press.StyleRequestHandler;
+import play.db.jpa.NoTransaction;
+import press.*;
 import press.io.CompressedFile;
 import press.io.FileIO;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+
+@NoTransaction
 public class Press extends Controller {
-    public static final DateTimeFormatter httpDateTimeFormatter = DateTimeFormat
+    private static final DateTimeFormatter httpDateTimeFormatter = DateTimeFormat
             .forPattern("EEE, dd MMM yyyy HH:mm:ss 'GMT'");
 
+    private static final Logger logger = LoggerFactory.getLogger(Press.class);
+
     public static void getCompressedJS(String key) {
         key = FileIO.unescape(key);
         CompressedFile compressedFile = new ScriptCompressedFileManager().getCompressedFile(key);
-        renderCompressedFile(compressedFile, "JavaScript");
+        renderCompressedFile(key, compressedFile, "JavaScript");
     }
 
     public static void getCompressedCSS(String key) {
         key = FileIO.unescape(key);
         CompressedFile compressedFile = new StyleCompressedFileManager().getCompressedFile(key);
-        renderCompressedFile(compressedFile, "CSS");
+        renderCompressedFile(key, compressedFile, "CSS");
     }
 
-    private static void renderCompressedFile(CompressedFile compressedFile, String type) {
+    private static void renderCompressedFile(String key, CompressedFile compressedFile, String type) {
         flash.keep();
 
         if (compressedFile == null) {
-            renderBadResponse(type);
+            renderBadResponse(key, type);
+            return;
         }
 
         InputStream inputStream = compressedFile.inputStream();
@@ -71,7 +70,7 @@ private static void renderCompressedFile(CompressedFile compressedFile, String t
         // part of the key, so if the file changes, the key in the html file
         // will be modified, and the browser will request a new version. Each
         // version can therefore be cached indefinitely.
-        if (PluginConfig.cache.equals(CachingStrategy.Change)) {
+        if (PluginConfig.cache == CachingStrategy.Change) {
             // Cache for a year
             response.setHeader("Cache-Control", "max-age=" + 31536000);
             response.setHeader("Expires", httpDateTimeFormatter.print(new DateTime().plusYears(1)));
@@ -101,7 +100,7 @@ public static void clearCSSCache() {
         renderText("Cleared " + count + " CSS files from cache");
     }
 
-    private static void renderBadResponse(String fileType) {
+    private static void renderBadResponse(String key, String fileType) {
         String response = "/*\n";
         response += "The compressed " + fileType + " file could not be generated.\n";
         response += "This can occur in two situations:\n";
@@ -113,6 +112,7 @@ private static void renderBadResponse(String fileType) {
         response += "2. There was an exception thrown while rendering the ";
         response += "page.\n";
         response += "*/";
+        logger.error("Bad response to " + key + " (" + fileType + "): " + response);
         renderBinaryResponse(response);
     }
 

app/views/tags/press/compressed-script.tag → app/views/tags/press/compressed-script.html

@@ -12,4 +12,4 @@
  *  See the plugin documentation for more information.
  *  
 }*
-${ press.Plugin.compressedJSTag() }
+${ press.Plugin.compressedJSTag(_arg).raw() }

app/views/tags/press/compressed-stylesheet.tag → app/views/tags/press/compressed-stylesheet.html

@@ -16,4 +16,4 @@
  *  See the plugin documentation for more information.
  *  
 }*
-${ press.Plugin.compressedCSSTag() }
+${ press.Plugin.compressedCSSTag(_arg, _media).raw() }