Fix for buckets in regions other than US east

The other regions require that you put the bucket into the endpoint (hostname). So
instead of sending the request to s3.amazonaws.com/bucketname/key you need to use
bucketname.s3.amazonaws.com/key. But the resource path that is part of the signature
is still /bucketname/key.

Signed-off-by: Tj Holowaychuk <tj@vision-media.ca>

lib/knox/client.js

@@ -31,11 +31,12 @@ var utils = require('./utils')
  */
 
 var Client = module.exports = exports = function Client(options) {
-  this.host = 's3.amazonaws.com';
+  if (!options.key) throw new Error('aws "key" required');
+  if (!options.secret) throw new Error('aws "secret" required');
+  if (!options.bucket) throw new Error('aws "bucket" required');
+
+  this.endpoint = options.bucket + '.s3.amazonaws.com';
   utils.merge(this, options);
-  if (!this.key) throw new Error('aws "key" required');
-  if (!this.secret) throw new Error('aws "secret" required');
-  if (!this.bucket) throw new Error('aws "bucket" required');
 };
 
 /**
@@ -49,15 +50,14 @@ var Client = module.exports = exports = function Client(options) {
  */
 
 Client.prototype.request = function(method, filename, headers){
-  var options = { host: this.host, port: 80 }
-    , path = join('/', this.bucket, filename)
+  var options = { host: this.endpoint, port: 80 }
     , date = new Date
     , headers = headers || {};
 
   // Default headers
   utils.merge(headers, {
       Date: date.toUTCString()
-    , Host: this.host
+    , Host: this.endpoint
   });
 
   // Authorization header
@@ -66,14 +66,14 @@ Client.prototype.request = function(method, filename, headers){
     , secret: this.secret
     , verb: method
     , date: date
-    , resource: url.parse(path).pathname
+    , resource: join('/', this.bucket, filename)
     , contentType: headers['Content-Type']
     , amazonHeaders: auth.canonicalizeHeaders(headers)
   });
 
   // Issue request
   options.method = method;
-  options.path = path;
+  options.path = join('/', filename);
   options.headers = headers;
   var req = http.request(options);
   req.url = this.url(filename);
@@ -303,7 +303,7 @@ Client.prototype.deleteFile = function(filename, headers, fn){
  */
 
 Client.prototype.url = function(filename){
-  return 'http://' + this.bucket + '.' + this.host + join('/', filename);
+  return 'http://' + join(this.endpoint, filename);
 };
 
 /**

test/knox.test.js

@@ -58,9 +58,20 @@ module.exports = {
     assert.equal('foobar', client.key);
     assert.equal('baz', client.secret);
     assert.equal('misc', client.bucket);
-    assert.equal('s3.amazonaws.com', client.host);
+    assert.equal('misc.s3.amazonaws.com', client.endpoint);
   },
 
+  'test .createClient() custom endpoint': function(assert){
+    var client = knox.createClient({
+        key: 'foobar'
+      , secret: 'baz'
+      , bucket: 'misc'
+      , endpoint: 's3-eu-west-1.amazonaws.com'
+    });
+
+    assert.equal('s3-eu-west-1.amazonaws.com', client.endpoint);
+  },
+
   'test .putFile()': function(assert, done){
     var n = 0;
     client.putFile(jsonFixture, '/test/user.json', function(err, res){