Skip to content

Commit b000f81

Browse files
Merge pull request #359 from ryanseys/fix-storage-roles
fix storage acl roles documentation
2 parents ef34525 + 2e5a132 commit b000f81

4 files changed

Lines changed: 24 additions & 17 deletions

File tree

lib/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ var util = require('./common/util.js');
9696
* // projectId: 'my-project'
9797
* // });
9898
*
99-
* var bucket = gcloud.storage.bucket({
99+
* var storage = gcloud.storage();
100+
* var bucket = storage.bucket({
100101
* name: 'PhotosBucket',
101102
* // properties may be overridden:
102103
* keyFilename: '/path/to/other/keyfile.json'

lib/storage/bucket.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,14 @@ var RESUMABLE_THRESHOLD = 5000000;
7676
*
7777
* @example
7878
* var gcloud = require('gcloud');
79+
* var storage = gcloud.storage();
7980
*
8081
* // From Google Compute Engine
81-
* var albums = gcloud.storage.bucket('albums');
82+
* var albums = storage.bucket('albums');
8283
*
8384
* // From elsewhere
84-
* var photos = gcloud.storage.bucket({
85-
* keyFilename: '/path/to/keyfile.json',
85+
* var photos = storage.bucket({
86+
* keyFilename: '/path/to/keyfile.json', // If you have not yet provided it.
8687
* name: 'bucket'
8788
* });
8889
*/
@@ -126,7 +127,7 @@ function Bucket(storage, name) {
126127
* //-
127128
* myBucket.acl.add({
128129
* scope: 'allUsers',
129-
* permission: Storage.acl.READER_ROLE
130+
* permission: storage.acl.READER_ROLE
130131
* }, function(err, aclObject) {});
131132
*/
132133
this.acl = new Acl({

lib/storage/file.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ function File(bucket, name, metadata) {
101101
* //-
102102
* myFile.acl.add({
103103
* scope: 'allUsers',
104-
* permission: Storage.acl.READER_ROLE
104+
* permission: storage.acl.READER_ROLE
105105
* }, function(err, aclObject) {});
106106
*/
107107
this.acl = new Acl({

lib/storage/index.js

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ var STORAGE_BASE_URL = 'https://www.googleapis.com/storage/v1/b';
7474
* //-
7575
*
7676
* // Access `storage` through the `gcloud` module directly.
77-
* var musicBucket = gcloud.storage().bucket('music');
77+
* var storage = gcloud.storage();
78+
* var musicBucket = storage.bucket('music');
7879
*
7980
* //-
8081
* // Elsewhere.
@@ -86,8 +87,10 @@ var STORAGE_BASE_URL = 'https://www.googleapis.com/storage/v1/b';
8687
* projectId: 'my-project'
8788
* });
8889
*
89-
* var albums = myProject.storage().bucket('albums');
90-
* var photos = myProject.storage().bucket('photos');
90+
* // Use default configuration details.
91+
* var storage = myProject.storage();
92+
* var albums = storage.bucket('albums');
93+
* var photos = storage.bucket('photos');
9194
*
9295
*
9396
* // Override default configuration details.
@@ -118,9 +121,9 @@ function Storage(config) {
118121
* This object provides constants to refer to the three permission levels that
119122
* can be granted to a scope:
120123
*
121-
* - `Storage.acl.OWNER_ROLE` - ("OWNER")
122-
* - `Storage.acl.READER_ROLE` - ("READER")
123-
* - `Storage.acl.WRITER_ROLE` - ("WRITER")
124+
* - `storage.acl.OWNER_ROLE` - ("OWNER")
125+
* - `storage.acl.READER_ROLE` - ("READER")
126+
* - `storage.acl.WRITER_ROLE` - ("WRITER")
124127
*
125128
* For more detailed information, see
126129
* [About Access Control Lists](http://goo.gl/6qBBPO).
@@ -136,15 +139,15 @@ function Storage(config) {
136139
* //-
137140
* albums.acl.add({
138141
* scope: 'allUsers',
139-
* permission: Storage.acl.READER_ROLE
142+
* permission: storage.acl.READER_ROLE
140143
* }, function(err, aclObject) {});
141144
*
142145
* //-
143146
* // Make any new objects added to a bucket publicly readable.
144147
* //-
145148
* albums.acl.default.add({
146149
* scope: 'allUsers',
147-
* permission: Storage.acl.READER_ROLE
150+
* permission: storage.acl.READER_ROLE
148151
* }, function(err, aclObject) {});
149152
*
150153
* //-
@@ -153,7 +156,7 @@ function Storage(config) {
153156
*
154157
* albums.acl.add({
155158
* scope: 'user-useremail@example.com',
156-
* permission: Storage.acl.OWNER_ROLE
159+
* permission: storage.acl.OWNER_ROLE
157160
* }, function(err, aclObject) {});
158161
*/
159162
Storage.acl = {
@@ -175,8 +178,10 @@ Storage.prototype.acl = Storage.acl;
175178
* keyFilename: '/path/to/keyfile.json'
176179
* });
177180
*
178-
* var albums = gcloud.storage().bucket('albums');
179-
* var photos = gcloud.storage().bucket('photos');
181+
* var storage = gcloud.storage();
182+
*
183+
* var albums = storage.bucket('albums');
184+
* var photos = storage.bucket('photos');
180185
*/
181186
Storage.prototype.bucket = function(name) {
182187
return new Bucket(this, name);

0 commit comments

Comments
 (0)