merged with origin develop

Author: Vladlukhanin

LICENSE

@@ -1,20 +1,24 @@
-The MIT License (MIT)
+Copyright (c) 2015, QuickBlox
+All rights reserved.
 
-Copyright (c) 2013 QuickBlox
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

bower.json

@@ -1,10 +1,10 @@
 {
   "name": "quickblox",
   "description": "QuickBlox JavaScript SDK",
-  "version": "1.16.1",
+  "version": "1.17.0",
   "homepage": "http://quickblox.com/developers/Javascript",
   "main": "quickblox.js",
-  "license": "MIT",
+  "license": "BSD",
   "keywords": [
     "quickblox",
     "javascript",

js/modules/qbData.js

@@ -81,20 +81,6 @@ DataProxy.prototype = {
                       });
   },
 
-  updateFile: function(className, params, callback) {
-    Utils.QBLog('[DataProxy]', 'updateFile', className, params);
-
-    var formData;
-    formData = new FormData();
-    formData.append('field_name', params.field_name);
-    formData.append('file', params.file);
-    this.service.ajax({url: Utils.getUrl(config.urls.data, className + '/' + params.id + '/file'), data: formData,
-                      contentType: false, processData: false, type: 'POST'}, function(err, result) {
-                        if (err) { callback (err, null); }
-                        else { callback (err, result); }
-                      });
-  },
-
   downloadFile: function(className, params, callback) {
     Utils.QBLog('[DataProxy]', 'downloadFile', className, params);
 

js/modules/qbUsers.js

@@ -6,7 +6,8 @@
  */
 
 var config = require('../qbConfig'),
-    Utils = require('../qbUtils');
+    Utils = require('../qbUtils'),
+    util = require('util');
 
 var DATE_FIELDS = ['created_at', 'updated_at', 'last_request_at'];
 var NUMBER_FIELDS = ['id', 'external_user_id'];
@@ -139,7 +140,7 @@ module.exports = UsersProxy;
 function generateFilter(obj) {
   var type = obj.field in DATE_FIELDS ? 'date' : typeof obj.value;
 
-  if (obj.value instanceof Array) {
+  if (obj.value instanceof Array || util.isArray(obj.value)) {
     if (type == 'object') {
       type = typeof obj.value[0];
     }

js/qbConfig.js

@@ -6,7 +6,7 @@
  */
 
 var config = {
-  version: '1.16.1',
+  version: '1.17.0',
   creds: {
     appId: '',
     authKey: '',

package.json

@@ -1,12 +1,12 @@
 {
   "name": "quickblox",
   "description": "QuickBlox JavaScript SDK",
-  "version": "1.16.1",
+  "version": "1.17.0",
   "homepage": "http://quickblox.com/developers/Javascript",
   "main": "js/qbMain.js",
   "license": [
     {
-      "type": "MIT",
+      "type": "BSD",
       "url": "https://github.com/QuickBlox/quickblox-javascript-sdk/blob/master/LICENSE"
     }
   ],

quickblox.min.js

@@ -197,8 +197,6 @@ describe('Chat API', function() {
           if(error){
             done.fail("Create or update list error: " + JSON.stringify(error));
           }else{
-            expect(error).toBe(null);
-
             console.info("can create new list with items");
             done();
           }
@@ -218,8 +216,6 @@ describe('Chat API', function() {
           if(error){
             done.fail("Update list error: " + JSON.stringify(error));
           }else{
-            expect(error).toBe(null);
-
             console.info("can update list by name");
             done();
           }

spec/QB-ChatSpec.js

@@ -115,22 +115,6 @@ describe('Сustom Objects API', function() {
       });
     });
 
-    it ('can update a file in existing record', function(done){
-      paramsFile.file = new File(["Hello QuickBlox cars"], "volvo.txt", {type: "text/plain",
-                        lastModified: new Date(2015, 10, 19, 17, 00, 00, 600)});
-
-      QB.data.updateFile('cars', paramsFile, function(err, res) {
-        if (err) {
-          done.fail("Upload a file to an existing record error: " + JSON.stringify(err));
-        } else {
-          expect(res).not.toBeNull();
-          expect(res.name).toBe("volvo.txt");
-          console.info('can update a file in existing record');
-          done();
-        }
-      });
-    });
-
     it ('can dawnload a file from existing record', function(done){
       paramsFor = {
         id: paramsFile.id,
@@ -203,5 +187,3 @@ describe('Сustom Objects API', function() {
   });
 
 });
-
-