express - npm Package Compare versions

Comparing version 2.3.4 to 2.3.5

History.md

 
+2.3.5 / 2011-05-19 
+==================
+
+  * Added; export `.view` as alias for `.View`
+  * Misc refactoring
+
 2.3.4 / 2011-05-08 
@@ -3,0 +9,0 @@ ==================

lib/express.js

@@ -31,3 +31,3 @@
 
-exports.version = '2.3.4';
+exports.version = '2.3.5';
 
@@ -62,3 +62,4 @@ /**
 
-require('./view');
+exports.View =
+exports.view = require('./view');
 
@@ -65,0 +66,0 @@ /**

lib/http.js

@@ -15,3 +15,3 @@
   , router = require('./router')
-  , methods = router.methods.concat(['del', 'all'])
+  , methods = router.methods.concat('del', 'all')
   , view = require('./view')
@@ -479,3 +479,3 @@ , url = require('url')
 
-function generateMethod(method){
+methods.forEach(function(method){
   app[method] = function(path){
@@ -498,9 +498,6 @@ var self = this;
   };
-  return arguments.callee;
-}
+});
 
-methods.forEach(generateMethod);
-
 // Alias delete as "del"
 
 app.del = app.delete;

lib/request.js

@@ -272,3 +272,3 @@
   }
-  return ~contentType.indexOf(type);
+  return !! ~contentType.indexOf(type);
 };
@@ -275,0 +275,0 @@

lib/response.js

@@ -20,4 +20,5 @@
   , send = connect.static.send
-  , join = require('path').join
-  , mime = require('mime');
+  , mime = require('mime')
+  , basename = path.basename
+  , join = path.join;
 
@@ -184,3 +185,3 @@ /**
   this.header('Content-Disposition', filename
-    ? 'attachment; filename="' + path.basename(filename) + '"'
+    ? 'attachment; filename="' + basename(filename) + '"'
     : 'attachment');
@@ -187,0 +188,0 @@ return this;

lib/router/index.js

@@ -241,2 +241,4 @@
 
+  router.routes = routes;
+
   return router;
@@ -243,0 +245,0 @@ }

lib/view.js

@@ -37,2 +37,87 @@
 /**
+ * Lookup and compile `view` with cache support by supplying
+ * both the `cache` object and `cid` string,
+ * followed by `options` passed to `exports.lookup()`.
+ *
+ * @param {String} view
+ * @param {Object} cache
+ * @param {Object} cid
+ * @param {Object} options
+ * @return {View}
+ * @api private
+ */
+
+exports.compile = function(view, cache, cid, options){
+  if (cache && cid && cache[cid]) return cache[cid];
+
+  // lookup
+  view = exports.lookup(view, options);
+
+  // hints
+  if (!view.exists) {
+    if (options.hint) hintAtViewPaths(view.original, options);
+    var err = new Error('failed to locate view "' + view.original.view + '"');
+    err.view = view.original;
+    throw err;
+  }    
+
+  // compile
+  view.fn = view.templateEngine.compile(view.contents, options);
+  cache[cid] = view;
+  
+  return view;
+};
+
+/**
+ * Lookup `view`, returning an instanceof `View`.
+ *
+ * Options:
+ *
+ *   - `root` root directory path
+ *   - `defaultEngine` default template engine
+ *   - `parentView` parent `View` object
+ *   - `cache` cache object
+ *   - `cacheid` optional cache id
+ *
+ * Lookup:
+ *
+ *   - partial `_<name>` 
+ *   - any `<name>/index` 
+ *   - non-layout `../<name>/index` 
+ *   - any `<root>/<name>` 
+ *   - partial `<root>/_<name>` 
+ *
+ * @param {String} view
+ * @param {Object} options
+ * @return {View}
+ * @api private
+ */
+
+exports.lookup = function(view, options){
+  var orig = view = new View(view, options);
+
+  // Try _ prefix ex: ./views/_<name>.jade
+  if (partial) {
+    view = new View(orig.prefixPath, options);
+    if (!view.exists) view = orig;
+  }
+
+  // Try index ex: ./views/user/index.jade
+  if (!view.exists) view = new View(orig.indexPath, options);
+
+  // Try ../<name>/index ex: ../user/index.jade
+  // when calling partial('user') within the same dir
+  if (!view.exists && !options.isLayout) view = new View(orig.upIndexPath, options);
+
+  // Try root ex: <root>/user.jade
+  if (!view.exists) view = new View(orig.rootPath, options);
+
+  // Try root _ prefix ex: <root>/_user.jade
+  if (!view.exists && partial) view = new View(view.prefixPath, options);
+
+  view.original = orig;
+  return view;
+};
+
+/**
  * Partial render helper.
@@ -175,2 +260,3 @@ *
     , options = options || {}
+    , viewEngine = app.set('view engine')
     , parent = {};
@@ -188,5 +274,3 @@
   // utilize "view engine" option
-  if (app.set('view engine')) {
-    parent.extension = '.' + app.set('view engine');
-  }
+  if (viewEngine) parent.extension = '.' + viewEngine;
 
@@ -334,43 +418,7 @@ // render the partial
 
-  // cached view
-  if (app.cache[cid]) {
-    view = app.cache[cid];
-    options.filename = view.path;
-  // resolve view
-  } else {
-    var orig = view = new View(view, options);
+  // View lookup
+  options.hint = app.enabled('hints');
+  view = exports.compile(view, app.cache, cid, options);
+  options.filename = view.path;
 
-    // Try _ prefix ex: ./views/_<name>.jade
-    if (partial) {
-      view = new View(orig.prefixPath, options);
-      if (!view.exists) view = orig;
-    }
-  
-    // Try index ex: ./views/user/index.jade
-    if (!view.exists) view = new View(orig.indexPath, options);
-
-    // Try ../<name>/index ex: ../user/index.jade
-    // when calling partial('user') within the same dir
-    if (!view.exists && !options.isLayout) view = new View(orig.upIndexPath, options);
-
-    // Try root ex: <root>/user.jade
-    if (!view.exists) view = new View(orig.rootPath, options);
-
-    // Try root _ prefix ex: <root>/_user.jade
-    if (!view.exists && partial) view = new View(view.prefixPath, options);
-
-    // Does not exist
-    if (!view.exists) {
-      if (app.enabled('hints')) hintAtViewPaths(orig, options);
-      var err = new Error('failed to locate view "' + orig.view + '"');
-      err.view = orig;
-      throw err;
-    }    
-
-    options.filename = view.path;
-    var engine = view.templateEngine;
-    view.fn = engine.compile(view.contents, options)
-    if (cacheViews) app.cache[cid] = view;
-  }
-
   // layout helper
@@ -377,0 +425,0 @@ options.layout = function(path){

lib/view/view.js

@@ -52,3 +52,6 @@
   this.dirname = dirname(this.path);
-  if (options.attempts) options.attempts.push(this.path);
+  if (options.attempts) {
+    if (!~options.attempts.indexOf(this.path))
+      options.attempts.push(this.path);
+  }
 };
@@ -55,0 +58,0 @@

package.json

 {
   "name": "express",
   "description": "Sinatra inspired web development framework",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "author": "TJ Holowaychuk <[e-mail]>",
@@ -6,0 +6,0 @@ "contributors": [

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

99986

increased by1.2%

Lines of code

2281

increased by2.01%

No dependency changes