Merge branch 'pr121'

Author: Zoramite

changelog.md

@@ -1,3 +1,10 @@
+# 2.0.1
+
+- 22 Feb 2015
+
+  * Fixed [#123](https://github.com/emberfeather/less.js-middleware/issues/123): imports are not objects for cache checking and did not have mtimes.
+  * Added a `preprocess.importPaths` for modifying the import paths per request.
+
 # 2.0.0
 
 – 21 Feb 2015

lib/middleware.js

@@ -107,11 +107,13 @@ module.exports = less.middleware = function(source, options){
     },
     preprocess: {
       less: function(src, req) { return src; },
-      path: function(pathname, req) { return pathname; }
+      path: function(pathname, req) { return pathname; },
+      importPaths: function(paths, req) { return paths; }
     },
     render: {
       compress: 'auto',
-      yuicompress: false
+      yuicompress: false,
+      paths: []
     },
     storeCss: function(pathname, css, req, next) {
       mkdirp(path.dirname(pathname), 511 /* 0777 */, function(err){
@@ -188,9 +190,13 @@ module.exports = less.middleware = function(source, options){
           delete lessFiles[lessPath];
 
           try {
+            var renderOptions = extend(true, {}, options.render, {
+              filename: lessPath,
+              paths: options.preprocess.importPaths(options.render.paths, req)
+            });
             lessSrc = options.preprocess.less(lessSrc, req);
-            options.render.filename = lessPath;
-            less.render(lessSrc, options.render, function(err, output){
+
+            less.render(lessSrc, renderOptions, function(err, output){
               if (err) {
                 utilities.lessError(err);
                 return next(err);

package.json

@@ -2,7 +2,7 @@
   "author": "Randy Merrill <Zoramite+github@gmail.com> (http://forthedeveloper.com)",
   "name": "less-middleware",
   "description": "LESS.js middleware for connect.",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/emberfeather/less.js-middleware.git"

readme.md

@@ -87,6 +87,11 @@ The following options can be used to control the behavior of the middleware:
             <td>Function that modifies the less pathname before being loaded from the filesystem.</td>
             <td><code>function(pathname, req){...}</code></td>
         </tr>
+        <tr>
+            <th><code>preprocess.importPaths</code></th>
+            <td>Function that modifies the import paths used by the less parser per request.</td>
+            <td><code>function(paths, req){...}</code></td>
+        </tr>
         <tr>
             <th><code>render</code></th>
             <td>Options for the less render. See the "<code>render</code> Options" section below.</td>
@@ -127,6 +132,10 @@ The following are the defaults used by the middleware:
             <th><code>yuicompress</code></th>
             <td><code>false</code></td>
         </tr>
+        <tr>
+            <th><code>paths</code></th>
+            <td><code>[]</code></td>
+        </tr>
     </tbody>
 </table>
 

test/fixtures/external/2.43.3/externalvariables.less

@@ -0,0 +1 @@
+@externalColor: #f03;

test/fixtures/external/2.43.3/ui/ui.less

@@ -0,0 +1 @@
+@paddingBox: 20px;

test/fixtures/preprocessParserPaths-exp.css

@@ -0,0 +1 @@
+.widget{color:#f03;padding:20px}

test/fixtures/preprocessParserPaths.less

@@ -0,0 +1,6 @@
+@import "externalvariables.less";
+@import "ui.less";
+.widget {
+  color: @externalColor;
+  padding: @paddingBox;
+}

test/test-middleware.js

@@ -167,6 +167,35 @@ describe('middleware', function(){
         });
       });
 
+      describe('importPaths', function(){
+        var app = setupExpress(__dirname + '/fixtures', {
+          dest: tmpDest,
+          preprocess: {
+            path: function(pathname, req) {
+                var returnPath = pathname.replace(/(\/[0-9\.0-9\.0-9].*\/)/, '/');
+                return returnPath;
+            },
+            importPaths: function(paths, req) {
+              var version = req.url.match(/\/([0-9\.0-9\.0-9]*)/);
+              var reqPath = path.join(__dirname, 'fixtures', 'external', version[1] , '/');
+              var paths = [
+                reqPath,
+                path.join(reqPath, 'ui')
+              ];
+              return paths;
+            }
+          }
+        });
+
+        it('should respond with newly mapped paths', function(done){
+          var expected = fs.readFileSync(__dirname + '/fixtures/preprocessParserPaths-exp.css', 'utf8');
+          request(app)
+            .get('/2.43.3/preprocessParserPaths.css')
+            .expect(200)
+            .expect(expected, done);
+        });
+      });
+
       describe('pathRoot', function(){
         var app = setupExpress('/fixtures', {
           dest: '/artifacts',