Merge pull request #20 from yllieth/last-time-api-modifs

Last time api modifs

Author: yllieth

.gitignore

@@ -2,3 +2,5 @@ node_modules
 vendor
 .idea
 npm-debug.log
+.DS_Store
+.DS_Store?

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "predicsis_ml_sdk-javascript",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "authors": [
     "Yllieth <[email protected]>",
     "Dehau"

dist/predicsis-jsSDK.js

@@ -467,13 +467,17 @@ angular
      *
      * @param {String} fileName used to create the source and the dataset
      * @param {String} destFolder AWS key where the dataset has been uploaded
+     * @param {String} pathName name of the key used to provide destFolder
      * @return {Promise} Newly created dataset
      */
-    this.createFromUpload = function(fileName, destFolder) {
+    this.createFromUpload = function(fileName, destFolder, pathName) {
+      pathName = pathName || 'key';
 
       var Sources = $injector.get('Sources');
+      var source = { name: fileName, data_file: { filename: fileName } };
+      source[pathName] = destFolder;
 
-      return Sources.create({ path: destFolder, name: fileName, data_file: { filename: fileName } })
+      return Sources.create(source)
         .then(function(source) {
           return self.create({
             name: fileName,
@@ -2855,8 +2859,14 @@ angular
      *    key:  "path/to/my/file/on/s3/source.csv",
      *  }
      *  </pre>
+     *  <pre>
+     *  {
+     *    name: "Source of dataset.csv"
+     *    object:  "path/to/my/file/on/s3/source.csv",
+     *  }
+     *  </pre>
      *
-     *  Both <code>name</code> and <code>key</code> are required.
+     *  Both <code>name</code> and <code>key | object</code> are required.
      *
      * @param {Object} params See above example.
      * @return {Promise} New source
@@ -3420,6 +3430,7 @@ angular
       var uploadObject = concurrentUploads[uploadId] = {
         id: uploadId,
         path: null,
+        pathName: null,
         fileName: file.name,
         fileSize: file.size,
         progression: 0,
@@ -3437,7 +3448,13 @@ angular
       Sources
         .getCredentials(storageService)
         .then(function(credentials) {
-          uploadObject.path = credentials.path
+          if (credentials.type === 's3') {
+            uploadObject.path = credentials.key;
+            uploadObject.pathName = 'key';
+          } else if (credentials.type === 'swift') {
+            uploadObject.path = credentials.object;
+            uploadObject.pathName = 'object';
+          }
           upload(uploadObject, xhr2, credentials, file);
         });
     };

dist/predicsis-jsSDK.min.js

@@ -123,6 +123,7 @@ angular
       var uploadObject = concurrentUploads[uploadId] = {
         id: uploadId,
         path: null,
+        pathName: null,
         fileName: file.name,
         fileSize: file.size,
         progression: 0,
@@ -140,7 +141,13 @@ angular
       Sources
         .getCredentials(storageService)
         .then(function(credentials) {
-          uploadObject.path = credentials.path
+          if (credentials.type === 's3') {
+            uploadObject.path = credentials.key;
+            uploadObject.pathName = 'key';
+          } else if (credentials.type === 'swift') {
+            uploadObject.path = credentials.object;
+            uploadObject.pathName = 'object';
+          }
           upload(uploadObject, xhr2, credentials, file);
         });
     };

dist/predicsis-jsSDK.min.js.map

@@ -240,13 +240,17 @@ angular
      *
      * @param {String} fileName used to create the source and the dataset
      * @param {String} destFolder AWS key where the dataset has been uploaded
+     * @param {String} pathName name of the key used to provide destFolder ('key' for S3, 'object' for swift)
      * @return {Promise} Newly created dataset
      */
-    this.createFromUpload = function(fileName, destFolder) {
+    this.createFromUpload = function(fileName, destFolder, pathName) {
+      pathName = pathName || 'key';
 
       var Sources = $injector.get('Sources');
+      var source = { name: fileName, data_file: { filename: fileName } };
+      source[pathName] = destFolder;
 
-      return Sources.create({ path: destFolder, name: fileName, data_file: { filename: fileName } })
+      return Sources.create(source)
         .then(function(source) {
           return self.create({
             name: fileName,

lib/helper/uploadHelper.js

@@ -86,8 +86,14 @@ angular
      *    key:  "path/to/my/file/on/s3/source.csv",
      *  }
      *  </pre>
+     *  <pre>
+     *  {
+     *    name: "Source of dataset.csv"
+     *    object:  "path/to/my/file/on/s3/source.csv",
+     *  }
+     *  </pre>
      *
-     *  Both <code>name</code> and <code>key</code> are required.
+     *  Both <code>name</code> and <code>key | object</code> are required.
      *
      * @param {Object} params See above example.
      * @return {Promise} New source

lib/model/Datasets.js

@@ -1,6 +1,6 @@
 {
   "name": "predicsis_ml_sdk-javascript",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Javascript SDK for PredicSis ML API",
   "main": "index.js",
   "scripts": {