Skip to content

Commit f3129af

Browse files
jmdobryjmdobry
committed
Stable Version 0.3.0.
1 parent 745900a commit f3129af

14 files changed

+131
-206
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
##### 0.2.0 - 2 September 2014
1+
##### 0.3.0 - 21 September 2014
2+
3+
###### Backwards compatible API changes
4+
- Small re-organization.
5+
6+
##### 0.2.0 - 21 September 2014
27

38
###### Backwards compatible API changes
49
- Added deserialize and serialize.

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "js-data-http",
33
"description": "http adapter for js-data.",
4-
"version": "0.2.0",
4+
"version": "0.3.0",
55
"homepage": "http://www.js-data.io/js-data-http",
66
"repository": {
77
"type": "git",

‎dist/js-data-http.js‎

Lines changed: 51 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* @author Jason Dobry <jason.dobry@gmail.com>
33
* @file js-data-http.js
4-
* @version 0.2.0 - Homepage <http://www.js-data.iojs-data-http/>
4+
* @version 0.3.0 - Homepage <http://www.js-data.iojs-data-http/>
55
* @copyright (c) 2014 Jason Dobry
66
* @license MIT <https://github.com/js-data/js-data-http/blob/master/LICENSE>
77
*
@@ -1330,152 +1330,155 @@ function DSHttpAdapter(options) {
13301330

13311331
var dsHttpAdapterPrototype = DSHttpAdapter.prototype;
13321332

1333-
dsHttpAdapterPrototype.HTTP = function (config, resourceConfig) {
1333+
dsHttpAdapterPrototype.HTTP = function (config) {
13341334
var _this = this;
13351335
var start = new Date().getTime();
1336-
var deserialize;
1337-
if (config.deserialize) {
1338-
deserialize = config.deserialize;
1339-
delete config.deserialize;
1340-
} else {
1341-
deserialize = _this.defaults.deserialize;
1342-
}
1343-
resourceConfig = resourceConfig || {};
13441336
config = deepMixIn(config, this.defaults.httpConfig);
13451337
return http(config).then(function (data) {
13461338
if (_this.defaults.log) {
13471339
var args = Array.prototype.slice.call(arguments);
13481340
args.unshift(data.config.method + ' request: ' + data.config.url + ' Time taken: ' + (new Date().getTime() - start) + 'ms');
13491341
_this.defaults.log.apply(_this.defaults.log, args);
13501342
}
1351-
return deserialize(resourceConfig.name, data);
1343+
return data;
13521344
});
13531345
};
13541346

1355-
dsHttpAdapterPrototype.GET = function (url, config, resourceConfig) {
1347+
dsHttpAdapterPrototype.GET = function (url, config) {
13561348
config = config || {};
13571349
if (!('method' in config)) {
13581350
config.method = 'get';
13591351
}
13601352
return this.HTTP(deepMixIn(config, {
13611353
url: url
1362-
}), resourceConfig);
1354+
}));
13631355
};
13641356

1365-
dsHttpAdapterPrototype.POST = function (url, attrs, config, resourceConfig) {
1357+
dsHttpAdapterPrototype.POST = function (url, attrs, config) {
13661358
config = config || {};
13671359
if (!('method' in config)) {
13681360
config.method = 'post';
13691361
}
13701362
return this.HTTP(deepMixIn(config, {
13711363
url: url,
13721364
data: attrs
1373-
}), resourceConfig);
1365+
}));
13741366
};
13751367

1376-
dsHttpAdapterPrototype.PUT = function (url, attrs, config, resourceConfig) {
1368+
dsHttpAdapterPrototype.PUT = function (url, attrs, config) {
13771369
config = config || {};
13781370
if (!('method' in config)) {
13791371
config.method = 'put';
13801372
}
13811373
return this.HTTP(deepMixIn(config, {
13821374
url: url,
13831375
data: attrs || {}
1384-
}), resourceConfig);
1376+
}));
13851377
};
13861378

1387-
dsHttpAdapterPrototype.DEL = function (url, config, resourceConfig) {
1379+
dsHttpAdapterPrototype.DEL = function (url, config) {
13881380
config = config || {};
13891381
if (!('method' in config)) {
13901382
config.method = 'delete';
13911383
}
13921384
return this.HTTP(deepMixIn(config, {
13931385
url: url
1394-
}), resourceConfig);
1386+
}));
13951387
};
13961388

13971389
dsHttpAdapterPrototype.find = function (resourceConfig, id, options) {
1390+
var _this = this;
13981391
options = options || {};
1399-
return this.GET(
1392+
return _this.GET(
14001393
makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.getEndpoint(id, options), id),
1401-
options,
1402-
resourceConfig
1403-
);
1394+
options
1395+
).then(function (data) {
1396+
return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig.name, data);
1397+
});
14041398
};
14051399

14061400
dsHttpAdapterPrototype.findAll = function (resourceConfig, params, options) {
1401+
var _this = this;
14071402
options = options || {};
14081403
options.params = options.params || {};
14091404
if (params) {
1410-
params = this.defaults.queryTransform(resourceConfig.name, params);
1405+
params = _this.defaults.queryTransform(resourceConfig.name, params);
14111406
deepMixIn(options.params, params);
14121407
}
1413-
return this.GET(
1408+
return _this.GET(
14141409
makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.getEndpoint(null, options)),
1415-
options,
1416-
resourceConfig
1417-
);
1410+
options
1411+
).then(function (data) {
1412+
return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig.name, data);
1413+
});
14181414
};
14191415

14201416
dsHttpAdapterPrototype.create = function (resourceConfig, attrs, options) {
14211417
var _this = this;
14221418
options = options || {};
1423-
return this.POST(
1419+
return _this.POST(
14241420
makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.getEndpoint(attrs, options)),
14251421
options.serialize ? options.serialize(resourceConfig.name, attrs) : _this.defaults.serialize(resourceConfig.name, attrs),
1426-
options,
1427-
resourceConfig
1428-
);
1422+
options
1423+
).then(function (data) {
1424+
return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig.name, data);
1425+
});
14291426
};
14301427

14311428
dsHttpAdapterPrototype.update = function (resourceConfig, id, attrs, options) {
14321429
var _this = this;
14331430
options = options || {};
1434-
return this.PUT(
1431+
return _this.PUT(
14351432
makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.getEndpoint(id, options), id),
14361433
options.serialize ? options.serialize(resourceConfig.name, attrs) : _this.defaults.serialize(resourceConfig.name, attrs),
1437-
options,
1438-
resourceConfig
1439-
);
1434+
options
1435+
).then(function (data) {
1436+
return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig.name, data);
1437+
});
14401438
};
14411439

14421440
dsHttpAdapterPrototype.updateAll = function (resourceConfig, attrs, params, options) {
14431441
var _this = this;
14441442
options = options || {};
14451443
options.params = options.params || {};
14461444
if (params) {
1447-
params = this.defaults.queryTransform(resourceConfig.name, params);
1445+
params = _this.defaults.queryTransform(resourceConfig.name, params);
14481446
deepMixIn(options.params, params);
14491447
}
14501448
return this.PUT(
14511449
makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.getEndpoint(null, options)),
14521450
options.serialize ? options.serialize(resourceConfig.name, attrs) : _this.defaults.serialize(resourceConfig.name, attrs),
1453-
options,
1454-
resourceConfig
1455-
);
1451+
options
1452+
).then(function (data) {
1453+
return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig.name, data);
1454+
});
14561455
};
14571456

14581457
dsHttpAdapterPrototype.destroy = function (resourceConfig, id, options) {
1458+
var _this = this;
14591459
options = options || {};
1460-
return this.DEL(
1460+
return _this.DEL(
14611461
makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.getEndpoint(id, options), id),
1462-
options,
1463-
resourceConfig
1464-
);
1462+
options
1463+
).then(function (data) {
1464+
return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig.name, data);
1465+
});
14651466
};
14661467

14671468
dsHttpAdapterPrototype.destroyAll = function (resourceConfig, params, options) {
1469+
var _this = this;
14681470
options = options || {};
14691471
options.params = options.params || {};
14701472
if (params) {
1471-
params = this.defaults.queryTransform(resourceConfig.name, params);
1473+
params = _this.defaults.queryTransform(resourceConfig.name, params);
14721474
deepMixIn(options.params, params);
14731475
}
14741476
return this.DEL(
14751477
makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.getEndpoint(null, options)),
1476-
options,
1477-
resourceConfig
1478-
);
1478+
options
1479+
).then(function (data) {
1480+
return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig.name, data);
1481+
});
14791482
};
14801483

14811484
module.exports = DSHttpAdapter;

0 commit comments

Comments
 (0)