Merge pull request #2 from sorrycc/master

add beforeProxy option to handle request before send to proxy

.gitignore

@@ -4,3 +4,4 @@ test/fixture/seajs/
 test/fixture/ajax/
 examples/sea-modules/arale/class/
 coverage
+.idea

README.md

@@ -33,6 +33,8 @@ See [example](https://github.com/popomore/connect-combo/blob/master/examples/)
 
 - `log` show log on terminal, default `false`.
 
+- `beforeProxy` handle request before send to proxy, default `null`.
+
 ## License
 
 MIT

index.js

@@ -12,6 +12,8 @@ var defaults = {
   // local directory
   directory: process.cwd(),
 
+  beforeProxy: null,
+
   // remote server
   proxy: '',
 

lib/file.js

@@ -10,6 +10,7 @@ module.exports = File;
 function File(urlPath, options) {
   urlPath = url.parse(urlPath).pathname;
   this.options = options;
+  this.urlPath = urlPath;
   this.localPath = path.join(options.directory, urlPath);
   this.remotePath = url.resolve(options.proxy, urlPath);
 }
@@ -25,12 +26,21 @@ File.prototype.end = function(cb) {
       cb(null, data.toString());
     } else {
       that.emit('not found', that.localPath);
-      if (that.options.proxy) {
-        // find file from remote server
-        that.getRemote(cb);
+      if (that.options.beforeProxy) {
+        that.emit('before proxy', that.localPath);
+        that.options.beforeProxy.call(that, that.urlPath, cb, requestProxy);
       } else {
-        // not found
-        cb(err);
+        requestProxy();
+      }
+
+      function requestProxy() {
+        if (that.options.proxy) {
+          // find file from remote server
+          that.getRemote(cb);
+        } else {
+          // not found
+          cb(err);
+        }
       }
     }
   });
@@ -46,15 +56,15 @@ File.prototype.getRemote = function(cb) {
   var that = this;
   var opt = {
     gzip: true,
-    followRedirect: true
+    followRedirect: false
   };
   request(this.remotePath, opt, function(err, data, res) {
     if (err) {
       that.emit('not found', that.remotePath);
       return cb(err);
     }
 
-    if (res.statusCode >= 400) {
+    if (res.statusCode >= 300) {
       that.emit('not found', that.remotePath);
       return cb(new Error(res.statusCode));
     }

test/file.js

@@ -17,6 +17,26 @@ describe('File', function() {
     };
   });
 
+  it('before proxy', function(done) {
+    options.beforeProxy = function(urlPath, cb, next) {
+      if (urlPath === 'beforeproxy.js') {
+        this.emit('found');
+        cb(null, 'beforeproxy');
+      } else {
+        next();
+      }
+    };
+
+    var spy = sinon.spy();
+    new File('beforeproxy.js', options)
+      .on('found', spy)
+      .end(function(err, data) {
+        data.should.be.eql('beforeproxy');
+        spy.calledOnce.should.be.true;
+        done();
+      });
+  });
+
   it('should response from local', function(done) {
     var spy = sinon.spy();
     new File('a.js', options)