From 7131efeb7cf3fc0f0cf3c7b1c226247c981ba79b Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Wed, 15 Apr 2015 09:57:02 -0600 Subject: [PATCH] Stable Version 2.3.0. Merged #328 --- CHANGELOG.md | 8 + Gruntfile.js | 4 +- bower.json | 7 +- circle.yml | 4 + dist/js-data-angular.js | 469 ++++++++++---------- dist/js-data-angular.min.js | 4 +- dist/js-data-angular.min.map | 2 +- package.json | 24 +- src/index.js | 10 +- test/datastore/async_methods/update.test.js | 40 +- 10 files changed, 305 insertions(+), 267 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05391f8..5fba3c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +##### 2.3.0 - 15 April 2015 + +###### Backwards compatible API changes +- #328 - Add support for `js-data-sql` adapter + +###### Backwards compatible bug fixes +- #328 - Fixed adapter registration + ##### 2.2.3 - 08 March 2015 ###### Other diff --git a/Gruntfile.js b/Gruntfile.js index ca7988b..260ac9a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -104,11 +104,11 @@ module.exports = function (grunt) { }, module: { loaders: [ - { test: /(src)(.+)\.js$/, exclude: /node_modules/, loader: 'babel-loader?blacklist=useStrict' } + { test: /(.+)\.js$/, exclude: /node_modules/, loader: 'babel-loader?blacklist=useStrict' } ], preLoaders: [ { - test: /(src)(.+)\.js$|(test)(.+)\.js$/, // include .js files + test: /(.+)\.js$/, // include .js files exclude: /node_modules/, // exclude any and all files in the node_modules folder loader: "jshint-loader?failOnHint=true" } diff --git a/bower.json b/bower.json index a1f3e2a..4c785fa 100644 --- a/bower.json +++ b/bower.json @@ -28,7 +28,10 @@ "angular-mocks-1.3.2": "angular-mocks#1.3.2" }, "dependencies": { - "js-data": ">=1.1.0", - "angular": ">=1.0.3" + "js-data": ">=1.5.7", + "angular": ">=1.1.0" + }, + "resolutions": { + "angular": "1.3.2" } } diff --git a/circle.yml b/circle.yml index 74b0946..7ffcd64 100644 --- a/circle.yml +++ b/circle.yml @@ -1,3 +1,7 @@ +general: + branches: + ignore: + - gh-pages # list of branches to ignore dependencies: pre: - bower install diff --git a/dist/js-data-angular.js b/dist/js-data-angular.js index bacca2a..b6bc7ea 100644 --- a/dist/js-data-angular.js +++ b/dist/js-data-angular.js @@ -1,6 +1,6 @@ /*! * js-data-angular - * @version 2.2.3 - Homepage + * @version 2.3.0 - Homepage * @author Jason Dobry * @copyright (c) 2014-2015 Jason Dobry * @license MIT @@ -63,10 +63,13 @@ return /******/ (function(modules) { // webpackBootstrap /* 0 */ /***/ function(module, exports, __webpack_require__) { - var _createClass = (function () { function defineProperties(target, props) { for (var key in props) { var prop = props[key]; prop.configurable = true; if (prop.value) prop.writable = true; } Object.defineProperties(target, props); } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); + var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }; + var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }; + Object.defineProperty(exports, '__esModule', { + value: true + }); /*jshint loopfunc:true*/ var angular = undefined, JSData = undefined; @@ -80,7 +83,7 @@ return /******/ (function(modules) { // webpackBootstrap } catch (e) {} } if (!JSData) { - throw new Error("js-data must be loaded!"); + throw new Error('js-data must be loaded!'); } try { angular = __webpack_require__(2); @@ -92,7 +95,7 @@ return /******/ (function(modules) { // webpackBootstrap } catch (e) {} } if (!angular) { - throw new Error("angular must be loaded!"); + throw new Error('angular must be loaded!'); } var DSUtils = JSData.DSUtils; @@ -106,24 +109,28 @@ return /******/ (function(modules) { // webpackBootstrap var httpLoaded = false; var adapters = [{ - project: "js-data-http", - name: "http", - "class": "DSHttpAdapter" + project: 'js-data-http', + name: 'http', + 'class': 'DSHttpAdapter' }, { - project: "js-data-localstorage", - name: "localstorage", - "class": "DSLocalStorageAdapter" + project: 'js-data-localstorage', + name: 'localstorage', + 'class': 'DSLocalStorageAdapter' }, { - project: "js-data-localforage", - name: "localforage", - "class": "DSLocalForageAdapter" + project: 'js-data-localforage', + name: 'localforage', + 'class': 'DSLocalForageAdapter' }, { - project: "js-data-firebase", - name: "firebase", - "class": "DSFirebaseAdapter" + project: 'js-data-firebase', + name: 'firebase', + 'class': 'DSFirebaseAdapter' + }, { + project: 'js-data-sql', + name: 'sql', + 'class': 'DSSqlAdapter' }]; - var functionsToWrap = ["compute", "digest", "eject", "inject", "link", "linkAll", "linkInverse", "unlinkInverse"]; + var functionsToWrap = ['compute', 'digest', 'eject', 'inject', 'link', 'linkAll', 'linkInverse', 'unlinkInverse']; function registerAdapter(adapter) { var Adapter = undefined; @@ -133,15 +140,15 @@ return /******/ (function(modules) { // webpackBootstrap } catch (e) {} if (!Adapter) { - Adapter = window[adapter["class"]]; + Adapter = window[adapter['class']]; } if (Adapter) { - if (adapter.name === "http") { + if (adapter.name === 'http') { httpLoaded = true; } adapter.loaded = true; - angular.module("js-data").provider(adapter["class"], function () { + angular.module('js-data').provider(adapter['class'], function () { var _this = this; _this.defaults = {}; _this.$get = [function () { @@ -159,7 +166,7 @@ return /******/ (function(modules) { // webpackBootstrap for (var i = 0; i < adapters.length; i++) { if (adapters[i].loaded) { - deps.push(adapters[i]["class"]); + deps.push(adapters[i]['class']); } } @@ -173,11 +180,11 @@ return /******/ (function(modules) { // webpackBootstrap if (!_this.definitions[resourceName]) { throw new DSErrors.NER(resourceName); } else if (!DSUtils.isObject(params)) { - throw new DSErrors.IA("\"params\" must be an object!"); + throw new DSErrors.IA('"params" must be an object!'); } else if (!DSUtils.isObject(scope)) { - throw new DSErrors.IA("\"scope\" must be an object!"); + throw new DSErrors.IA('"scope" must be an object!'); } else if (!DSUtils.isString(expr)) { - throw new DSErrors.IA("\"expr\" must be a string!"); + throw new DSErrors.IA('"expr" must be a string!'); } try { @@ -206,11 +213,11 @@ return /******/ (function(modules) { // webpackBootstrap if (!_this.definitions[resourceName]) { throw new DSErrors.NER(resourceName); } else if (!DSUtils.isString(id) && !DSUtils.isNumber(id)) { - throw new DSErrors.IA("\"id\" must be a string or a number!"); + throw new DSErrors.IA('"id" must be a string or a number!'); } else if (!DSUtils.isObject(scope)) { - throw new DSErrors.IA("\"scope\" must be an object!"); + throw new DSErrors.IA('"scope" must be an object!'); } else if (!DSUtils.isString(expr)) { - throw new DSErrors.IA("\"expr\" must be a string!"); + throw new DSErrors.IA('"expr" must be a string!'); } try { @@ -267,33 +274,36 @@ return /******/ (function(modules) { // webpackBootstrap if (adapters[j].loaded && !adapters[j].registered) { adapters[j].registered = true; store.registerAdapter(adapters[j].name, args[i]); + break; } } } } + var _loop = function () { + var name = functionsToWrap[k]; + originals[name] = store[name]; + store[name] = function () { + for (var _len2 = arguments.length, args = Array(_len2), _key2 = 0; _key2 < _len2; _key2++) { + args[_key2] = arguments[_key2]; + } + + if (!$rootScope.$$phase) { + return $rootScope.$apply(function () { + return originals[name].apply(store, args); + }); + } + return originals[name].apply(store, args); + }; + }; + // Wrap certain sync functions with $apply for (var k = 0; k < functionsToWrap.length; k++) { - (function () { - var name = functionsToWrap[k]; - originals[name] = store[name]; - store[name] = function () { - for (var _len2 = arguments.length, args = Array(_len2), _key2 = 0; _key2 < _len2; _key2++) { - args[_key2] = arguments[_key2]; - } - - if (!$rootScope.$$phase) { - return $rootScope.$apply(function () { - return originals[name].apply(store, args); - }); - } - return originals[name].apply(store, args); - }; - })(); + _loop(); } // Hook into the digest loop - if (typeof Object.observe !== "function" || typeof Array.observe !== "function") { + if (typeof Object.observe !== 'function' || typeof Array.observe !== 'function') { $rootScope.$watch(function () { return store.observe.Platform.performMicrotaskCheckpoint(); }); @@ -302,14 +312,14 @@ return /******/ (function(modules) { // webpackBootstrap return store; } - deps.push("$rootScope"); - deps.push("$q"); + deps.push('$rootScope'); + deps.push('$q'); deps.push(load); _this.$get = deps; }; - angular.module("js-data", ["ng"]).value("DSUtils", JSData.DSUtils).value("DSErrors", JSData.DSErrors).provider("DS", DSProvider); + angular.module('js-data', ['ng']).value('DSUtils', JSData.DSUtils).value('DSErrors', JSData.DSErrors).provider('DS', DSProvider); for (var i = 0; i < adapters.length; i++) { registerAdapter(adapters[i]); @@ -322,38 +332,37 @@ return /******/ (function(modules) { // webpackBootstrap _classCallCheck(this, Defaults); } - _createClass(Defaults, { - queryTransform: { - value: function queryTransform(resourceConfig, params) { - return params; - } - }, - deserialize: { - value: function deserialize(resourceConfig, data) { - return data ? "data" in data ? data.data : data : data; - } - }, - serialize: { - value: function serialize(resourceConfig, data) { - return data; - } - }, - log: { - value: function log() {} - }, - error: { - value: function error() {} + _createClass(Defaults, [{ + key: 'queryTransform', + value: function queryTransform(resourceConfig, params) { + return params; } - }); + }, { + key: 'deserialize', + value: function deserialize(resourceConfig, data) { + return data ? 'data' in data ? data.data : data : data; + } + }, { + key: 'serialize', + value: function serialize(resourceConfig, data) { + return data; + } + }, { + key: 'log', + value: function log() {} + }, { + key: 'error', + value: function error() {} + }]); return Defaults; })(); var defaultsPrototype = Defaults.prototype; - defaultsPrototype.basePath = ""; + defaultsPrototype.basePath = ''; - defaultsPrototype.forceTrailingSlash = ""; + defaultsPrototype.forceTrailingSlash = ''; defaultsPrototype.httpConfig = {}; @@ -364,171 +373,170 @@ return /******/ (function(modules) { // webpackBootstrap this.defaults = new Defaults(); if (console) { this.defaults.log = function (a, b) { - return console[typeof console.info === "function" ? "info" : "log"](a, b); + return console[typeof console.info === 'function' ? 'info' : 'log'](a, b); }; } if (console) { this.defaults.error = function (a, b) { - return console[typeof console.error === "function" ? "error" : "log"](a, b); + return console[typeof console.error === 'function' ? 'error' : 'log'](a, b); }; } deepMixIn(this.defaults, options); } - _createClass(DSHttpAdapter, { - getPath: { - value: function getPath(method, resourceConfig, id, options) { - var _this = this; - options = options || {}; - var args = [options.basePath || _this.defaults.basePath || resourceConfig.basePath, resourceConfig.getEndpoint(isString(id) || isNumber(id) || method === "create" ? id : null, options)]; - if (method === "find" || method === "update" || method === "destroy") { - args.push(id); - } - return makePath.apply(DSUtils, args); - } - }, - GET: { - value: function GET(url, config) { - config = config || {}; - if (!("method" in config)) { - config.method = "get"; - } - return this.HTTP(deepMixIn(config, { - url: url - })); - } - }, - POST: { - value: function POST(url, attrs, config) { - config = config || {}; - config = DSUtils.copy(config); - if (!("method" in config)) { - config.method = "post"; - } - return this.HTTP(deepMixIn(config, { - url: url, - data: attrs - })); - } - }, - PUT: { - value: function PUT(url, attrs, config) { - config = config || {}; - if (!("method" in config)) { - config.method = "put"; - } - return this.HTTP(deepMixIn(config, { - url: url, - data: attrs || {} - })); - } - }, - DEL: { - value: function DEL(url, config) { - config = config || {}; - if (!("method" in config)) { - config.method = "delete"; - } - return this.HTTP(deepMixIn(config, { - url: url - })); + _createClass(DSHttpAdapter, [{ + key: 'getPath', + value: function getPath(method, resourceConfig, id, options) { + var _this = this; + options = options || {}; + var args = [options.basePath || _this.defaults.basePath || resourceConfig.basePath, resourceConfig.getEndpoint(isString(id) || isNumber(id) || method === 'create' ? id : null, options)]; + if (method === 'find' || method === 'update' || method === 'destroy') { + args.push(id); } - }, - find: { - value: function find(resourceConfig, id, options) { - var _this = this; - options = options ? copy(options) : {}; - options.suffix = options.suffix || resourceConfig.suffix; - options.params = options.params || {}; - options.params = _this.defaults.queryTransform(resourceConfig, options.params); - return _this.GET(_this.getPath("find", resourceConfig, id, options), options).then(function (data) { - var item = (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); - return !item ? JSData.DSUtils.Promise.reject(new Error("Not Found!")) : item; - }); + return makePath.apply(DSUtils, args); + } + }, { + key: 'GET', + value: function GET(url, config) { + config = config || {}; + if (!('method' in config)) { + config.method = 'get'; } - }, - findAll: { - value: function findAll(resourceConfig, params, options) { - var _this = this; - options = options ? copy(options) : {}; - options.suffix = options.suffix || resourceConfig.suffix; - options.params = options.params || {}; - if (params) { - params = _this.defaults.queryTransform(resourceConfig, params); - deepMixIn(options.params, params); - } - return _this.GET(_this.getPath("findAll", resourceConfig, params, options), options).then(function (data) { - return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); - }); + return this.HTTP(deepMixIn(config, { + url: url + })); + } + }, { + key: 'POST', + value: function POST(url, attrs, config) { + config = config || {}; + config = DSUtils.copy(config); + if (!('method' in config)) { + config.method = 'post'; } - }, - create: { - value: function create(resourceConfig, attrs, options) { - var _this = this; - options = options ? copy(options) : {}; - options.suffix = options.suffix || resourceConfig.suffix; - options.params = options.params || {}; - options.params = _this.defaults.queryTransform(resourceConfig, options.params); - return _this.POST(_this.getPath("create", resourceConfig, attrs, options), (options.serialize ? options.serialize : _this.defaults.serialize)(resourceConfig, attrs), options).then(function (data) { - return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); - }); + return this.HTTP(deepMixIn(config, { + url: url, + data: attrs + })); + } + }, { + key: 'PUT', + value: function PUT(url, attrs, config) { + config = config || {}; + if (!('method' in config)) { + config.method = 'put'; } - }, - update: { - value: function update(resourceConfig, id, attrs, options) { - var _this = this; - options = options ? copy(options) : {}; - options.suffix = options.suffix || resourceConfig.suffix; - options.params = options.params || {}; - options.params = _this.defaults.queryTransform(resourceConfig, options.params); - return _this.PUT(_this.getPath("update", resourceConfig, id, options), (options.serialize ? options.serialize : _this.defaults.serialize)(resourceConfig, attrs), options).then(function (data) { - return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); - }); + return this.HTTP(deepMixIn(config, { + url: url, + data: attrs || {} + })); + } + }, { + key: 'DEL', + value: function DEL(url, config) { + config = config || {}; + if (!('method' in config)) { + config.method = 'delete'; } - }, - updateAll: { - value: function updateAll(resourceConfig, attrs, params, options) { - var _this = this; - options = options ? copy(options) : {}; - options.suffix = options.suffix || resourceConfig.suffix; - options.params = options.params || {}; - if (params) { - params = _this.defaults.queryTransform(resourceConfig, params); - deepMixIn(options.params, params); - } - return this.PUT(_this.getPath("updateAll", resourceConfig, attrs, options), (options.serialize ? options.serialize : _this.defaults.serialize)(resourceConfig, attrs), options).then(function (data) { - return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); - }); + return this.HTTP(deepMixIn(config, { + url: url + })); + } + }, { + key: 'find', + value: function find(resourceConfig, id, options) { + var _this = this; + options = options ? copy(options) : {}; + options.suffix = options.suffix || resourceConfig.suffix; + options.params = options.params || {}; + options.params = _this.defaults.queryTransform(resourceConfig, options.params); + return _this.GET(_this.getPath('find', resourceConfig, id, options), options).then(function (data) { + var item = (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); + return !item ? JSData.DSUtils.Promise.reject(new Error('Not Found!')) : item; + }); + } + }, { + key: 'findAll', + value: function findAll(resourceConfig, params, options) { + var _this = this; + options = options ? copy(options) : {}; + options.suffix = options.suffix || resourceConfig.suffix; + options.params = options.params || {}; + if (params) { + params = _this.defaults.queryTransform(resourceConfig, params); + deepMixIn(options.params, params); } - }, - destroy: { - value: function destroy(resourceConfig, id, options) { - var _this = this; - options = options ? copy(options) : {}; - options.suffix = options.suffix || resourceConfig.suffix; - options.params = options.params || {}; - options.params = _this.defaults.queryTransform(resourceConfig, options.params); - return _this.DEL(_this.getPath("destroy", resourceConfig, id, options), options).then(function (data) { - return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); - }); + return _this.GET(_this.getPath('findAll', resourceConfig, params, options), options).then(function (data) { + return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); + }); + } + }, { + key: 'create', + value: function create(resourceConfig, attrs, options) { + var _this = this; + options = options ? copy(options) : {}; + options.suffix = options.suffix || resourceConfig.suffix; + options.params = options.params || {}; + options.params = _this.defaults.queryTransform(resourceConfig, options.params); + return _this.POST(_this.getPath('create', resourceConfig, attrs, options), (options.serialize ? options.serialize : _this.defaults.serialize)(resourceConfig, attrs), options).then(function (data) { + return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); + }); + } + }, { + key: 'update', + value: function update(resourceConfig, id, attrs, options) { + var _this = this; + options = options ? copy(options) : {}; + options.suffix = options.suffix || resourceConfig.suffix; + options.params = options.params || {}; + options.params = _this.defaults.queryTransform(resourceConfig, options.params); + return _this.PUT(_this.getPath('update', resourceConfig, id, options), (options.serialize ? options.serialize : _this.defaults.serialize)(resourceConfig, attrs), options).then(function (data) { + return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); + }); + } + }, { + key: 'updateAll', + value: function updateAll(resourceConfig, attrs, params, options) { + var _this = this; + options = options ? copy(options) : {}; + options.suffix = options.suffix || resourceConfig.suffix; + options.params = options.params || {}; + if (params) { + params = _this.defaults.queryTransform(resourceConfig, params); + deepMixIn(options.params, params); } - }, - destroyAll: { - value: function destroyAll(resourceConfig, params, options) { - var _this = this; - options = options ? copy(options) : {}; - options.suffix = options.suffix || resourceConfig.suffix; - options.params = options.params || {}; - if (params) { - params = _this.defaults.queryTransform(resourceConfig, params); - deepMixIn(options.params, params); - } - return this.DEL(_this.getPath("destroyAll", resourceConfig, params, options), options).then(function (data) { - return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); - }); + return this.PUT(_this.getPath('updateAll', resourceConfig, attrs, options), (options.serialize ? options.serialize : _this.defaults.serialize)(resourceConfig, attrs), options).then(function (data) { + return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); + }); + } + }, { + key: 'destroy', + value: function destroy(resourceConfig, id, options) { + var _this = this; + options = options ? copy(options) : {}; + options.suffix = options.suffix || resourceConfig.suffix; + options.params = options.params || {}; + options.params = _this.defaults.queryTransform(resourceConfig, options.params); + return _this.DEL(_this.getPath('destroy', resourceConfig, id, options), options).then(function (data) { + return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); + }); + } + }, { + key: 'destroyAll', + value: function destroyAll(resourceConfig, params, options) { + var _this = this; + options = options ? copy(options) : {}; + options.suffix = options.suffix || resourceConfig.suffix; + options.params = options.params || {}; + if (params) { + params = _this.defaults.queryTransform(resourceConfig, params); + deepMixIn(options.params, params); } + return this.DEL(_this.getPath('destroyAll', resourceConfig, params, options), options).then(function (data) { + return (options.deserialize ? options.deserialize : _this.defaults.deserialize)(resourceConfig, data); + }); } - }); + }]); return DSHttpAdapter; })(); @@ -540,17 +548,17 @@ return /******/ (function(modules) { // webpackBootstrap var _this = this; _this.defaults = {}; - _this.$get = ["$http", "DS", "$q", function ($http, DS, $q) { + _this.$get = ['$http', 'DS', '$q', function ($http, DS, $q) { dsHttpAdapterPrototype.HTTP = function (config) { var _this = this; var start = new Date(); config = copy(config); config = deepMixIn(config, _this.defaults.httpConfig); - if (_this.defaults.forceTrailingSlash && config.url[config.url.length - 1] !== "/") { - config.url += "/"; + if (_this.defaults.forceTrailingSlash && config.url[config.url.length - 1] !== '/') { + config.url += '/'; } config.method = config.method.toUpperCase(); - if (typeof config.data === "object") { + if (typeof config.data === 'object') { config.data = removeCircular(config.data); } var suffix = config.suffix || _this.defaults.suffix; @@ -559,7 +567,7 @@ return /******/ (function(modules) { // webpackBootstrap } function logResponse(data) { - var str = "" + start.toUTCString() + " - " + data.config.method.toUpperCase() + " " + data.config.url + " - " + data.status + " " + (new Date().getTime() - start.getTime()) + "ms"; + var str = '' + start.toUTCString() + ' - ' + data.config.method.toUpperCase() + ' ' + data.config.url + ' - ' + data.status + ' ' + (new Date().getTime() - start.getTime()) + 'ms'; if (data.status >= 200 && data.status < 300) { if (_this.defaults.log) { _this.defaults.log(str, data); @@ -567,7 +575,7 @@ return /******/ (function(modules) { // webpackBootstrap return data; } else { if (_this.defaults.error) { - _this.defaults.error("FAILED: " + str, data); + _this.defaults.error('FAILED: ' + str, data); } return $q.reject(data); } @@ -577,20 +585,21 @@ return /******/ (function(modules) { // webpackBootstrap }; var adapter = new DSHttpAdapter(_this.defaults); - DS.registerAdapter("http", adapter, { "default": true }); + DS.registerAdapter('http', adapter, { 'default': true }); return adapter; }]; }; - angular.module("js-data").provider("DSHttpAdapter", DSHttpAdapterProvider); + angular.module('js-data').provider('DSHttpAdapter', DSHttpAdapterProvider); })(); } - angular.module("js-data").run(["DS", "DSHttpAdapter", function (DS, DSHttpAdapter) { - return DS.registerAdapter("http", DSHttpAdapter, { "default": true }); + angular.module('js-data').run(['DS', 'DSHttpAdapter', function (DS, DSHttpAdapter) { + return DS.registerAdapter('http', DSHttpAdapter, { 'default': true }); }]); // return the module name - module.exports = "js-data"; + exports['default'] = 'js-data'; + module.exports = exports['default']; /***/ }, /* 1 */ diff --git a/dist/js-data-angular.min.js b/dist/js-data-angular.min.js index 6a373d9..abdb04d 100644 --- a/dist/js-data-angular.min.js +++ b/dist/js-data-angular.min.js @@ -1,6 +1,6 @@ /*! * js-data-angular -* @version 2.2.3 - Homepage +* @version 2.3.0 - Homepage * @author Jason Dobry * @copyright (c) 2014-2015 Jason Dobry * @license MIT @@ -8,5 +8,5 @@ * @overview Angular wrapper for js-data. */ -!function(a,b){"object"==typeof exports&&"object"==typeof module?module.exports=b(function(){try{return require("js-data")}catch(a){}}(),function(){try{return require("angular")}catch(a){}}()):"function"==typeof define&&define.amd?define(["js-data","angular"],b):"object"==typeof exports?exports.jsDataAngularModuleName=b(function(){try{return require("js-data")}catch(a){}}(),function(){try{return require("angular")}catch(a){}}()):a.jsDataAngularModuleName=b(a.JSData,a.angular)}(this,function(a,b){return function(a){function b(d){if(c[d])return c[d].exports;var e=c[d]={exports:{},id:d,loaded:!1};return a[d].call(e.exports,e,e.exports,b),e.loaded=!0,e.exports}var c={};return b.m=a,b.c=c,b.p="",b(0)}([function(a,b,c){function d(a){var b=void 0;try{b=c(3)(a.project)}catch(d){}b||(b=window[a["class"]]),b&&("http"===a.name&&(r=!0),a.loaded=!0,g.module("js-data").provider(a["class"],function(){var a=this;a.defaults={},a.$get=[function(){return new b(a.defaults)}]}))}var e=function(){function a(a,b){for(var c in b){var d=b[c];d.configurable=!0,d.value&&(d.writable=!0)}Object.defineProperties(a,b)}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),f=function(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")},g=void 0,h=void 0;try{h=c(1)}catch(i){}if(!h)try{h=window.JSData}catch(i){}if(!h)throw new Error("js-data must be loaded!");try{g=c(2)}catch(i){}if(!g)try{g=window.angular}catch(i){}if(!g)throw new Error("angular must be loaded!");var j=h.DSUtils,k=h.DSErrors,l=j.deepMixIn,m=j.copy,n=j.removeCircular,o=j.isString,p=j.isNumber,q=j.makePath,r=!1,s=[{project:"js-data-http",name:"http","class":"DSHttpAdapter"},{project:"js-data-localstorage",name:"localstorage","class":"DSLocalStorageAdapter"},{project:"js-data-localforage",name:"localforage","class":"DSLocalForageAdapter"},{project:"js-data-firebase",name:"firebase","class":"DSFirebaseAdapter"}],t=["compute","digest","eject","inject","link","linkAll","linkInverse","unlinkInverse"],u=function w(){function a(){function a(a){var b=i.defer();try{a.call(void 0,g.bind(b,b.resolve),g.bind(b,b.reject))}catch(c){b.reject(c)}return b.promise}for(var c=arguments.length,d=Array(c),e=0;c>e;e++)d[e]=arguments[e];var f=d[d.length-2],i=d[d.length-1],k=new h.DS(b.defaults),l={};if(a.all=i.all,a.when=i.when,a.reject=i.reject,j.Promise=a,d.length)for(var m=0;md;d++)c[d]=arguments[d];return f.$$phase?l[a].apply(k,c):f.$apply(function(){return l[a].apply(k,c)})}}();return("function"!=typeof Object.observe||"function"!=typeof Array.observe)&&f.$watch(function(){return k.observe.Platform.performMicrotaskCheckpoint()}),k}f(this,w);for(var b=this,c=[],d=0;d=200&&a.status<300?(d.defaults.log&&d.defaults.log(b,a),a):(d.defaults.error&&d.defaults.error("FAILED: "+b,a),f.reject(a))}var d=this,e=new Date;a=m(a),a=l(a,d.defaults.httpConfig),d.defaults.forceTrailingSlash&&"/"!==a.url[a.url.length-1]&&(a.url+="/"),a.method=a.method.toUpperCase(),"object"==typeof a.data&&(a.data=n(a.data));var g=a.suffix||d.defaults.suffix;return g&&a.url.substr(a.url.length-g.length)!==g&&(a.url+=g),b(a).then(c,c)};var g=new c(a.defaults);return e.registerAdapter("http",g,{"default":!0}),g}]};g.module("js-data").provider("DSHttpAdapter",i)}(),g.module("js-data").run(["DS","DSHttpAdapter",function(a,b){return a.registerAdapter("http",b,{"default":!0})}]),a.exports="js-data"},function(b){if("undefined"==typeof a){var c=new Error('Cannot find module "undefined"');throw c.code="MODULE_NOT_FOUND",c}b.exports=a},function(a){if("undefined"==typeof b){var c=new Error('Cannot find module "angular"');throw c.code="MODULE_NOT_FOUND",c}a.exports=b},function(a,b,c){function d(a){return c(e(a))}function e(a){return f[a]||function(){throw new Error("Cannot find module '"+a+"'.")}()}var f={};d.keys=function(){return Object.keys(f)},d.resolve=e,a.exports=d,d.id=3}])}); +!function(a,b){"object"==typeof exports&&"object"==typeof module?module.exports=b(function(){try{return require("js-data")}catch(a){}}(),function(){try{return require("angular")}catch(a){}}()):"function"==typeof define&&define.amd?define(["js-data","angular"],b):"object"==typeof exports?exports.jsDataAngularModuleName=b(function(){try{return require("js-data")}catch(a){}}(),function(){try{return require("angular")}catch(a){}}()):a.jsDataAngularModuleName=b(a.JSData,a.angular)}(this,function(a,b){return function(a){function b(d){if(c[d])return c[d].exports;var e=c[d]={exports:{},id:d,loaded:!1};return a[d].call(e.exports,e,e.exports,b),e.loaded=!0,e.exports}var c={};return b.m=a,b.c=c,b.p="",b(0)}([function(a,b,c){function d(a){var b=void 0;try{b=c(3)(a.project)}catch(d){}b||(b=window[a["class"]]),b&&("http"===a.name&&(r=!0),a.loaded=!0,g.module("js-data").provider(a["class"],function(){var a=this;a.defaults={},a.$get=[function(){return new b(a.defaults)}]}))}var e=function(){function a(a,b){for(var c=0;ce;e++)d[e]=arguments[e];var f=d[d.length-2],i=d[d.length-1],k=new h.DS(b.defaults),l={};if(a.all=i.all,a.when=i.when,a.reject=i.reject,j.Promise=a,d.length)for(var m=0;md;d++)c[d]=arguments[d];return f.$$phase?l[a].apply(k,c):f.$apply(function(){return l[a].apply(k,c)})}},p=0;p=200&&a.status<300?(d.defaults.log&&d.defaults.log(b,a),a):(d.defaults.error&&d.defaults.error("FAILED: "+b,a),f.reject(a))}var d=this,e=new Date;a=m(a),a=l(a,d.defaults.httpConfig),d.defaults.forceTrailingSlash&&"/"!==a.url[a.url.length-1]&&(a.url+="/"),a.method=a.method.toUpperCase(),"object"==typeof a.data&&(a.data=n(a.data));var g=a.suffix||d.defaults.suffix;return g&&a.url.substr(a.url.length-g.length)!==g&&(a.url+=g),b(a).then(c,c)};var g=new c(a.defaults);return e.registerAdapter("http",g,{"default":!0}),g}]};g.module("js-data").provider("DSHttpAdapter",i)}(),g.module("js-data").run(["DS","DSHttpAdapter",function(a,b){return a.registerAdapter("http",b,{"default":!0})}]),b["default"]="js-data",a.exports=b["default"]},function(b,c,d){if("undefined"==typeof a){var e=new Error('Cannot find module "undefined"');throw e.code="MODULE_NOT_FOUND",e}b.exports=a},function(a,c,d){if("undefined"==typeof b){var e=new Error('Cannot find module "angular"');throw e.code="MODULE_NOT_FOUND",e}a.exports=b},function(a,b,c){function d(a){return c(e(a))}function e(a){return f[a]||function(){throw new Error("Cannot find module '"+a+"'.")}()}var f={};d.keys=function(){return Object.keys(f)},d.resolve=e,a.exports=d,d.id=3}])}); //# sourceMappingURL=js-data-angular.min.map \ No newline at end of file diff --git a/dist/js-data-angular.min.map b/dist/js-data-angular.min.map index c9e321e..78693aa 100644 --- a/dist/js-data-angular.min.map +++ b/dist/js-data-angular.min.map @@ -1 +1 @@ -{"version":3,"file":"js-data-angular.min.js","sources":["js-data-angular.js"],"names":["root","factory","exports","module","require","e","define","amd","this","__WEBPACK_EXTERNAL_MODULE_1__","__WEBPACK_EXTERNAL_MODULE_2__","modules","__webpack_require__","moduleId","installedModules","id","loaded","call","m","c","p","registerAdapter","adapter","Adapter","undefined","project","window","name","httpLoaded","angular","provider","_this","defaults","$get","_createClass","defineProperties","target","props","key","prop","configurable","value","writable","Object","Constructor","protoProps","staticProps","prototype","_classCallCheck","instance","TypeError","JSData","Error","DSUtils","DSErrors","deepMixIn","copy","removeCircular","isString","isNumber","makePath","adapters","class","functionsToWrap","DSProvider","load","QPromise","executor","deferred","$q","defer","bind","resolve","reject","err","promise","_len","arguments","length","args","Array","_key","$rootScope","store","DS","originals","all","when","Promise","i","j","registered","k","_len2","_key2","$$phase","apply","$apply","observe","$watch","Platform","performMicrotaskCheckpoint","deps","push","bindAll","resourceName","params","scope","expr","cb","definitions","NER","isObject","IA","lastModified","items","filter","set","bindOne","resolveId","item","get","Defaults","queryTransform","resourceConfig","deserialize","data","serialize","log","error","defaultsPrototype","basePath","forceTrailingSlash","httpConfig","DSHttpAdapter","options","console","a","b","info","getPath","method","getEndpoint","GET","url","config","HTTP","POST","attrs","PUT","DEL","find","suffix","then","findAll","create","update","updateAll","destroy","destroyAll","dsHttpAdapterPrototype","DSHttpAdapterProvider","$http","logResponse","str","start","toUTCString","toUpperCase","status","Date","getTime","substr","default","run","code","webpackContext","req","webpackContextResolve","map","keys"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"js-data-angular.min.js","sources":["js-data-angular.js"],"names":["root","factory","exports","module","require","e","define","amd","this","__WEBPACK_EXTERNAL_MODULE_1__","__WEBPACK_EXTERNAL_MODULE_2__","modules","__webpack_require__","moduleId","installedModules","id","loaded","call","m","c","p","registerAdapter","adapter","Adapter","undefined","project","window","name","httpLoaded","angular","provider","_this","defaults","$get","_createClass","defineProperties","target","props","i","length","descriptor","enumerable","configurable","writable","Object","defineProperty","key","Constructor","protoProps","staticProps","prototype","_classCallCheck","instance","TypeError","value","JSData","Error","DSUtils","DSErrors","deepMixIn","copy","removeCircular","isString","isNumber","makePath","adapters","class","functionsToWrap","DSProvider","load","QPromise","executor","deferred","$q","defer","bind","resolve","reject","err","promise","_len","arguments","args","Array","_key","$rootScope","store","DS","originals","all","when","Promise","j","registered","_loop","k","_len2","_key2","$$phase","apply","$apply","observe","$watch","Platform","performMicrotaskCheckpoint","deps","push","bindAll","resourceName","params","scope","expr","cb","definitions","NER","isObject","IA","lastModified","items","filter","set","bindOne","resolveId","item","get","Defaults","resourceConfig","data","defaultsPrototype","basePath","forceTrailingSlash","httpConfig","DSHttpAdapter","options","console","log","a","b","info","error","method","getEndpoint","url","config","HTTP","attrs","suffix","queryTransform","GET","getPath","then","deserialize","POST","serialize","PUT","DEL","dsHttpAdapterPrototype","DSHttpAdapterProvider","$http","logResponse","str","start","toUTCString","toUpperCase","status","Date","getTime","substr","default","run","code","webpackContext","req","webpackContextResolve","map","keys"],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index fab568d..9cb3939 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "js-data-angular", "description": "Angular wrapper for js-data.", - "version": "2.2.3", + "version": "2.3.0", "homepage": "http://www.js-data.io/docs/js-data-angular", "repository": { "type": "git", @@ -20,18 +20,18 @@ ], "main": "dist/js-data-angular.js", "devDependencies": { - "babel-core": "^4.7.3", - "babel-loader": "^4.1.0", + "babel-core": "5.1.9", + "babel-loader": "5.0.0", "grunt": "0.4.5", "grunt-contrib-clean": "0.6.0", - "grunt-contrib-uglify": "0.8.0", + "grunt-contrib-uglify": "0.9.1", "grunt-contrib-watch": "0.6.1", "grunt-karma": "0.10.1", "grunt-karma-coveralls": "2.5.3", - "grunt-webpack": "^1.0.8", + "grunt-webpack": "1.0.8", "jit-grunt": "0.9.1", - "jshint": "^2.6.3", - "jshint-loader": "^0.8.3", + "jshint": "2.7.0", + "jshint-loader": "0.8.3", "karma": "0.12.31", "karma-chai": "0.1.0", "karma-chrome-launcher": "0.1.7", @@ -41,16 +41,16 @@ "karma-phantomjs-launcher": "0.1.4", "karma-script-launcher": "0.1.0", "karma-sinon": "1.0.4", - "karma-spec-reporter": "0.0.16", + "karma-spec-reporter": "0.0.18", "time-grunt": "1.1.0", - "webpack": "^1.7.2", - "webpack-dev-server": "^1.7.0" + "webpack": "1.8.4", + "webpack-dev-server": "1.8.0" }, "scripts": { "test": "grunt test" }, - "dependencies": { + "peerDependencies": { "angular": ">=1.1.0", - "js-data": ">=1.1.0" + "js-data": ">=1.5.7" } } diff --git a/src/index.js b/src/index.js index 8acfbbb..5ff163d 100644 --- a/src/index.js +++ b/src/index.js @@ -43,27 +43,27 @@ let adapters = [ { project: 'js-data-http', name: 'http', - class: 'DSHttpAdapter' + 'class': 'DSHttpAdapter' }, { project: 'js-data-localstorage', name: 'localstorage', - class: 'DSLocalStorageAdapter' + 'class': 'DSLocalStorageAdapter' }, { project: 'js-data-localforage', name: 'localforage', - class: 'DSLocalForageAdapter' + 'class': 'DSLocalForageAdapter' }, { project: 'js-data-firebase', name: 'firebase', - class: 'DSFirebaseAdapter' + 'class': 'DSFirebaseAdapter' }, { project: 'js-data-sql', name: 'sql', - class: 'DSSqlAdapter' + 'class': 'DSSqlAdapter' } ]; diff --git a/test/datastore/async_methods/update.test.js b/test/datastore/async_methods/update.test.js index bfb07b1..174cf0d 100644 --- a/test/datastore/async_methods/update.test.js +++ b/test/datastore/async_methods/update.test.js @@ -102,20 +102,26 @@ describe('DS.update', function () { $httpBackend.flush(); - $httpBackend.expectPUT('http://test.angular-cache.com/user/4/comment/6', { content: 'stuff' }).respond(200, testComment2); + $httpBackend.expectPUT('http://test.angular-cache.com/user/4/comment/6', { content: 'stuff', other: 'stuff' }).respond(200, testComment2); var comment = DS.inject('comment', testComment2); - function onBeforeUpdate(resourceName, attrs) { - attrs.other = 'stuff'; - assert.equal(resourceName, 'comment'); - assert.deepEqual(angular.toJson(attrs), angular.toJson({ content: 'stuff', other: 'stuff' })); + function onBeforeUpdate(resource, attrs) { + try { + attrs.other = 'stuff'; + assert.equal(angular.toJson(attrs), angular.toJson({ content: 'stuff', other: 'stuff' })); + } catch (e) { + console.log(e.stack); + } } - function onAfterUpdate(resourceName, attrs) { - assert.equal(resourceName, 'comment'); - assert.deepEqual(angular.toJson(attrs), angular.toJson(testComment2)); - assert.isFalse(testComment2 === attrs); + function onAfterUpdate(resource, attrs) { + try { + assert.deepEqual(angular.toJson(attrs), angular.toJson(testComment2)); + assert.isFalse(testComment2 === attrs); + } catch (e) { + console.log(e.stack); + } } Comment.on('DS.beforeUpdate', onBeforeUpdate); @@ -128,8 +134,12 @@ describe('DS.update', function () { approvedBy: 4 } }).then(function (comment) { - assert.deepEqual(angular.toJson(comment), angular.toJson(testComment2)); - assert.deepEqual(angular.toJson(comment), angular.toJson(DS.get('comment', 6))); + try { + assert.deepEqual(angular.toJson(comment), angular.toJson(testComment2)); + assert.deepEqual(angular.toJson(comment), angular.toJson(DS.get('comment', 6))); + } catch (e) { + console.log(e.stack); + } }, function () { fail('Should not have failed!'); }); @@ -147,8 +157,12 @@ describe('DS.update', function () { approvedBy: false } }).then(function (comment) { - assert.deepEqual(angular.toJson(comment), angular.toJson(testComment2)); - assert.deepEqual(angular.toJson(comment), angular.toJson(DS.get('comment', 6))); + try { + assert.deepEqual(angular.toJson(comment), angular.toJson(testComment2)); + assert.deepEqual(angular.toJson(comment), angular.toJson(DS.get('comment', 6))); + } catch (e) { + console.log(e.stack); + } }, function () { fail('Should not have failed!'); });