Fixed method 'getFile' of Container object, to reflect changes in cor…

…e.js
nodejitsu · Dec 1, 2010 · 4af8b4a · 4af8b4a
1 parent 74607d1
commit 4af8b4a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/lib/cloudfiles/container.js b/lib/cloudfiles/container.js
@@ -31,9 +31,17 @@ Container.prototype = {
     this.client.destoryContainer(this.name, callback);
   },
 
-  getFiles: function (callback) {
+  getFiles: function (download, callback) {
     var self = this;
-    this.client.getFiles(this.name, function (err, files) {
+
+    // download can be omitted: (...).getFiles(callback);
+    // In this case first argument will be a function
+    if (typeof download === 'function' && !(download instanceof RegExp)) {
+      callback = download;
+      download = false;
+    }
+
+    this.client.getFiles(this.name, download, function (err, files) {
       self.files = files;
       callback(null, files);
     });
@@ -61,4 +69,4 @@ Container.prototype = {
     this.count = details.count || 0;
     this.bytes = details.bytes || 0;
   }
-};
+};
diff --git a/lib/cloudfiles/core.js b/lib/cloudfiles/core.js
@@ -170,6 +170,7 @@ Cloudfiles.prototype.getFiles = function (container, download, callback) {
         file.container = container;
         return new (cloudfiles.StorageObject)(self, file);
       });
+
       callback(null, results);
       return;
     }
@@ -288,4 +289,4 @@ Cloudfiles.prototype.cdnUrl = function () {
       json = (typeof(args[args.length - 1]) === 'boolean') && args.pop();
 
   return [this.config.cdnUrl].concat(args).join('/') + (json ? '?format=json' : '');
-};
+};
diff --git a/test/data/test-config.json b/test/data/test-config.json
@@ -3,4 +3,4 @@
     "username": "test-username",
     "apiKey": "test-apiKey"
   }
-}
+}