Skip to content

Commit fe503f6

Browse files
author
Igor Khomenko
committed
1.15.2 version
1 parent 22b27a3 commit fe503f6

File tree

9 files changed

+58
-79
lines changed

9 files changed

+58
-79
lines changed

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "quickblox",
33
"description": "QuickBlox JavaScript SDK",
4-
"version": "1.15.1",
4+
"version": "1.15.2",
55
"homepage": "http://quickblox.com/developers/Javascript",
66
"main": "quickblox.js",
77
"license": "MIT",

‎js/modules/qbContent.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,12 @@ ContentProxy.prototype = {
223223
});
224224
},
225225

226-
privateUrl: function (fileId){
227-
return "https://api.quickblox.com/blobs/"+fileId+"/download?token="+this.service.getSession().token;
226+
privateUrl: function (fileUID){
227+
return "https://" + config.endpoints.api + "/blobs/" + fileUID + "?token=" + this.service.getSession().token;
228228
},
229229

230-
publicUrl: function (fileId){
231-
return "https://api.quickblox.com/blobs/"+fileId+"/download";
230+
publicUrl: function (fileUID){
231+
return "https://" + config.endpoints.api + "/blobs/" + fileUID;
232232
}
233233

234234
};

‎js/qbConfig.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
var config = {
9-
version: '1.15.1',
9+
version: '1.15.2',
1010
creds: {
1111
appId: '',
1212
authKey: '',

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "quickblox",
33
"description": "QuickBlox JavaScript SDK",
4-
"version": "1.15.1",
4+
"version": "1.15.2",
55
"homepage": "http://quickblox.com/developers/Javascript",
66
"main": "js/qbMain.js",
77
"license": [

‎quickblox.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* QuickBlox JavaScript SDK - v1.15.1 - 2015-10-16 */
1+
/* QuickBlox JavaScript SDK - v1.15.2 - 2015-11-13 */
22

33
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.QB = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
44
/*
@@ -1454,12 +1454,12 @@ ContentProxy.prototype = {
14541454
});
14551455
},
14561456

1457-
privateUrl: function (fileId){
1458-
return "https://api.quickblox.com/blobs/"+fileId+"/download?token="+this.service.getSession().token;
1457+
privateUrl: function (fileUID){
1458+
return "https://" + config.endpoints.api + "/blobs/" + fileUID + "?token=" + this.service.getSession().token;
14591459
},
14601460

1461-
publicUrl: function (fileId){
1462-
return "https://api.quickblox.com/blobs/"+fileId+"/download";
1461+
publicUrl: function (fileUID){
1462+
return "https://" + config.endpoints.api + "/blobs/" + fileUID;
14631463
}
14641464

14651465
};
@@ -2854,7 +2854,7 @@ Blob.prototype.download = function() {
28542854
*/
28552855

28562856
var config = {
2857-
version: '1.15.1',
2857+
version: '1.15.2',
28582858
creds: {
28592859
appId: '',
28602860
authKey: '',

‎quickblox.min.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎samples/content/js/main.js‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ QB.createSession(QBUser, function(err, result) {
99
if (err) {
1010
console.log('Something went wrong: ' + err);
1111
} else {
12-
var user_id = result.id;
13-
14-
console.log('Session created with id ' + result.id);
1512

1613
retrieveFiles();
1714

@@ -43,7 +40,7 @@ QB.createSession(QBUser, function(err, result) {
4340

4441
var uploadedFile = response;
4542

46-
showImage(uploadedFile.id, uploadedFile.name, false);
43+
showImage(uploadedFile.uid, uploadedFile.name, false);
4744
}
4845
});
4946
});
@@ -52,8 +49,8 @@ QB.createSession(QBUser, function(err, result) {
5249
});
5350

5451
// show image
55-
function showImage(fileId, fileName, toAppend){
56-
var imageHTML = "<img src='" + QB.content.privateUrl(fileId) + "' alt='"+fileName+"' class='animals img-responsive col-md-4 col-sm-6 col-xs-12' />";
52+
function showImage(fileUid, fileName, toAppend){
53+
var imageHTML = "<img src='" + QB.content.privateUrl(fileUid) + "' alt='"+fileName+"' class='animals img-responsive col-md-4 col-sm-6 col-xs-12' />";
5754
if (toAppend) {
5855
$('#pictures').append(imageHTML);
5956
} else {
@@ -73,7 +70,7 @@ function retrieveFiles() {
7370
} else {
7471
$.each(response.items, function(index, item){
7572
var cur = this.blob;
76-
showImage(cur.id, cur.name, true);
73+
showImage(cur.uid, cur.name, true);
7774
});
7875

7976
console.log(response);

‎spec/QB-ContentSpec.js‎

Lines changed: 36 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,43 @@
1-
describe('QuickBlox SDK - Content', function() {
2-
var needsInit = true;
3-
4-
beforeEach(function(){
5-
var done;
6-
if (needsInit) {
7-
runs(function(){
8-
QB.init(CONFIG.appId, CONFIG.authKey, CONFIG.authSecret, CONFIG.debug);
9-
done = false;
10-
QB.createSession({login: VALID_USER, password: VALID_PASSWORD},function (err, result){
11-
expect(err).toBeNull();
12-
expect(result).not.toBeNull();
13-
done = true;
14-
});
15-
});
16-
waitsFor(function(){
17-
return done;
18-
},'create session', TIMEOUT);
19-
}
20-
});
1+
var REST_REQUEST_TIMEOUT = 3000;
2+
var token;
213

22-
describe('Basic CRUD functions', function() {
23-
24-
it('can create a content object', function() {
25-
var done,error, result;
26-
runs(function(){
27-
var data = {content_type: 'image/png', name: 'myAvatar.png', public: true, tag_list: 'user_pics,avatar'};
28-
QB.content.create(data, function(err, res) {
29-
error = err;
30-
result = res;
31-
done = true;
32-
});
33-
});
34-
waitsFor(function(){ return done; }, 'create content instance', TIMEOUT );
35-
runs(function() {
36-
expect(error).toBeNull();
37-
expect(result).not.toBeNull();
38-
expect(result.name).toBe('myAvatar.png');
39-
});
40-
});
4+
describe('Content API', function() {
5+
6+
// beforeAll
7+
//
8+
beforeAll(function(done){
9+
10+
QB.init(CONFIG.appId, CONFIG.authKey, CONFIG.authSecret);
11+
12+
QB.createSession(QBUser1, function(err, session) {
13+
if (err) {
14+
done.fail("Create session error: " + JSON.stringify(err));
15+
} else {
16+
expect(session).not.toBeNull();
17+
token = session.token;
4118

42-
it('can list content objects', function() {
43-
var done,error, result;
44-
runs(function(){
45-
QB.content.list(function(err, res) {
46-
error = err;
47-
result = res;
48-
done = true;
49-
});
50-
});
51-
waitsFor(function(){ return done; }, 'create content instance', TIMEOUT );
52-
runs(function() {
53-
expect(error).toBeNull();
54-
expect(result).not.toBeNull();
55-
expect(result.items.length).toBeGreaterThan(0);
56-
});
19+
done();
20+
}
5721
});
5822

23+
}, REST_REQUEST_TIMEOUT);
24+
25+
// Private Url
26+
//
27+
it('can access privat URL', function() {
28+
var fileUID = "97f5802dcbd34a59a4921d73f6baedd000",
29+
privateURL = QB.content.privateUrl(fileUID);
30+
31+
expect(privateURL).toEqual("https://api.quickblox.com/blobs/97f5802dcbd34a59a4921d73f6baedd000?token="+token);
5932
});
6033

34+
35+
// Private Url
36+
//
37+
it('can access public URL', function() {
38+
var fileUID = "97f5802dcbd34a59a4921d73f6baedd000",
39+
publicUrl = QB.content.publicUrl(fileUID);
40+
41+
expect(publicUrl).toEqual("https://api.quickblox.com/blobs/97f5802dcbd34a59a4921d73f6baedd000");
42+
});
6143
});

‎spec/SpecRunner.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<script type="text/javascript" src="QB-UsersSpec.js"></script>
2121
<script type="text/javascript" src="QB-MessagesSpec.js"></script>
2222
<script type="text/javascript" src="QB-LocationSpec.js"></script>
23-
<script type="text/javascript" src="QB-DataSpec.js"></script>
24-
<script type="text/javascript" src="QB-ContentSpec.js"></script> -->
23+
<script type="text/javascript" src="QB-DataSpec.js"></script> -->
24+
<script type="text/javascript" src="QB-ContentSpec.js"></script>
2525
<script type="text/javascript" src="QB-ChatSpec.js"></script>
2626
<script type="text/javascript" src="defaults.js"></script>
2727
<script type="text/javascript" src="config.js"></script>

0 commit comments

Comments
 (0)