From 05c4e7a2065bbb8fa04d30adf1a461829e6acbc7 Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Wed, 4 Mar 2015 20:32:07 -0700 Subject: [PATCH] Stable Version 2.2.2. Fixes #312 Fixes #313 --- .travis.yml | 13 -------- CHANGELOG.md | 6 ++++ Gruntfile.js | 30 +++++------------- dist/js-data-angular.js | 49 ++++++++++++++++++------------ dist/js-data-angular.min.js | 6 ++-- dist/js-data-angular.min.map | 2 +- package.json | 4 +-- src/index.js | 25 ++++++++++----- test/adapters/http/create.test.js | 2 +- test/adapters/http/destroy.test.js | 2 +- test/adapters/http/find.test.js | 2 +- test/adapters/http/update.test.js | 2 +- 12 files changed, 68 insertions(+), 75 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 3f10973..0000000 --- a/.travis.yml +++ /dev/null @@ -1,13 +0,0 @@ -language: node_js -node_js: - - "0.10" -before_install: - - npm install -g bower - - bower install - - npm install -g grunt-cli -before_script: - - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start -script: - - grunt test - - grunt coveralls || true diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d1d71e..0b35bf8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +##### 2.2.2 - 04 March 2015 + +###### Backwards compatible bug fixes +- #312 - UMDifying js-data-angular +- #313 - DSHttpAdapter#find/create/update/destroy do not call queryTransform + ##### 2.2.1 - 25 February 2015 ###### Backwards compatible bug fixes diff --git a/Gruntfile.js b/Gruntfile.js index e7c0f73..58acb59 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -2,7 +2,7 @@ * js-data-angular * http://github.com/js-data/js-data-angular * - * Copyright (c) 2014 Jason Dobry + * Copyright (c) 2014-2015 Jason Dobry * Licensed under the MIT license. */ module.exports = function (grunt) { @@ -40,7 +40,7 @@ module.exports = function (grunt) { '* @author Jason Dobry \n' + '* @file js-data-angular.min.js\n' + '* @version <%= pkg.version %> - Homepage \n' + - '* @copyright (c) 2014 Jason Dobry \n' + + '* @copyright (c) 2014-2015 Jason Dobry \n' + '* @license MIT \n' + '*\n' + '* @overview Angular wrapper for js-data.\n' + @@ -49,21 +49,6 @@ module.exports = function (grunt) { files: { 'dist/js-data-angular.min.js': ['dist/js-data-angular.js'] } - }, - scripts: { - files: { - 'doc/resources/js/libs.min.js': ['doc/resources/js/libs.js'] - } - } - }, - browserify: { - options: { - external: ['js-data'] - }, - dist: { - files: { - 'dist/js-data-angular.js': ['src/index.js'] - } } }, karma: { @@ -107,13 +92,13 @@ module.exports = function (grunt) { }); grunt.registerTask('banner', function () { - var file = grunt.file.read('dist/js-data-angular.js'); + var file = grunt.file.read('./src/index.js'); var banner = '/**\n' + '* @author Jason Dobry \n' + '* @file js-data-angular.js\n' + - '* @version ' + pkg.version + ' - Homepage \n' + - '* @copyright (c) 2014 Jason Dobry \n' + + '* @version ' + pkg.version + ' - Homepage \n' + + '* @copyright (c) 2014-2015 Jason Dobry \n' + '* @license MIT \n' + '*\n' + '* @overview Angular wrapper for js-data.js.\n' + @@ -121,15 +106,14 @@ module.exports = function (grunt) { file = banner + file; - grunt.file.write('dist/js-data-angular.js', file); + grunt.file.write('./dist/js-data-angular.js', file); }); grunt.registerTask('build', [ 'clean', 'jshint', - 'browserify', 'banner', - 'uglify:main' + 'uglify' ]); grunt.registerTask('go', ['build', 'watch:dist']); grunt.registerTask('default', ['build']); diff --git a/dist/js-data-angular.js b/dist/js-data-angular.js index 4b0db6b..a8ba577 100644 --- a/dist/js-data-angular.js +++ b/dist/js-data-angular.js @@ -1,31 +1,32 @@ /** * @author Jason Dobry * @file js-data-angular.js -* @version 2.2.1 - Homepage -* @copyright (c) 2014 Jason Dobry +* @version 2.2.2 - Homepage +* @copyright (c) 2014-2015 Jason Dobry * @license MIT * * @overview Angular wrapper for js-data.js. */ -(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 * @file js-data-angular.min.js -* @version 2.2.1 - Homepage -* @copyright (c) 2014 Jason Dobry +* @version 2.2.2 - Homepage +* @copyright (c) 2014-2015 Jason Dobry * @license MIT * * @overview Angular wrapper for js-data. */ -!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g=200&&a.status<300?(e.defaults.log&&e.defaults.log(b,a),a):(e.defaults.error&&e.defaults.error("FAILED: "+b,a),d.reject(a))}var e=this,f=new Date;a=k(a,e.defaults.httpConfig),e.defaults.forceTrailingSlash&&"/"!==a.url[a.url.length-1]&&(a.url+="/"),a.method=a.method.toUpperCase(),"object"==typeof a.data&&(a.data=j.removeCircular(a.data));var g=a.suffix||e.defaults.suffix;return g&&a.url.substr(a.url.length-g.length)!==g&&(a.url+=g),b(a).then(c,c)};var e=new f(a.defaults);return c.registerAdapter("http",e,{"default":!0}),e}]}),c.module("js-data").run(["DS","DSHttpAdapter",function(a,b){a.registerAdapter("http",b,{"default":!0})}])}}(window,window.angular)},{"js-data":"js-data"}]},{},[1]); +!function(a,b){"use strict";"function"==typeof define&&define.amd?define(["angular","js-data"],function(c,d){return b(a,c,d,void 0)}):"object"==typeof exports&&"object"==typeof module?module.exports=b(a,require("angular")||a.angular,require("js-data")||a.JSData,void 0):"object"==typeof exports?exports.jsDataAngularModuleName=b(a,require("angular")||a.angular,require("js-data")||a.JSData,void 0):a.jsDataAngularModuleName=b(a,a.angular,a.JSData,void 0)}(this,function(a,b,c,d){"use strict";function e(){}function f(a){this.defaults=new e,i(this.defaults,a)}function g(c){var d;try{d=require(c.project)}catch(e){}d||(d=a[c["class"]]),d&&("http"===c.name&&(j=!0),c.loaded=!0,b.module("js-data").provider(c["class"],function(){var a=this;a.defaults={},a.$get=[function(){return new d(a.defaults)}]}))}if(!c||!b)throw new Error("js-data and angular must be loaded!");var h=c.DSUtils,i=h.deepMixIn,j=!1,k=[{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"}],l=["compute","digest","eject","inject","link","linkAll","linkInverse","unlinkInverse"];b.module("js-data",["ng"]).value("DSUtils",c.DSUtils).value("DSErrors",c.DSErrors).provider("DS",function(){function a(){function a(a){var c=i.defer();try{a.call(d,b.bind(c,c.resolve),b.bind(c,c.reject))}catch(e){c.reject(e)}return c.promise}var f=Array.prototype.slice.call(arguments),g=f[f.length-2],i=f[f.length-1],j=new c.DS(e.defaults),m={};if(a.all=i.all,a.when=i.when,a.reject=i.reject,h.Promise=a,f.length)for(var n=0;n=200&&a.status<300?(e.defaults.log&&e.defaults.log(b,a),a):(e.defaults.error&&e.defaults.error("FAILED: "+b,a),d.reject(a))}var e=this,f=new Date;a=i(a,e.defaults.httpConfig),e.defaults.forceTrailingSlash&&"/"!==a.url[a.url.length-1]&&(a.url+="/"),a.method=a.method.toUpperCase(),"object"==typeof a.data&&(a.data=h.removeCircular(a.data));var g=a.suffix||e.defaults.suffix;return g&&a.url.substr(a.url.length-g.length)!==g&&(a.url+=g),b(a).then(c,c)};var e=new f(a.defaults);return c.registerAdapter("http",e,{"default":!0}),e}]}),b.module("js-data").run(["DS","DSHttpAdapter",function(a,b){a.registerAdapter("http",b,{"default":!0})}])}return"js-data"}); //# 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 099c622..92791fd 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":["e","t","n","r","s","o","u","a","require","i","f","Error","code","l","exports","call","length",1,"window","angular","undefined","Defaults","DSHttpAdapter","options","this","defaults","deepMixIn","registerAdapter","adapter","Adapter","project","name","httpLoaded","loaded","module","provider","_this","$get","JSData","DSUtils","adapters","class","functionsToWrap","value","DSErrors","load","QPromise","executor","deferred","$q","defer","bind","resolve","reject","err","promise","args","Array","prototype","slice","arguments","$rootScope","store","DS","originals","all","when","Promise","j","registered","k","$$phase","apply","$apply","Object","observe","$watch","Platform","performMicrotaskCheckpoint","deps","push","bindAll","resourceName","params","scope","expr","cb","definitions","NER","isObject","IA","isString","lastModified","items","filter","set","bindOne","id","resolveId","isNumber","item","get","defaultsPrototype","queryTransform","resource","basePath","forceTrailingSlash","httpConfig","log","console","b","info","error","deserialize","data","serialize","dsHttpAdapterPrototype","getPath","method","resourceConfig","getEndpoint","makePath","GET","url","config","HTTP","POST","attrs","copy","PUT","DEL","find","suffix","then","findAll","create","update","updateAll","destroy","destroyAll","$http","logResponse","str","start","toUTCString","toUpperCase","status","Date","getTime","removeCircular","substr","default","run","js-data"],"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","define","amd","angular","JSData","undefined","exports","module","require","jsDataAngularModuleName","this","window","Defaults","DSHttpAdapter","options","defaults","deepMixIn","registerAdapter","adapter","Adapter","project","e","name","httpLoaded","loaded","provider","_this","$get","Error","DSUtils","adapters","class","functionsToWrap","value","DSErrors","load","QPromise","executor","deferred","$q","defer","call","bind","resolve","reject","err","promise","args","Array","prototype","slice","arguments","$rootScope","length","store","DS","originals","all","when","Promise","i","j","registered","k","$$phase","apply","$apply","Object","observe","$watch","Platform","performMicrotaskCheckpoint","deps","push","bindAll","resourceName","params","scope","expr","cb","definitions","NER","isObject","IA","isString","lastModified","items","filter","set","bindOne","id","resolveId","isNumber","item","get","defaultsPrototype","queryTransform","resource","basePath","forceTrailingSlash","httpConfig","log","console","a","b","info","error","deserialize","data","serialize","dsHttpAdapterPrototype","getPath","method","resourceConfig","getEndpoint","makePath","GET","url","config","HTTP","POST","attrs","copy","PUT","DEL","find","suffix","then","findAll","create","update","updateAll","destroy","destroyAll","$http","logResponse","str","start","toUTCString","toUpperCase","status","Date","getTime","removeCircular","substr","default","run"],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 6299628..f3686de 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "js-data-angular", "description": "Angular wrapper for js-data.", - "version": "2.2.1", + "version": "2.2.2", "homepage": "http://www.js-data.io/docs/js-data-angular", "repository": { "type": "git", @@ -21,7 +21,6 @@ "main": "src/index.js", "devDependencies": { "grunt": "0.4.5", - "grunt-browserify": "3.4.0", "grunt-contrib-clean": "0.6.0", "grunt-contrib-jshint": "0.11.0", "grunt-contrib-uglify": "0.8.0", @@ -45,7 +44,6 @@ "test": "grunt test" }, "dependencies": { - "mout": "0.11.0", "js-data": ">=1.1.0" } } diff --git a/src/index.js b/src/index.js index 6891425..fa76644 100644 --- a/src/index.js +++ b/src/index.js @@ -3,15 +3,17 @@ 'use strict'; if (typeof define === 'function' && define.amd) { - define(['angular', 'js-data'], function(angular, JSData) { + define(['angular', 'js-data'], function (angular, JSData) { return factory(root, angular, JSData, undefined); }); - } else if (typeof module !== 'undefined' && module.exports) { - module.exports = factory(root, require('angular') || root.angular, require('js-data'), undefined); + } else if (typeof exports === 'object' && typeof module === 'object') { + module.exports = factory(root, require('angular') || root.angular, require('js-data') || root.JSData, undefined); + } else if (typeof exports === 'object') { + exports.jsDataAngularModuleName = factory(root, require('angular') || root.angular, require('js-data') || root.JSData, undefined); } else { root.jsDataAngularModuleName = factory(root, root.angular, root.JSData, undefined); } -}(this, function(window, angular, JSData, undefined) { +}(this, function (window, angular, JSData, undefined) { 'use strict'; if (!JSData || !angular) { @@ -348,6 +350,8 @@ var _this = this; options = 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 @@ -383,6 +387,8 @@ var _this = this; options = 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), @@ -396,6 +402,8 @@ var _this = this; options = 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), @@ -428,6 +436,8 @@ var _this = this; options = 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 @@ -462,7 +472,7 @@ var _this = this; var start = new Date(); config = deepMixIn(config, _this.defaults.httpConfig); - if (_this.defaults.forceTrailingSlash && config.url[config.url.length-1] !== '/') { + if (_this.defaults.forceTrailingSlash && config.url[config.url.length - 1] !== '/') { config.url += '/'; } config.method = config.method.toUpperCase(); @@ -502,8 +512,7 @@ DS.registerAdapter('http', DSHttpAdapter, { default: true }); }]); } - + // return the module name return 'js-data'; - -}); +})); diff --git a/test/adapters/http/create.test.js b/test/adapters/http/create.test.js index 35dff6a..d692da9 100644 --- a/test/adapters/http/create.test.js +++ b/test/adapters/http/create.test.js @@ -31,6 +31,6 @@ describe('DSHttpAdapter.create', function () { $httpBackend.flush(); - assert.equal(lifecycle.queryTransform.callCount, 0, 'queryTransform should not have been called'); + assert.equal(lifecycle.queryTransform.callCount, 2, 'queryTransform should have been called twice'); }); }); diff --git a/test/adapters/http/destroy.test.js b/test/adapters/http/destroy.test.js index dc25160..8ec0df3 100644 --- a/test/adapters/http/destroy.test.js +++ b/test/adapters/http/destroy.test.js @@ -25,6 +25,6 @@ describe('DSHttpAdapter.destroy', function () { $httpBackend.flush(); - assert.equal(lifecycle.queryTransform.callCount, 0, 'queryTransform should not have been called'); + assert.equal(lifecycle.queryTransform.callCount, 2, 'queryTransform should have been called twice'); }); }); diff --git a/test/adapters/http/find.test.js b/test/adapters/http/find.test.js index ad99d9d..2c0bb95 100644 --- a/test/adapters/http/find.test.js +++ b/test/adapters/http/find.test.js @@ -25,7 +25,7 @@ describe('DSHttpAdapter.find', function () { $httpBackend.flush(); - assert.equal(lifecycle.queryTransform.callCount, 0, 'queryTransform should not have been called'); + assert.equal(lifecycle.queryTransform.callCount, 2, 'queryTransform should have been called twice'); }); it('should error if the item is undefined', function () { diff --git a/test/adapters/http/update.test.js b/test/adapters/http/update.test.js index 060132e..e29c4ef 100644 --- a/test/adapters/http/update.test.js +++ b/test/adapters/http/update.test.js @@ -31,6 +31,6 @@ describe('DSHttpAdapter.update', function () { $httpBackend.flush(); - assert.equal(lifecycle.queryTransform.callCount, 0, 'queryTransform should not have been called'); + assert.equal(lifecycle.queryTransform.callCount, 2, 'queryTransform should have been called twice'); }); });