add exists method; split out File-specific operations

Author: Anthony Nowell

examples/string-write.js

@@ -13,7 +13,16 @@ var client = algorithmia.client(process.env.ALGORITHMIA_API_KEY);
 
 // === Create/Update file
 var content = "Hello this is a test";
-client.file("data://.my/TestCollection/foo.txt").putString(content, function(response) {
-	console.log(response);
+
+var f = client.file("data://.my/TestCollection/foo.txt");
+
+f.exists(function(exists) {
+    if(exists) {
+        console.log("File already existed. Overwriting.");
+    }
+    f.putString(content, function(response) {
+        console.log(response);
+    });
 });
 
+

lib/algorithmia.js

@@ -1,4 +1,4 @@
-var Algorithm, AlgorithmiaClient, Data, algorithmia, defaultApiAddress, exports, http, https, packageJson, url;
+var Algorithm, AlgorithmiaClient, File, algorithmia, defaultApiAddress, exports, http, https, packageJson, url;
 
 https = require('https');
 
@@ -10,7 +10,7 @@ packageJson = require('../package.json');
 
 Algorithm = require('./algorithm.js');
 
-Data = require('./data.js');
+File = require('./file.js');
 
 defaultApiAddress = 'https://api.algorithmia.com';
 
@@ -34,7 +34,7 @@ AlgorithmiaClient = (function() {
   };
 
   AlgorithmiaClient.prototype.file = function(path) {
-    return new Data(this, path);
+    return new File(this, path);
   };
 
   AlgorithmiaClient.prototype.req = function(path, method, data, cheaders, callback) {

lib/data.js

@@ -9,36 +9,19 @@ Data = (function() {
     this.data_path = path.replace(/data\:\/\//, '');
   }
 
-  Data.prototype.putString = function(content, callback) {
-    var headers;
-    headers = {
-      'Content-Type': 'text/plain'
-    };
-    return this.client.req('/v1/data/' + this.data_path, 'PUT', content, headers, callback);
-  };
-
-  Data.prototype.putJson = function(content, callback) {
-    var headers;
-    headers = {
-      'Content-Type': 'application/JSON'
-    };
-    return this.client.req('/v1/data/' + this.data_path, 'PUT', content, headers, callback);
-  };
-
-  Data.prototype.getString = function(callback) {
-    var headers;
-    headers = {
-      'Accept': 'text/plain'
-    };
-    return this.client.req('/v1/data/' + this.data_path, 'GET', '', headers, callback);
-  };
-
-  Data.prototype.getJson = function(callback) {
+  Data.prototype.exists = function(callback) {
     var headers;
     headers = {
+      'Content-Type': 'text/plain',
       'Accept': 'text/plain'
     };
-    return this.client.req('/v1/data/' + this.data_path, 'GET', '', headers, callback);
+    return this.client.req('/v1/data/' + this.data_path, 'HEAD', '', headers, function(response, status) {
+      if (status === 200) {
+        return callback(true);
+      } else {
+        return callback(false);
+      }
+    });
   };
 
   return Data;

lib/file.js

@@ -0,0 +1,50 @@
+var Data, File, exports,
+  extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  hasProp = {}.hasOwnProperty;
+
+Data = require('./data.js');
+
+File = (function(superClass) {
+  extend(File, superClass);
+
+  function File() {
+    return File.__super__.constructor.apply(this, arguments);
+  }
+
+  File.prototype.putString = function(content, callback) {
+    var headers;
+    headers = {
+      'Content-Type': 'text/plain'
+    };
+    return this.client.req('/v1/data/' + this.data_path, 'PUT', content, headers, callback);
+  };
+
+  File.prototype.putJson = function(content, callback) {
+    var headers;
+    headers = {
+      'Content-Type': 'application/JSON'
+    };
+    return this.client.req('/v1/data/' + this.data_path, 'PUT', content, headers, callback);
+  };
+
+  File.prototype.getString = function(callback) {
+    var headers;
+    headers = {
+      'Accept': 'text/plain'
+    };
+    return this.client.req('/v1/data/' + this.data_path, 'GET', '', headers, callback);
+  };
+
+  File.prototype.getJson = function(callback) {
+    var headers;
+    headers = {
+      'Accept': 'application/JSON'
+    };
+    return this.client.req('/v1/data/' + this.data_path, 'GET', '', headers, callback);
+  };
+
+  return File;
+
+})(Data);
+
+module.exports = exports = File;

src/algorithmia.coffee

@@ -4,7 +4,7 @@ url = require('url')
 packageJson = require('../package.json')
 
 Algorithm = require('./algorithm.js')
-Data = require('./data.js')
+File = require('./file.js')
 
 defaultApiAddress = 'https://api.algorithmia.com'
 
@@ -27,7 +27,7 @@ class AlgorithmiaClient
 
   # file
   file: (path) ->
-    new Data(this, path)
+    new File(this, path)
 
   # internal http-helper
   req: (path, method, data, cheaders, callback) ->

src/data.coffee

@@ -11,28 +11,13 @@ class Data
 
     @data_path = path.replace /data\:\/\//, ''
 
-  # put string
-  putString: (content, callback) ->
+  # This is similar to node's fs.exists function
+  exists: (callback) ->
     headers =
       'Content-Type': 'text/plain'
-    @client.req('/v1/data/' + @data_path, 'PUT', content, headers, callback)
-
-  # put json
-  putJson: (content, callback) ->
-    headers =
-      'Content-Type': 'application/JSON'
-    @client.req('/v1/data/' + @data_path, 'PUT', content, headers, callback)
-
-  # get string
-  getString: (callback) ->
-    headers =
-      'Accept': 'text/plain'
-    @client.req('/v1/data/' + @data_path, 'GET', '', headers, callback)
-
-  # get json
-  getJson: (callback) ->
-    headers =
       'Accept': 'text/plain'
-    @client.req('/v1/data/' + @data_path, 'GET', '', headers, callback)
+    @client.req('/v1/data/' + @data_path, 'HEAD', '', headers, (response, status) ->
+      if status == 200 then callback(true) else callback(false)
+    )
 
 module.exports = exports = Data

src/file.coffee

@@ -0,0 +1,34 @@
+#
+# Data.coffee
+#
+
+Data = require('./data.js')
+
+
+class File extends Data
+  # put string
+  putString: (content, callback) ->
+    headers =
+      'Content-Type': 'text/plain'
+    @client.req('/v1/data/' + @data_path, 'PUT', content, headers, callback)
+
+  # put json
+  putJson: (content, callback) ->
+    headers =
+      'Content-Type': 'application/JSON'
+    @client.req('/v1/data/' + @data_path, 'PUT', content, headers, callback)
+
+  # get string
+  getString: (callback) ->
+    headers =
+      'Accept': 'text/plain'
+    @client.req('/v1/data/' + @data_path, 'GET', '', headers, callback)
+
+  # get json
+  getJson: (callback) ->
+    headers =
+      'Accept': 'application/JSON'
+    @client.req('/v1/data/' + @data_path, 'GET', '', headers, callback)
+
+
+module.exports = exports = File