Stable Version 2.1.3

Author: jmdobry

.gitignore

@@ -8,4 +8,5 @@ bower_components/
 coverage/
 
 npm-debug.log
-junit/
+junit/
+dist/karma.start.js

CHANGELOG.md

@@ -1,3 +1,9 @@
+##### 2.1.3 - 10 November 2015
+
+###### Other
+- Rebuilt with Babel v6
+- CI tests now run on Browserstack
+
 ##### 2.1.2 - 30 October 2015
 
 ###### Other

README.md

@@ -4,6 +4,9 @@
 
 localStorage adapter for [js-data](http://www.js-data.io/).
 
+Tested on IE9, Chrome 46, Firefox 41 & Safari 7.1 using
+<img src="https://raw.githubusercontent.com/js-data/js-data-localstorage/master/bs.jpg" alt="bs logo" title="browserstack" width="150" height="35" style="vertical-align: middle" />
+
 ### API Documentation
 [DSLocalStorageAdapter](http://www.js-data.io/docs/dslocalstorageadapter)
 

bower.json

@@ -29,6 +29,6 @@
     "karma.start.js"
   ],
   "dependencies": {
-    "js-data": ">=2.0.0"
+    "js-data": "~2.x"
   }
 }

bs.jpg

@@ -1,6 +1,6 @@
 /*!
 * js-data-localstorage
-* @version 2.1.2 - Homepage <http://www.js-data.io/docs/dslocalstorageadapter>
+* @version 2.1.3 - Homepage <http://www.js-data.io/docs/dslocalstorageadapter>
 * @author Jason Dobry <[email protected]>
 * @copyright (c) 2014-2015 Jason Dobry
 * @license MIT <https://github.com/js-data/js-data-localstorage/blob/master/LICENSE>
@@ -63,11 +63,13 @@ return /******/ (function(modules) { // webpackBootstrap
 /* 0 */
 /***/ function(module, exports, __webpack_require__) {
 
-	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; }; })();
+	'use strict';
+
+	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; }; })();
 
 	function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
+	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 	/* global: localStorage */
 	var JSData = __webpack_require__(1);
@@ -210,7 +212,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	      var instance = undefined;
 	      options = options || {};
-	      options['with'] = options['with'] || [];
+	      options.with = options.with || [];
 	      return new DSUtils.Promise(function (resolve, reject) {
 	        _this.GET(_this.getIdPath(resourceConfig, options || {}, id)).then(function (item) {
 	          return !item ? reject(new Error('Not Found!')) : item;
@@ -222,22 +224,22 @@ return /******/ (function(modules) { // webpackBootstrap
 	            var relationName = def.relation;
 	            var relationDef = resourceConfig.getResource(relationName);
 	            var containedName = null;
-	            if (DSUtils.contains(options['with'], relationName)) {
+	            if (DSUtils.contains(options.with, relationName)) {
 	              containedName = relationName;
-	            } else if (DSUtils.contains(options['with'], def.localField)) {
+	            } else if (DSUtils.contains(options.with, def.localField)) {
 	              containedName = def.localField;
 	            }
 	            if (containedName) {
 	              (function () {
 	                var __options = DSUtils.deepMixIn({}, options.orig ? options.orig() : options);
-	                __options['with'] = options['with'].slice();
+	                __options.with = options.with.slice();
 	                __options = DSUtils._(relationDef, __options);
-	                DSUtils.remove(__options['with'], containedName);
-	                DSUtils.forEach(__options['with'], function (relation, i) {
+	                DSUtils.remove(__options.with, containedName);
+	                DSUtils.forEach(__options.with, function (relation, i) {
 	                  if (relation && relation.indexOf(containedName) === 0 && relation.length >= containedName.length && relation[containedName.length] === '.') {
-	                    __options['with'][i] = relation.substr(containedName.length + 1);
+	                    __options.with[i] = relation.substr(containedName.length + 1);
 	                  } else {
-	                    __options['with'][i] = '';
+	                    __options.with[i] = '';
 	                  }
 	                });
 
@@ -288,7 +290,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	          return DSUtils.Promise.all(tasks);
 	        }).then(function () {
 	          return resolve(instance);
-	        })['catch'](reject);
+	        }).catch(reject);
 	      });
 	    }
 	  }, {
@@ -298,7 +300,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	      var items = null;
 	      options = options || {};
-	      options['with'] = options['with'] || [];
+	      options.with = options.with || [];
 	      return new DSUtils.Promise(function (resolve, reject) {
 	        try {
 	          (function () {
@@ -326,22 +328,22 @@ return /******/ (function(modules) { // webpackBootstrap
 	          var relationName = def.relation;
 	          var relationDef = resourceConfig.getResource(relationName);
 	          var containedName = null;
-	          if (DSUtils.contains(options['with'], relationName)) {
+	          if (DSUtils.contains(options.with, relationName)) {
 	            containedName = relationName;
-	          } else if (DSUtils.contains(options['with'], def.localField)) {
+	          } else if (DSUtils.contains(options.with, def.localField)) {
 	            containedName = def.localField;
 	          }
 	          if (containedName) {
 	            (function () {
 	              var __options = DSUtils.deepMixIn({}, options.orig ? options.orig() : options);
-	              __options['with'] = options['with'].slice();
+	              __options.with = options.with.slice();
 	              __options = DSUtils._(relationDef, __options);
-	              DSUtils.remove(__options['with'], containedName);
-	              DSUtils.forEach(__options['with'], function (relation, i) {
+	              DSUtils.remove(__options.with, containedName);
+	              DSUtils.forEach(__options.with, function (relation, i) {
 	                if (relation && relation.indexOf(containedName) === 0 && relation.length >= containedName.length && relation[containedName.length] === '.') {
-	                  __options['with'][i] = relation.substr(containedName.length + 1);
+	                  __options.with[i] = relation.substr(containedName.length + 1);
 	                } else {
-	                  __options['with'][i] = '';
+	                  __options.with[i] = '';
 	                }
 	              });
 
@@ -445,7 +447,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	          _this3.PUT(DSUtils.makePath(_this3.getIdPath(resourceConfig, options, attrs[resourceConfig.idAttribute])), DSUtils.omit(attrs, resourceConfig.relationFields || [])).then(function (item) {
 	            _this3.ensureId(item[resourceConfig.idAttribute], resourceConfig, options);
 	            resolve(item);
-	          })['catch'](reject);
+	          }).catch(reject);
 	        });
 	      });
 	    }
@@ -460,7 +462,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	          _this4.PUT(_this4.getIdPath(resourceConfig, options, id), DSUtils.omit(attrs, resourceConfig.relationFields || [])).then(function (item) {
 	            _this4.ensureId(item[resourceConfig.idAttribute], resourceConfig, options);
 	            resolve(item);
-	          })['catch'](reject);
+	          }).catch(reject);
 	        });
 	      });
 	    }
@@ -512,10 +514,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	})();
 
 	DSLocalStorageAdapter.version = {
-	  full: '2.1.2',
+	  full: '2.1.3',
 	  major: parseInt('2', 10),
 	  minor: parseInt('1', 10),
-	  patch: parseInt('2', 10),
+	  patch: parseInt('3', 10),
 	  alpha:  true ? 'false' : false,
 	  beta:  true ? 'false' : false
 	};

dist/js-data-localstorage.js

@@ -5,6 +5,27 @@ var customLaunchers = {
 		browser_version: '9.0',
 		os: 'Windows',
 		os_version: '7'
+	},
+	bs_safari7_osxmavericks: {
+		base: 'BrowserStack',
+		browser: 'safari',
+		browser_version: '7.1',
+		os: 'OS X',
+		os_version: 'Mavericks'
+	},
+	bs_firefox41_windows7: {
+		base: 'BrowserStack',
+		browser: 'firefox',
+		browser_version: '41.0',
+		os: 'Windows',
+		os_version: '7'
+	},
+	bs_chrome46_windows7: {
+		base: 'BrowserStack',
+		browser: 'chrome',
+		browser_version: '46.0',
+		os: 'Windows',
+		os_version: '7'
 	}
 };
 
@@ -20,15 +41,11 @@ module.exports = function (config) {
 	config.set({
 		// base path, that will be used to resolve files and exclude
 		basePath: './',
-		frameworks: ['sinon', 'chai', 'mocha'],
+		frameworks: ['mocha'],
 		plugins: [
 			// these plugins will be require() by Karma
-			'karma-sinon',
 			'karma-mocha',
-			'karma-chai',
-			'karma-chrome-launcher',
 			'karma-phantomjs-launcher',
-			'karma-firefox-launcher',
 			'karma-coverage',
 			'karma-browserstack-launcher',
 			'karma-junit-reporter'
@@ -42,8 +59,8 @@ module.exports = function (config) {
 			'node_modules/es6-promise/dist/es6-promise.js',
 			'node_modules/js-data/dist/js-data.js',
 			'dist/js-data-localstorage.js',
-			'karma.start.js',
-			'test/**/*.js'
+			'node_modules/js-data-adapter-tests/dist/js-data-adapter-tests.js',
+			'karma.start.js'
 		],
 
 		reporters: ['dots', 'coverage', 'junit'],
@@ -73,7 +90,7 @@ module.exports = function (config) {
 
 		customLaunchers: customLaunchers,
 
-		browserNoActivityTimeout: 30000,
+		browserNoActivityTimeout: 90000,
 
 		// web server port
 		port: 9876,
@@ -88,7 +105,7 @@ module.exports = function (config) {
 		logLevel: config.LOG_INFO,
 
 		// If browser does not capture in given timeout [ms], kill it
-		captureTimeout: 30000,
+		captureTimeout: 90000,
 
 		// Continuous Integration mode
 		// if true, it capture browsers, run tests and exit

dist/js-data-localstorage.min.js

@@ -1,103 +1,11 @@
-// Setup global test variables
-var dsLocalStorageAdapter, Profile, User, Post, Comment, datastore;
-
-assert.equalObjects = function (a, b, m) {
-  assert.deepEqual(JSON.parse(JSON.stringify(a)), JSON.parse(JSON.stringify(b)), m || 'Objects should be equal!');
-};
-
-// Helper globals
-var fail = function (msg) {
-  if (msg instanceof Error) {
-    console.log(msg.stack);
-  } else {
-    assert.equal('should not reach this!: ' + msg, 'failure');
-  }
-};
-var TYPES_EXCEPT_STRING = [123, 123.123, null, undefined, {}, [], true, false, function () {
-}];
-var TYPES_EXCEPT_STRING_OR_ARRAY = [123, 123.123, null, undefined, {}, true, false, function () {
-}];
-var TYPES_EXCEPT_STRING_OR_OBJECT = [123, 123.123, null, undefined, [], true, false, function () {
-}];
-var TYPES_EXCEPT_STRING_OR_NUMBER_OBJECT = [null, undefined, [], true, false, function () {
-}];
-var TYPES_EXCEPT_ARRAY = ['string', 123, 123.123, null, undefined, {}, true, false, function () {
-}];
-var TYPES_EXCEPT_STRING_OR_NUMBER = [null, undefined, {}, [], true, false, function () {
-}];
-var TYPES_EXCEPT_STRING_OR_ARRAY_OR_NUMBER = [null, undefined, {}, true, false, function () {
-}];
-var TYPES_EXCEPT_NUMBER = ['string', null, undefined, {}, [], true, false, function () {
-}];
-var TYPES_EXCEPT_OBJECT = ['string', 123, 123.123, null, undefined, true, false, function () {
-}];
-var TYPES_EXCEPT_BOOLEAN = ['string', 123, 123.123, null, undefined, {}, [], function () {
-}];
-var TYPES_EXCEPT_FUNCTION = ['string', 123, 123.123, null, undefined, {}, [], true, false];
-
-// Setup before each test
 beforeEach(function () {
   localStorage.clear();
-  var JSData;
-  if (!window && typeof module !== 'undefined' && module.exports) {
-    JSData = require('js-data');
-  } else {
-    JSData = window.JSData;
-  }
+});
 
-  datastore = new JSData.DS();
+window.assert = TestRunner.assert;
 
-  Profile = datastore.defineResource({
-    name: 'profile'
-  });
-  User = datastore.defineResource({
-    name: 'user',
-    relations: {
-      hasMany: {
-        post: {
-          localField: 'posts',
-          foreignKey: 'post'
-        }
-      },
-      hasOne: {
-        profile: {
-          localField: 'profile',
-          localKey: 'profileId'
-        }
-      }
-    }
-  });
-  Post = datastore.defineResource({
-    name: 'post',
-    relations: {
-      belongsTo: {
-        user: {
-          localField: 'user',
-          localKey: 'userId'
-        }
-      },
-      hasMany: {
-        comment: {
-          localField: 'comments',
-          foreignKey: 'postId'
-        }
-      }
-    }
-  });
-  Comment = datastore.defineResource({
-    name: 'comment',
-    relations: {
-      belongsTo: {
-        post: {
-          localField: 'post',
-          localKey: 'postId'
-        },
-        user: {
-          localField: 'user',
-          localKey: 'userId'
-        }
-      }
-    }
-  });
-  dsLocalStorageAdapter = new DSLocalStorageAdapter();
-});
+TestRunner.init({
+  features: [],
+  DS: JSData.DS,
+  Adapter: DSLocalStorageAdapter
+});