Merge remote-tracking branch 'origin/develop' into factory-method-refactor

Author: xbill82

.eslintrc.json

@@ -55,7 +55,7 @@
     "mocha": true
   },
   "parserOptions": {
-    "ecmaVersion": 6
+    "ecmaVersion": 5
   },
   "extends": "eslint:recommended"
 }

.travis.yml

@@ -18,7 +18,7 @@ install:
 - npm install
 env:
   global:
-    secure: J5FHR91BBBrVqS5QMl+ZC3Oi2UgyQpW5SlKhfCwXJU2rz8XHNWajT5hjihlNiE6SVuUDVNflCcJI7DRD7+hwCt+G0rL9UuLnkKuMGVuVc/vMAjYpjRoVgWHk4KSwN4qWYcbF0k9d5POelI36xFnuQM0ttb3kDi/8T1s26Vsqw2Db1YDoK94ZkqO633gwwmr9RX05+sLXIuKai1bfIjUGU3YTusY0hDVw78Sg+/o1qCHNVwLDutpae/wLypO1/hujgh8SjIkAQBa/yp1gT2W+ykIaApk8eZn630usVttdToDgh2Z5+RLcgHOMi/p2/NvB/XKDq+sYh55tuKtdzu6MNx1vEVolcfiPkI0yPzwAs1IgTxAtGpKVkRlIZNMyksAQBikLqI6iFJHqYcPDHo+R+IwrXXSwZL/gbcfAtLiYWx1JnZHL8KfFz5KvRtINA4iEopzTQrOPJibFYNMWMyybvx7cHe4SAbtZxKq6cCt3fUzvwzfTIQ8m5k6y+w/bOiYY/HV8zvNw5bCS1N6h/6u8mmZMw3wv9N9eQz+h2BKwSziWt27CXcUKl6HhHklR7zj3/b7HwKW1o7Y0cixTl8kUBC8k+093Mhg4FmJWEAacfXVzRDs5nEejronmNUTi8hnpsSBeNMQnuD99zQp+eIi5PjfZ9DsCCM85cYb/LG1HyLs=
+    secure: I4D0AX3ftua5iHdzj5NHm3Tzdr5ZVR0UTDOKzo6IhjqZOmcFsowD047nRHkSa9iMcefij/lVCgBvHdIIxNPQeJkOCssHapjKzOsppjW4rW2qfrwKmEQa/rpzdV4tXPuiX/JWspWc4Ll7rAQZJESLesp3ksoWafvViluJ7PY9OOXwIGPY7fdd6DO4yP795NwnigxBZ0ZJ3A0icbczntSZQztCxaVEHtNgy7W9MYJ3nLINsbiQN8FRa1UgvPdecgw05ST7mW82QK8y+ajR1YwG+/M8HWBxHuLPuLxN87UCPX6qe9upHPU9/RQvm7L4SoLckqcxJDtPoFueZf6pn1PN18Jp3b0D7frUJaY1qMx1x4KvYNQlgvJhZlEOtbvdolVecbL5sIYv7un/BzCAhe456WyB2LRBG/qPSzKdqrmsUWS5vVOdIMPqRLvC5GU/UC6pbVWIOytwcFYPs4xHyViyTpBQnlvF9oSx+D0RW726vKUEWPCG00KaNH9TY2BW3Ircvss8wc53/zRIG6xyppkoy9MbLPRV3tgfBXtr0ytKRBh4WbdCpTHl5CfDS2iuk49H0ZqnaG/8izmylqZXdZSKxdXCBcDv/6bV12qRWDzdBALaAthhR9mkjtpg6YKdNTcLpdkCCejiuoBsnI9Des9F6tOLAff8hLjv2xkgnrdbfzM=
 deploy:
   provider: npm
   skip_cleanup: true

deploy.sh

@@ -1,4 +1,5 @@
 #! /bin/bash
+set -e
 
 if [ "${TRAVIS_BRANCH}" = "master"  -a "${TRAVIS_PULL_REQUEST}" = "false" ]
 then

dist/kuzzle.js

@@ -1,6 +1,6 @@
 {
   "name": "kuzzle-sdk",
-  "version": "2.3.0",
+  "version": "2.3.3",
   "description": "Official Javascript SDK for Kuzzle",
   "author": "The Kuzzle Team <[email protected]>",
   "repository": {
@@ -29,8 +29,9 @@
   "dependencies": {
     "bluebird": "3.4.6",
     "bufferutil": "^1.2.1",
-    "uuid": "3.0.0",
+    "eslint-loader": "^1.6.1",
     "utf-8-validate": "^1.2.1",
+    "uuid": "3.0.0",
     "ws": "^1.1.1"
   },
   "devDependencies": {

dist/kuzzle.js.map

@@ -319,7 +319,7 @@ Collection.prototype.fetchAllDocuments = function (options, cb) {
         console.warn('Collection.fetchAllDocuments may return extremely large amounts of documents, which may cause performance issues. Unless you know what you are doing, consider using Collection.search or Collection.scroll instead'); // eslint-disable-line no-console
       }
 
-      searchResult.documents.forEach(document => {
+      searchResult.documents.forEach(function(document) {
         documents.push(document);
       });
       searchResult.next(getNextDocuments);

package.json

@@ -5,5 +5,8 @@
     "no-new": 0,
     "new-cap": 0,
     "no-console": 0
+  },
+  "parserOptions": {
+    "ecmaVersion": 6
   }
 }

src/Collection.js

@@ -1,19 +1,22 @@
-var webpack = require('webpack');
-var path = require('path');
+var
+  webpack = require('webpack'),
+  path = require('path'),
+  version = require('./package.json').version;
 
 module.exports = {
   entry: './src/kuzzle.js',
   output: {
     path: './dist',
     filename: 'kuzzle.js',
+    library: 'Kuzzle',
     libraryTarget: 'umd'
   },
   watch: false,
   debug: false,
   devtool: 'source-map',
   node: {
     console: false,
-    global: false,
+    global: true,
     process: false,
     Buffer: false,
     __filename: false,
@@ -24,7 +27,7 @@ module.exports = {
     loaders: [
       {
         test: /\.js$/,
-        loader: 'eslint',
+        loader: 'eslint-loader',
         include: path.resolve(__dirname, './src/'),
         exclude: /node_modules/
       }
@@ -40,6 +43,7 @@ module.exports = {
     new webpack.DefinePlugin({
       global: 'window'
     }),
+    new webpack.BannerPlugin('Kuzzle javascript SDK version ' + version),
     new webpack.optimize.UglifyJsPlugin({
       compressor: {
         warnings: false