Skip to content

storage: set metadata on Bucket after creation #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanseys merged 1 commit into from
Nov 4, 2014
Merged

storage: set metadata on Bucket after creation #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/storage/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,14 @@ Storage.prototype.createBucket = function(name, metadata, callback) {
var body = extend(metadata, {
name: name
});
this.makeReq_('POST', '', query, body, function(err) {
this.makeReq_('POST', '', query, body, function(err, resp) {
if (err) {
callback(err);
return;
}
return callback(null, this.bucket(name));
var bucket = this.bucket(name);
bucket.metadata = resp;
callback(null, bucket);
}.bind(this));
};

Expand Down
40 changes: 25 additions & 15 deletions test/storage/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,35 +73,42 @@ describe('Storage', function() {
});

describe('createBucket', function() {
var newBucketName = 'new-bucket-name';
var BUCKET_NAME = 'new-bucket-name';
var METADATA = { a: 'b', c: { d: 'e' } };
var BUCKET = { name: BUCKET_NAME };

beforeEach(function() {
it('should make correct API request', function(done) {
storage.makeReq_ = function(method, path, query, body, callback) {
assert.equal(method, 'POST');
assert.equal(path, '');
assert.equal(query.project, storage.projectId);
assert.equal(body.name, newBucketName);
callback(null);
assert.equal(body.name, BUCKET_NAME);
callback();
};

storage.createBucket(BUCKET_NAME, done);
});

it('should accept a name, metadata, and callback', function(done) {
var metadata = { a: 'b', c: { d: 'e' } };
storage.makeReq_ = function(method, path, query, body, callback) {
assert.deepEqual(body, extend(metadata, { name: newBucketName }));
callback(null);
assert.deepEqual(body, extend(METADATA, { name: BUCKET_NAME }));
callback(null, METADATA);
};
storage.bucket = function(name) {
assert.equal(name, newBucketName);
assert.equal(name, BUCKET_NAME);
return BUCKET;
};
storage.createBucket(newBucketName, metadata, function(err) {
storage.createBucket(BUCKET_NAME, METADATA, function(err) {
assert.ifError(err);
done();
});
});

it('should accept a name and callback only', function(done) {
storage.createBucket(newBucketName, done);
storage.makeReq_ = function(method, path, query, body, callback) {
callback();
};
storage.createBucket(BUCKET_NAME, done);
});

it('should throw if no name is provided', function() {
Expand All @@ -111,13 +118,16 @@ describe('Storage', function() {
});

it('should execute callback with bucket', function(done) {
var fakeBucket = { fake: 'bucket' };
storage.bucket = function() {
return fakeBucket;
return BUCKET;
};
storage.makeReq_ = function(method, path, query, body, callback) {
callback(null, METADATA);
};
storage.createBucket(newBucketName, function(err, bucket) {
storage.createBucket(BUCKET_NAME, function(err, bucket) {
assert.ifError(err);
assert.deepEqual(bucket, fakeBucket);
assert.deepEqual(bucket, BUCKET);
assert.deepEqual(bucket.metadata, METADATA);
done();
});
});
Expand All @@ -127,7 +137,7 @@ describe('Storage', function() {
storage.makeReq_ = function(method, path, query, body, callback) {
callback(error);
};
storage.createBucket(newBucketName, function(err) {
storage.createBucket(BUCKET_NAME, function(err) {
assert.equal(err, error);
done();
});
Expand Down