Some fixes to Automatic API Storage to be used easily with MappingStorage

and push to ERP5.

dist/jio-v3.23.1.js

@@ -14535,13 +14535,13 @@ return new Parser;
           var path, temp;
           path = URI(dat.url).path();
           temp = {
-            'path': path,
+            'automatic_path': path,
             'reference': '/' + user_id + path,
             'id': '/' + user_id + path,
             'type': type,
             'started_at': dat.started_at || null,
             'ended_at': dat.ended_at || null,
-            'user': user_id
+            'automatic_user': user_id
           };
           result.push(temp);
           return jio._cache.put('/' + user_id + path, temp).push(function () {
@@ -14692,16 +14692,26 @@ return new Parser;
     });
   };
 
-  AutomaticAPIStorage.prototype.put = function () {
-    return;
+  AutomaticAPIStorage.prototype.put = function (id, doc) {
+    var self = this;
+    return new RSVP.Queue().push(function () {
+      return self._cache.get(id);
+    }).push(function () {
+      return self._cache.put(id, doc);
+    });
   };
 
   AutomaticAPIStorage.prototype.post = function () {
     return;
   };
 
-  AutomaticAPIStorage.prototype.remove = function () {
-    return;
+  AutomaticAPIStorage.prototype.remove = function (id) {
+    var self = this;
+    return new RSVP.Queue().push(function () {
+      return self._cache.get(id);
+    }).push(function () {
+      return self._cache.remove(id);
+    });
   };
 
   AutomaticAPIStorage.prototype.getAttachment = function (id, name, options) {
@@ -14734,8 +14744,13 @@ return new Parser;
     });
   };
 
-  AutomaticAPIStorage.prototype.putAttachment = function () {
-    return;
+  AutomaticAPIStorage.prototype.putAttachment = function (id, name, blob) {
+    var self = this;
+    return new RSVP.Queue().push(function () {
+      return self._cache.get(id);
+    }).push(function () {
+      return self._cache.putAttachment(id, name, blob);
+    });
   };
 
   AutomaticAPIStorage.prototype.removeAttachment = function () {

src/jio.storage/automaticapistorage.js

@@ -93,13 +93,13 @@
           var path, temp;
           path = URI(dat.url).path();
           temp = {
-            'path': path,
+            'automatic_path': path,
             'reference': '/' + user_id + path,
             'id': '/' + user_id + path,
             'type': type,
             'started_at': dat.started_at || null,
             'ended_at': dat.ended_at || null,
-            'user': user_id
+            'automatic_user': user_id
           };
           result.push(temp);
           return jio._cache.put('/' + user_id + path, temp).push(function () {
@@ -250,16 +250,26 @@
     });
   };
 
-  AutomaticAPIStorage.prototype.put = function () {
-    return;
+  AutomaticAPIStorage.prototype.put = function (id, doc) {
+    var self = this;
+    return new RSVP.Queue().push(function () {
+      return self._cache.get(id);
+    }).push(function () {
+      return self._cache.put(id, doc);
+    });
   };
 
   AutomaticAPIStorage.prototype.post = function () {
     return;
   };
 
-  AutomaticAPIStorage.prototype.remove = function () {
-    return;
+  AutomaticAPIStorage.prototype.remove = function (id) {
+    var self = this;
+    return new RSVP.Queue().push(function () {
+      return self._cache.get(id);
+    }).push(function () {
+      return self._cache.remove(id);
+    });
   };
 
   AutomaticAPIStorage.prototype.getAttachment = function (id, name, options) {
@@ -292,8 +302,13 @@
     });
   };
 
-  AutomaticAPIStorage.prototype.putAttachment = function () {
-    return;
+  AutomaticAPIStorage.prototype.putAttachment = function (id, name, blob) {
+    var self = this;
+    return new RSVP.Queue().push(function () {
+      return self._cache.get(id);
+    }).push(function () {
+      return self._cache.putAttachment(id, name, blob);
+    });
   };
 
   AutomaticAPIStorage.prototype.removeAttachment = function () {

test/jio.storage/automaticapistorage.tests.js

@@ -211,13 +211,13 @@
     this.jio.get("/usertest/trip/T_randomtrip/")
       .then(function (result) {
         deepEqual(result, {
-          'path': '/trip/T_randomtrip/',
+          'automatic_path': '/trip/T_randomtrip/',
           'reference': '/usertest/trip/T_randomtrip/',
           'id': '/usertest/trip/T_randomtrip/',
           'type': 'trip',
           'started_at': null,
           'ended_at': null,
-          'user': 'usertest'
+          'automatic_user': 'usertest'
         }, "Check single element type");
       })
       .fail(function (error) {
@@ -513,13 +513,13 @@
     })
       .then(function (result) {
         deepEqual(result, [{
-          'path': '/trip/T_example/',
+          'automatic_path': '/trip/T_example/',
           'reference': '/0/trip/T_example/',
           'id': '/0/trip/T_example/',
           'type': 'trip',
           'started_at': "2017-06-17T16:45:41Z",
           'ended_at': "2017-06-17T16:46:38Z",
-          'user': '0'
+          'automatic_user': '0'
         }], "Check trip is returned in result");
       })
       .fail(function (error) {
@@ -551,13 +551,13 @@
     })
       .then(function (result) {
         deepEqual(result, [{
-          'path': '/trip/T_example/',
+          'automatic_path': '/trip/T_example/',
           'reference': '/0/trip/T_example/',
           'id': '/0/trip/T_example/',
           'type': 'trip',
           'started_at': "2017-06-17T16:45:41Z",
           'ended_at': "2017-06-17T16:46:38Z",
-          'user': '0'
+          'automatic_user': '0'
         }], "Check trip is returned in result");
       })
       .fail(function (error) {
@@ -602,13 +602,13 @@
     })
       .then(function (result) {
         deepEqual(result, [{
-          'path': '/vehicle/V_example/',
+          'automatic_path': '/vehicle/V_example/',
           'reference': '/0/vehicle/V_example/',
           'id': '/0/vehicle/V_example/',
           'type': 'vehicle',
           'started_at': null,
           'ended_at': null,
-          'user': '0'
+          'automatic_user': '0'
         }], "Check vehicle list is returned");
       })
       .fail(function (error) {
@@ -658,21 +658,21 @@
     })
       .then(function (result) {
         deepEqual(result, [{
-          'path': '/vehicle/V_example/',
+          'automatic_path': '/vehicle/V_example/',
           'reference': '/0/vehicle/V_example/',
           'id': '/0/vehicle/V_example/',
           'type': 'vehicle',
           'started_at': null,
           'ended_at': null,
-          'user': '0'
+          'automatic_user': '0'
         }, {
-          'path': '/vehicle/V_example2/',
+          'automatic_path': '/vehicle/V_example2/',
           'reference': '/0/vehicle/V_example2/',
           'id': '/0/vehicle/V_example2/',
           'type': 'vehicle',
           'started_at': null,
           'ended_at': null,
-          'user': '0'
+          'automatic_user': '0'
         }], "Check vehicle list is returned");
       })
       .fail(function (error) {