Merge remote-tracking branch 'romain/wip' into nodejs-romain

Conflicts:
	src/jio.storage/erp5storage.js

package.json

 {
   "name": "jio",
-  "version": "v3.16.0",
+  "version": "v3.17.0",
   "license": "LGPLv3",
   "author": "Nexedi SA",
   "contributors": [
@@ -29,7 +29,7 @@
     "cloud"
   ],
   "dependencies": {
-    "rsvp": "git+https://lab.nexedi.com/nexedi/rsvp.js.git",
+    "rsvp": "git+https://lab.nexedi.com/romain/rsvp.js.git#wip",
     "uritemplate": "git+https://lab.nexedi.com/nexedi/uritemplate-js.git",
     "moment": "2.13.0",
     "rusha": "0.8.2",
@@ -45,7 +45,7 @@
     "sinon": "~2.1.0"
   },
   "devDependencies": {
-    "renderjs": "git+https://lab.nexedi.com/nexedi/renderjs.git",
+    "renderjs": "git+https://lab.nexedi.com/romain/renderjs.git#wip",
     "grunt": "0.4.x",
     "grunt-cli": "~0.1.11",
     "grunt-contrib-concat": "0.3.x",

src/jio.storage/cryptstorage.js

@@ -105,12 +105,12 @@
       })
       .push(function (dataURL) {
         //string->arraybuffer
-        var strLen = dataURL.currentTarget.result.length,
+        var strLen = dataURL.target.result.length,
           buf = new ArrayBuffer(strLen),
           bufView = new Uint8Array(buf),
           i;
 
-        dataURL = dataURL.currentTarget.result;
+        dataURL = dataURL.target.result;
         for (i = 0; i < strLen; i += 1) {
           bufView[i] = dataURL.charCodeAt(i);
         }
@@ -147,7 +147,7 @@
           .push(function (coded) {
             var initializaton_vector;
 
-            coded = coded.currentTarget.result;
+            coded = coded.target.result;
             initializaton_vector = new Uint8Array(coded.slice(0, 12));
             return new RSVP.Queue()
               .push(function () {

src/jio.storage/erp5storage.js

@@ -171,57 +171,6 @@
       });
   };
 
-  ERP5Storage.prototype.bulk = function (request_list) {
-    var i,
-      storage = this,
-      bulk_list = [];
-
-
-    for (i = 0; i < request_list.length; i += 1) {
-      if (request_list[i].method !== "get") {
-        throw new Error("ERP5Storage: not supported " +
-                        request_list[i].method + " in bulk");
-      }
-      bulk_list.push({
-        relative_url: request_list[i].parameter_list[0],
-        view: storage._default_view_reference
-      });
-    }
-    return getSiteDocument(storage)
-      .push(function (site_hal) {
-        var form_data = new FormData();
-        form_data.append("bulk_list", JSON.stringify(bulk_list));
-        return jIO.util.ajax({
-          "type": "POST",
-          "url": site_hal._actions.bulk.href,
-          "data": form_data,
-//           "headers": {
-//             "Content-Type": "application/json"
-//           },
-          "xhrFields": {
-            withCredentials: storage._thisCredentials
-          },
-          "headers": storage._headers
-        });
-      })
-      .push(function (response) {
-        var result_list = [],
-          hateoas = JSON.parse(response.target.responseText);
-
-        function pushResult(json) {
-          return extractPropertyFromFormJSON(json)
-            .push(function (json2) {
-              return convertJSONToGet(json2);
-            });
-        }
-
-        for (i = 0; i < hateoas.result_list.length; i += 1) {
-          result_list.push(pushResult(hateoas.result_list[i]));
-        }
-        return RSVP.all(result_list);
-      });
-  };
-
   ERP5Storage.prototype.post = function (data) {
     var storage = this,
       new_id;
@@ -457,7 +406,7 @@
   ERP5Storage.prototype.hasCapacity = function (name) {
     return ((name === "list") || (name === "query") ||
             (name === "select") || (name === "limit") ||
-            (name === "sort")) || (name === "bulk_get");
+            (name === "sort"));
   };
 
   function isSingleLocalRoles(parsed_query) {

src/jio.storage/websqlstorage.js

@@ -179,7 +179,7 @@
       return jIO.util.readBlobAsDataURL(blob);
     })
       .push(function (strBlob) {
-        argument_list[index + 2].push(strBlob.currentTarget.result);
+        argument_list[index + 2].push(strBlob.target.result);
         return;
       });
   }

test/jio.storage/cryptstorage.tests.js

@@ -458,7 +458,7 @@
       .push(function (coded) {
         var iv;
 
-        coded = coded.currentTarget.result;
+        coded = coded.target.result;
         iv = new Uint8Array(coded.slice(0, 12));
         return crypto.subtle.decrypt({name : "AES-GCM", iv : iv},
                                      decryptKey, coded.slice(12));

test/jio.storage/erp5storage.tests.js

@@ -15,7 +15,6 @@
     search_template = domain + "?mode=search{&query,select_list*,limit*," +
       "sort_on*,local_roles*}",
     add_url = domain + "lets?add=somedocument",
-    bulk_url = domain + "lets?run=bulk",
     root_hateoas = JSON.stringify({
       "_links": {
         traverse: {
@@ -30,9 +29,6 @@
       "_actions": {
         add: {
           href: add_url
-        },
-        bulk: {
-          href: bulk_url
         }
       }
     });
@@ -1964,202 +1960,4 @@
       });
   });
 
-  /////////////////////////////////////////////////////////////////
-  // erp5Storage.bulk
-  /////////////////////////////////////////////////////////////////
-  module("erp5Storage.bulk", {
-    setup: function () {
-
-      this.server = sinon.fakeServer.create();
-      this.server.autoRespond = true;
-      this.server.autoRespondAfter = 5;
-
-      this.spy = sinon.spy(FormData.prototype, "append");
-
-      this.jio = jIO.createJIO({
-        type: "erp5",
-        url: domain,
-        default_view_reference: "bar_view"
-      });
-    },
-    teardown: function () {
-      this.server.restore();
-      delete this.server;
-      this.spy.restore();
-      delete this.spy;
-    }
-  });
-
-  test("bulk get ERP5 document list", function () {
-    var id = "person_module/20150119_azerty",
-      id2 = "person_module/20150219_azerty",
-      context = this,
-      document_hateoas = JSON.stringify({
-        // Kept property
-        "title": "foo",
-        // Remove all _ properties
-        "_bar": "john doo",
-        "_links": {
-          type: {
-            name: "Person"
-          },
-          parent: {
-            href: "urn:jio:get:bar_module"
-          }
-        },
-        "_embedded": {
-          "_view": {
-            form_id: {
-              key: "form_id",
-              "default": "Base_view"
-            },
-            my_title: {
-              key: "field_my_title",
-              "default": "foo",
-              editable: true,
-              type: "StringField"
-            },
-            my_id: {
-              key: "field_my_id",
-              "default": "",
-              editable: true,
-              type: "StringField"
-            },
-            my_title_non_editable: {
-              key: "field_my_title_non_editable",
-              "default": "foo",
-              editable: false,
-              type: "StringField"
-            },
-            my_start_date: {
-              key: "field_my_start_date",
-              "default": "foo",
-              editable: true,
-              type: "DateTimeField"
-            },
-            your_reference: {
-              key: "field_your_reference",
-              "default": "bar",
-              editable: true,
-              type: "StringField"
-            },
-            your_reference_non_editable: {
-              key: "field_your_reference_non_editable",
-              "default": "bar",
-              editable: false,
-              type: "StringField"
-            },
-            sort_index: {
-              key: "field_sort_index",
-              "default": "foobar",
-              editable: true,
-              type: "StringField"
-            },
-            "_actions": {
-              put: {
-                href: "one erp5 url"
-              }
-            }
-          }
-        }
-      }),
-      document_hateoas2 = JSON.stringify({
-        // Kept property
-        "title": "foo2",
-        // Remove all _ properties
-        "_bar": "john doo2",
-        "_links": {
-          type: {
-            name: "Person"
-          }
-        },
-        "_embedded": {
-          "_view": {
-            form_id: {
-              key: "form_id",
-              "default": "Base_view"
-            },
-            "_actions": {
-              put: {
-                href: "one erp5 url"
-              }
-            }
-          }
-        }
-      }),
-      bulk_hateoas = JSON.parse(root_hateoas),
-      server = this.server;
-
-    bulk_hateoas.result_list = [
-      JSON.parse(document_hateoas),
-      JSON.parse(document_hateoas2)
-    ];
-    bulk_hateoas = JSON.stringify(bulk_hateoas);
-
-    this.server.respondWith("GET", domain, [200, {
-      "Content-Type": "application/hal+json"
-    }, root_hateoas]);
-    this.server.respondWith("POST", bulk_url, [200, {
-      "Content-Type": "application/hal+json"
-    }, bulk_hateoas]);
-
-    stop();
-    expect(15);
-
-    this.jio.bulk([{
-      method: "get",
-      parameter_list: [id]
-    }, {
-      method: "get",
-      parameter_list: [id2]
-    }])
-      .then(function (result_list) {
-        equal(server.requests.length, 2);
-        equal(server.requests[0].method, "GET");
-        equal(server.requests[0].url, domain);
-        equal(server.requests[0].requestBody, undefined);
-        equal(server.requests[0].withCredentials, true);
-
-        equal(server.requests[1].method, "POST");
-        equal(server.requests[1].url, bulk_url);
-        // XXX Check form data
-        ok(server.requests[1].requestBody instanceof FormData);
-
-        ok(context.spy.calledOnce, "FormData.append count " +
-           context.spy.callCount);
-        equal(context.spy.firstCall.args[0], "bulk_list", "First append call");
-        equal(context.spy.firstCall.args[1],
-              JSON.stringify([{
-            relative_url: "person_module/20150119_azerty",
-            view: "bar_view"
-          }, {
-            relative_url: "person_module/20150219_azerty",
-            view: "bar_view"
-          }]),
-              "First append call");
-
-        equal(server.requests[1].withCredentials, true);
-
-        var result = result_list[0],
-          result2 = result_list[1];
-        equal(result_list.length, 2);
-        deepEqual(result, {
-          portal_type: "Person",
-          parent_relative_url: "bar_module",
-          reference: "bar",
-          reference_non_editable: "bar",
-          title: "foo"
-        }, "Check document");
-        deepEqual(result2, {
-          portal_type: "Person"
-        }, "Check document2");
-      })
-      .fail(function (error) {
-        ok(false, error);
-      })
-      .always(function () {
-        start();
-      });
-  });
-
 }(jIO, QUnit, Blob, sinon, encodeURIComponent, FormData));

test/tests.html

@@ -39,6 +39,9 @@
   <script src="jio.storage/indexeddbstorage.tests.js"></script>
   <script src="jio.storage/uuidstorage.tests.js"></script>
   <script src="jio.storage/replicatestorage.tests.js"></script>
+  <script src="jio.storage/replicatestorage_repair.tests.js"></script>
+  <script src="jio.storage/replicatestorage_repairattachment.tests.js"></script>
+  <script src="jio.storage/replicatestorage_fastrepair.tests.js"></script>
   <script src="jio.storage/shastorage.tests.js"></script>
   <script src="jio.storage/mappingstorage.tests.js"></script>
   <!--script src="jio.storage/qiniustorage.tests.js"></script-->