- tag 0.3.4

- namespace is now optional calling directly native storages `.keys()` and `.reset()` functions

Author: Mathieu Ghaleb

README.md

@@ -73,8 +73,8 @@ basil = new window.Basil(options);
 basil.set('hello', 'world');
 
 // store data under a given namespace
-basil.set('hello', 42, { 'namespace': 'alt' });
-basil.set('abc', 'def', { 'namespace': 'alt', 'storages': ['memory'] });
+basil.set('hello', 42, { 'namespace': 'alt' });
+basil.set('abc', 'def', { 'namespace': 'alt', 'storages': ['memory'] });
 
 // retrieve data
 basil.get('hello'); // return 'world'
@@ -89,12 +89,12 @@ basil.keysMap(); // returns { 'hello': ['local'] }
 basil.keysMap({ 'namespace': 'alt' }); // returns { 'hello': ['local'], 'abc': ['memory'] }
 
 // remove data under a given namespace
-basil.remove('hello', { 'namespace': 'alt' });
+basil.remove('hello', { 'namespace': 'alt' });
 basil.get('hello'); // return 'world'
 basil.get('hello', { 'namespace': 'alt' }); // return null
 
 // reset data under a given namespace
-basil.reset({ 'namespace': 'alt', 'storages': ['local', 'memory']});
+basil.reset({ 'namespace': 'alt', 'storages': ['local', 'memory']});
 ```
 
 ## Configuration

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "basil.js",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "homepage": "https://github.com/Wisembly/basil.js",
   "authors": [
     "Mathieu Ghaleb <mathieu@wisembly.com>"

build/basil.js

@@ -303,7 +303,7 @@
 					storageKeys = _storages[storage].keys(namespace);
 					for (var j = 0, key; j < storageKeys.length; j++) {
 						key = storageKeys[j];
-						map[key] = map[key] instanceof Array ? map[key] : [];
+						map[key] = map[key] || [];
 						map[key].push(storage);
 					}
 				}

package.json

@@ -1,6 +1,6 @@
 {
     "name": "basil.js",
-    "version": "0.3.3",
+    "version": "0.3.4",
     "scripts": {
         "test": "node node_modules/karma/bin/karma start test/karma.config.js",
         "test-plugins": "node node_modules/karma/bin/karma start test/karma.plugins.config.js",

src/basil.js

@@ -5,7 +5,7 @@
 	};
 
 	// Version
-	Basil.version = '0.3.3';
+	Basil.version = '0.3.4';
 
 	// Utils
 	Basil.utils = {
@@ -18,6 +18,9 @@
 			}
 			return destination;
 		},
+		isArray: function (obj) {
+			return Object.prototype.toString.call(obj) === '[object Array]';
+		},
 		registerPlugin: function (methods) {
 			Basil.plugins = this.extend(methods, Basil.plugins);
 		}
@@ -42,13 +45,13 @@
 			_toStoragesArray = function (storages) {
 				if (!storages)
 					return null;
-				return Object.prototype.toString.call(storages) === '[object Array]' ? storages : [storages];
+				return Basil.utils.isArray(storages) ? storages : [storages];
 			},
 			_toStoredKey = function (namespace, name) {
 				var key = '';
 				if (typeof name === 'string')
 					key = namespace + ':' + name;
-				else if (name instanceof Array) {
+				else if (Basil.utils.isArray(name)) {
 					key = namespace;
 					for (var i = 0; i < name.length; i++)
 						if (name[i])
@@ -57,7 +60,9 @@
 				return key;
 			},
 			_toKeyName = function (namespace, name) {
-				return name.replace(namespace + ':', '');
+				if (!namespace)
+					return name;
+				return name.replace(new RegExp('^' + namespace + ':'), '');
 			},
 			_toStoredValue = function (value) {
 				return JSON.stringify(value);
@@ -92,7 +97,7 @@
 			reset: function (namespace) {
 				for (var i = 0, key; i < this.engine.length; i++) {
 					key = this.engine.key(i);
-					if (key.indexOf(namespace) === 0) {
+					if (!namespace || key.indexOf(namespace) === 0) {
 						this.remove(key);
 						i--;
 					}
@@ -102,7 +107,7 @@
 				var keys = [];
 				for (var i = 0, key; i < this.engine.length; i++) {
 					key = this.engine.key(i);
-					if (key.indexOf(namespace) === 0)
+					if (!namespace || key.indexOf(namespace) === 0)
 						keys.push(_toKeyName(namespace, key));
 				}
 				return keys;
@@ -133,14 +138,14 @@
 			},
 			reset: function (namespace) {
 				for (var key in this._hash) {
-					if (key.indexOf(namespace) === 0)
+					if (!namespace || key.indexOf(namespace) === 0)
 						this.remove(key);
 				}
 			},
 			keys: function (namespace) {
 				var keys = [];
 				for (var key in this._hash)
-					if (key.indexOf(namespace) === 0)
+					if (!namespace || key.indexOf(namespace) === 0)
 						keys.push(_toKeyName(namespace, key));
 				return keys;
 			}
@@ -167,8 +172,8 @@
 			},
 			get: function (name) {
 				var cookies = document.cookie.split(';');
-				for (var i = 0; i < cookies.length; i++) {
-					var cookie = cookies[i].replace(/^\s*/, '');
+				for (var i = 0, cookie; i < cookies.length; i++) {
+					cookie = cookies[i].replace(/^\s*/, '');
 					if (cookie.indexOf(name + '=') === 0)
 						return cookie.substring(name.length + 1, cookie.length);
 				}
@@ -187,20 +192,20 @@
 			},
 			reset: function (namespace) {
 				var cookies = document.cookie.split(';');
-				for (var i = 0; i < cookies.length; i++) {
-					var cookie = cookies[i].replace(/^\s*/, ''),
-						key = cookie.substr(0, cookie.indexOf('='));
-					if (key.indexOf(namespace) === 0)
+				for (var i = 0, cookie, key; i < cookies.length; i++) {
+					cookie = cookies[i].replace(/^\s*/, '');
+					key = cookie.substr(0, cookie.indexOf('='));
+					if (!namespace || key.indexOf(namespace) === 0)
 						this.remove(key);
 				}
 			},
 			keys: function (namespace) {
 				var keys = [],
 					cookies = document.cookie.split(';');
-				for (var i = 0; i < cookies.length; i++) {
-					var cookie = cookies[i].replace(/^\s*/, ''),
-						key = cookie.substr(0, cookie.indexOf('='));
-					if (key.indexOf(namespace) === 0)
+				for (var i = 0, cookie, key; i < cookies.length; i++) {
+					cookie = cookies[i].replace(/^\s*/, '');
+					key = cookie.substr(0, cookie.indexOf('='));
+					if (!namespace || key.indexOf(namespace) === 0)
 						keys.push(_toKeyName(namespace, key));
 				}
 				return keys;
@@ -310,6 +315,7 @@
 				return map;
 			},
 			// Access to native storages, without namespace or basil value decoration
+			memory: _storages.memory,
 			cookie: _storages.cookie,
 			localStorage: _storages.local,
 			sessionStorage: _storages.session

test/test.js

@@ -40,13 +40,13 @@
 			var data = {
 					str: 'hello world',
 					nb: 42,
-					obj: { foo: 'bar', baz: 'quux' },
+					obj: { foo: 'bar', baz: 'quux' },
 					arr: ['foo', 42, 'bar']
 				},
 				alt = {
 					str: 'foobar',
 					nb: -1,
-					obj: { hello: 'world', foo: 'bar' },
+					obj: { hello: 'world', foo: 'bar' },
 					arr: ['quux', -1, 'baz']
 				};
 
@@ -61,7 +61,7 @@
 				var basil = new window.Basil();
 				for (var key in alt) {
 					basil.set(key, alt[key], { namespace: 'alt' });
-					expect(basil.get(key, { namespace: 'alt' })).to.eql(alt[key]);
+					expect(basil.get(key, { namespace: 'alt' })).to.eql(alt[key]);
 					expect(basil.get(key)).to.eql(data[key]);
 				}
 			});
@@ -135,9 +135,9 @@
 				});
 				expect(basil.keys({ namespace: 'third' })).to.eql([]);
 				expect(basil.keysMap({ namespace: 'third' })).to.eql({});
-				basil.reset({ namespace: 'first' });
-				basil.reset({ namespace: 'second' });
-				basil.reset({ namespace: 'third' });
+				basil.reset({ namespace: 'first' });
+				basil.reset({ namespace: 'second' });
+				basil.reset({ namespace: 'third' });
 			});
 		});