Version 0.1.0 release

Author: bminer

README.md

@@ -56,29 +56,27 @@ strong caching headers to the response.
 **"Cache Strategy" Object** - a "cache strategy" object should implement one or
 more of the following methods:
 
-- `lastModified(filename, cb)` - a function that accepts a filename and returns
-	its last modified date to the callback. If a last modified date could not
-	be determined, null is passed to the callback; otherwise, static-asset
+- `lastModified(filename)` - a function that accepts a filename and returns
+	its last modified date. If a last modified date could not
+	be determined, the function should return `null`; otherwise, static-asset
 	*may* use this Date to set the `Last-Modified` HTTP response header when
 	the resource is requested.
-
-	- `label_or_filename` - a label or filename in `path`
-	- `cb` - a callback of the form `cb(err, lastModifiedDate)`
 - `etag(filename, cb)` - Same as lastModified (above), except that it must
-	return an ETag (or hash value) to the callback.  If the
-	returned ETag is not null, static-asset *may* use this value to set the
+	return an ETag (or hash value).  If the
+	returned ETag is not `null`, static-asset *may* use this value to set the
 	`ETag` HTTP header when the named resource is requested.
-- `expires(filename, cb)` - Same as lastModified (above), except
+- `expires(filename)` - Same as lastModified (above), except
 	that it must return a Date Object indicating when the resource shall
 	expire. The Date may be no more than one year in the future. If
 	`expires` is implemented, static-asset *may* use the date to set an
 	`Expires` and/or `Cache-Control: max-age` HTTP headers; otherwise,
 	static-asset will use a Date approximately one year into the future.
 
-**req.assetFingerprint(label_or_filename)** - Using static-asset's "cache
-strategy", return a URL fingerprint for the labelled resource, or if no such
-label is registered, attempt to locate the specified filename within the `path`
-to determine its fingerprint.
+**req.assetFingerprint(label_or_filename)** - Return a URL fingerprint for the
+labelled resource, or if no such label is registered, use the "cache
+strategy" to determine the file's ETag or last modified date. If an ETag is
+provided by the cache strategy, it will be used to generate the fingerprint;
+otherwise, the last modified date will be used.
 
 **req.assetFingerprint(label, urlFingerprint, cacheInfo)** - Registers a URL
 fingerprint for the specified label.

lib/static-asset.js

@@ -9,13 +9,14 @@ function staticAsset(path, strategy) {
 		//If req.assetFingerprint is already there, do nothing.
 		if(req.assetFingerprint)
 			return next();
-		//Create req.assetFingerprint
+		//Helper function that adds fingerprints and returns them
 		function addFingerprint(fingerprint, headers) {
 			fingerprints[fingerprint] = headers;
 			return fingerprint;
 		}
+		//Create req.assetFingerprint
 		req.assetFingerprint = function(label, fingerprint, cacheInfo) {
-			if(arguments.length == 1)
+			if(arguments.length > 1)
 			{
 				//Add a label
 				var labelInfo = labels[label] = {"fingerprint": fingerprint};
@@ -27,18 +28,32 @@ function staticAsset(path, strategy) {
 				//Get a fingerprint
 				var info = labels[label];
 				if(info)
-					return addFingerprint(info.fingerprint, {"ETag": info.etag,
-						"Last-Modified": info.lastModified});
+				{
+					var headers = {};
+					if(info.etag)
+						headers["ETag"] = info.etag;
+					if(info.lastModified)
+						headers["Last-Modified"] = info.lastModified.getUTCString();
+					if(info.expires !== null)
+					{
+						if(!info.expires)
+						{
+							var d = info.expires = new Date();
+							d.setFullYear(d.getFullYear() + 1);
+						}
+						headers["Expires"] = info.expires.getUTCString();
+					}
+					return addFingerprint(info.fingerprint, headers);
+				}
 				else
 				{
 					//Use the "cache strategy" to get a fingerprint
 					//Prefer the use of etag over lastModified when generating
 					//fingerprints
 					var expires = cacheStrategy.expires ||
 						staticAsset.strategies["default"].expires;
-					expires = expires(label);
 					var headers = {
-						"Expires": expires //TODO: add Cache-Control: max-age=
+						"Expires": expires(label).getUTCString()
 					};
 					if(cacheStrategy.etag)
 					{
@@ -49,9 +64,11 @@ function staticAsset(path, strategy) {
 					else if(cacheStrategy.lastModified)
 					{
 						var mdate = cacheStrategy.lastModified(label);
-						headers["Last-Modified"] = mdate;
-						return addFingerprint(label + "?v=" + mdate.getTime(),
-							headers);
+						mdate.setMilliseconds(0);
+						headers["Last-Modified"] = mdate.toUTCString();
+						//Encode the Date as a radix 36 UTC timestamp
+						mdate = new Number(mdate.getTime() / 1000).toString(36);
+						return addFingerprint(label + "?v=" + mdate, headers);
 					}
 					else
 						return label; //Do not generate a fingerprint

package.json

@@ -2,14 +2,23 @@
   "author": "Blake Miner <miner.blake@gmail.com> (http://www.blakeminer.com)",
   "name": "static-asset",
   "description": "Static asset manager for Node.JS and Express",
-  "version": "0.0.0",
+  "keywords": [
+	"asset",
+	"static",
+	"cache",
+	"caching",
+	"fingerprint",
+	"express",
+	"middleware"
+  ]
+  "version": "0.1.0",
   "repository": {
     "type": "git",
     "url": "git://github.com/bminer/node-static-asset.git"
   },
   "main": "index.js",
   "engines": {
-    "node": ">=0.6.0"
+    "node": ">=0.6"
   },
   "dependencies": {
 	"crc": ">=0.2"