remove Layers.destroy, add Layer.destroy. cleanning layer in test end.

zyll · Jul 10, 2010 · c6266f1 · c6266f1
1 parent 2df47fb
commit c6266f1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/lib/pincaster/pincaster.js b/lib/pincaster/pincaster.js
@@ -167,6 +167,16 @@ Layer.prototype.create = function(callback) {
         .post('/api/1.0/layers/' + encodeURI(this.name) + '.json', {'content-type': 'application/x-www-form-urlencoded'})
 }
 
+/**
+ * Delete the layer.
+ * @param {Function} callback (err, ack) on operation complete.
+ */
+Layer.prototype.destroy = function(callback) {
+    new Query(this.pincaster)
+        .callback(callback)
+        .destroy('/api/1.0/layers/' + encodeURI(this.name) + '.json')
+}
+
 /**
  * Layers list. Allow querys on layers info.
  * @param {Pincaster} pincaster the server to use.
@@ -198,20 +208,6 @@ Layers.prototype.all = function(callback) {
         .get('/api/1.0/layers/index.json')
 }
 
-/**
- * Delete a layer from pincaster server.
- * @param {String||Layer} name the layer's himself or his name to delete.
- * @param {Function} callback (err, ack)
- */
-Layers.prototype.destroy = function(name, callback) {
-    if(name instanceof Layer) {
-        name = name.name
-    }
-    new Query(this.pincaster)
-        .callback(callback)
-        .destroy('/api/1.0/layers/' + encodeURI(name) + '.json')
-}
-
 /**
  * Defining a record.
  * @param {String} key the id of this record.

diff --git a/test/layer-test.js b/test/layer-test.js
@@ -48,7 +48,7 @@ vows.describe('Layer').addBatch({
 }).addBatch({
     'when destroying': {
         topic: function() {
-            layers.destroy(layer, this.callback)
+            layer.destroy(this.callback)
         },
         'is deleted': function (err, topic) {
             assert.isNull(err)

diff --git a/test/record-test.js b/test/record-test.js
@@ -62,5 +62,15 @@ vows.describe('Records').addBatch({
             assert.deepEqual(content.properties, {update_field: "new value"})
         }
     }
+}).addBatch({
+    'when deleting a layer': {
+        topic: function() {
+            layer2.destroy(this.callback)
+        },
+        'ack': function (err, content) {
+            assert.isNull(err)
+            assert.equal(content.status, 'deleted')
+        }
+    }
     // todo test destroy layer.
 }).export(module)