Added .toFunction() and Grunt task runner

torjue · Jul 8, 2013 · 7f39e84 · 7f39e84
1 parent 63c774e
commit 7f39e84
Show file tree

Hide file tree

Showing 9 changed files with 273 additions and 30 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 
 .DS_Store
-
+node_modules
 *.espressostorage
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -0,0 +1,49 @@
+'use strict';
+
+module.exports = function(grunt) {
+
+	grunt.initConfig({
+		pkg: grunt.file.readJSON('package.json'),
+		jshint: {
+			gruntfile: {
+				src: 'Gruntfile.js',
+				options: {
+					node: true
+				}
+			},
+			subsumer: {
+				src: [
+					'src/subsumer.js'
+				]
+			}
+		},
+		uglify: {
+			options: {
+				banner: '/*! <%= pkg.name %> - v<%= pkg.version %> - ' +
+						'<%= grunt.template.today("yyyy-mm-dd") %> - ' +
+						'http://torjue.mit-license.org */\n'
+			},
+			build: {
+				files: {
+					'build/subsumer.min.js': ['src/subsumer.js']
+				}
+			}
+		},
+		concat: {
+			options: {
+				stripBanners: true,
+				banner: '<%= uglify.options.banner %>'
+			},
+			dist: {
+				src: ['src/subsumer.js'],
+				dest: 'build/subsumer.js'
+			}
+		}
+	});
+
+	grunt.loadNpmTasks('grunt-contrib-jshint');
+	grunt.loadNpmTasks('grunt-contrib-uglify');
+	grunt.loadNpmTasks('grunt-contrib-concat');
+
+	grunt.registerTask('default', ['jshint', 'uglify', 'concat']);
+};
diff --git a/build/subsumer.js b/build/subsumer.js
@@ -0,0 +1,141 @@
+/*! Subsumer.js - v0.5.0 - 2013-07-08 - http://torjue.mit-license.org */
+(function(undefined) {
+	"use strict";
+
+	var ioc = function(){
+
+		var bindings = {},
+			originalBindings = {},
+			getParamNames,
+			getDependenciesFor,
+			createInstance,
+			isBound,
+			resolve,
+			afterUse,
+			instantiate,
+			use,
+			bind;
+
+		getParamNames = function(fn){
+			var fnString = fn.toString();
+			return fnString.match(/\(.*?\)/)[0]
+					.replace(/[()]/gi,'')
+					.replace(/\s/gi,'')
+					.split(',');
+		};
+
+		getDependenciesFor = function(fn){
+			var params = fn.$inject === undefined ? getParamNames(fn): fn.$inject;
+			var args = [null];	
+			for (var i=0; i<params.length; i++) {
+				var match = resolve(params[i]);
+				if (!!match) {
+					args.push(match);
+				}
+				else {
+					args.push(undefined);
+				}
+			}
+			return args;
+		};
+
+		createInstance = function(fn){
+			var args = getDependenciesFor(fn);
+			return new (Function.prototype.bind.apply(fn, args))();
+		};
+
+		isBound = function(key) {
+			return key in bindings;
+		};
+
+		resolve = function(key){
+			var val = bindings[key];
+			if(typeof val === 'function'){
+				return createInstance(val);
+			}
+			else {
+				return val;
+			}
+		};
+
+		afterUse = function(fn, key){
+			var returnValue = fn(key);
+			for(var k in originalBindings){
+				if (originalBindings.hasOwnProperty(k)) {
+					bindings[k] = originalBindings[k];
+				}
+			} 
+			originalBindings = {};
+			return returnValue;
+		};
+
+		instantiate = function(fn){
+			if(typeof fn === 'function'){
+				return createInstance(fn);
+			}
+			else {
+				return fn;
+			}
+		};
+
+		use = function(key, value){
+			originalBindings[key] = bindings[key];
+			bindings[key] = value;
+			return {
+				resolve: function(key){ return afterUse(resolve, key); },
+				instantiate: function(fn){ return afterUse(instantiate, fn); },
+				use: use
+			};
+		};
+
+		bind = function(key){
+			return {
+				to: function(value){
+					bindings[key] = value;
+					return {
+						asSingleton: function(){
+							bindings[key] = createInstance(value);
+						},
+						asFunction: function(){
+							bindings[key] = function(){ return value; };
+						}
+					};
+				},
+				toSingleton: function(singleton){
+					bindings[key] = createInstance(singleton);
+				},
+				toFunction: function(fn){
+					bindings[key] = function(){ return fn; };
+				}
+			};
+		};
+
+		return {
+			resolve: resolve,
+			bind: bind,
+			isBound: isBound,
+			use: use,
+			instantiate: instantiate
+		};
+	};
+
+	/* global exports:true, window:true, module:true, define:true */
+	// register for AMD module
+	if (typeof define === 'function' && define.amd) {
+		define("subsumer", ioc);
+	}
+
+	// export for node.js
+	if (typeof exports !== 'undefined') {
+		if (typeof module !== 'undefined' && module.exports) {
+			exports = module.exports = ioc;
+		}
+		exports = ioc;
+	}
+
+	// browser
+	if (typeof window !== 'undefined') {
+		window.subsumer = ioc;
+	}
+	/* global exports:false, window:false, module:false, define:false */
+})();
diff --git a/build/subsumer.min.js b/build/subsumer.min.js
diff --git a/package.json b/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "Subsumer.js",
+  "version": "0.5.0",
+  "description": "Lightweight IoC for JavaScript applications",
+  "main": "Subsumer.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/torjue/Subsumer.js.git"
+  },
+  "keywords": [
+    "ioc",
+    "di"
+  ],
+  "author": "Torjus Eidet",
+  "license": "MIT",
+  "readmeFilename": "readme.md",
+  "bugs": {
+    "url": "https://github.com/torjue/Subsumer.js/issues"
+  },
+  "devDependencies": {
+    "grunt": "~0.4.1",
+    "grunt-contrib-jshint": "~0.6.0",
+    "grunt-contrib-uglify": "~0.2.2",
+    "grunt-contrib-concat": "~0.3.0"
+  }
+}
diff --git a/subsumer.js → src/subsumer.js b/subsumer.js → src/subsumer.js
@@ -1,20 +1,29 @@
-;(function(undefined) {
+(function(undefined) {
 	"use strict";
 
 	var ioc = function(){
 
 		var bindings = {},
-			originalBindings = {};
+			originalBindings = {},
+			getParamNames,
+			getDependenciesFor,
+			createInstance,
+			isBound,
+			resolve,
+			afterUse,
+			instantiate,
+			use,
+			bind;
 
-		var getParamNames = function(fn){
-		    var fnString = fn.toString();
-		    return fnString.match(/\(.*?\)/)[0]
-		    		.replace(/[()]/gi,'')
-		    		.replace(/\s/gi,'')
-		    		.split(',');
+		getParamNames = function(fn){
+			var fnString = fn.toString();
+			return fnString.match(/\(.*?\)/)[0]
+					.replace(/[()]/gi,'')
+					.replace(/\s/gi,'')
+					.split(',');
 		};
 
-		var getDependenciesFor = function(fn){
+		getDependenciesFor = function(fn){
 			var params = fn.$inject === undefined ? getParamNames(fn): fn.$inject;
 			var args = [null];	
 			for (var i=0; i<params.length; i++) {
@@ -29,16 +38,16 @@
 			return args;
 		};
 
-		var createInstance = function(fn){
+		createInstance = function(fn){
 			var args = getDependenciesFor(fn);
-			return new (Function.prototype.bind.apply(fn, args));
+			return new (Function.prototype.bind.apply(fn, args))();
 		};
 
-		var isBound = function(key) {
+		isBound = function(key) {
 			return key in bindings;
 		};
 
-		var resolve = function(key){
+		resolve = function(key){
 			var val = bindings[key];
 			if(typeof val === 'function'){
 				return createInstance(val);
@@ -48,16 +57,18 @@
 			}
 		};
 
-		var afterUse = function(fn, key){
+		afterUse = function(fn, key){
 			var returnValue = fn(key);
-			for(var key in originalBindings){
-				bindings[key] = originalBindings[key];
+			for(var k in originalBindings){
+				if (originalBindings.hasOwnProperty(k)) {
+					bindings[k] = originalBindings[k];
+				}
 			} 
 			originalBindings = {};
 			return returnValue;
 		};
 
-		var instantiate = function(fn){
+		instantiate = function(fn){
 			if(typeof fn === 'function'){
 				return createInstance(fn);
 			}
@@ -66,28 +77,34 @@
 			}
 		};
 
-		var use = function(key, value){
+		use = function(key, value){
 			originalBindings[key] = bindings[key];
 			bindings[key] = value;
 			return {
-				resolve: function(key){ return afterUse(resolve, key) },
-				instantiate: function(fn){ return afterUse(instantiate, fn) },
+				resolve: function(key){ return afterUse(resolve, key); },
+				instantiate: function(fn){ return afterUse(instantiate, fn); },
 				use: use
 			};
 		};
 
-		var bind = function(key){
+		bind = function(key){
 			return {
 				to: function(value){
 					bindings[key] = value;
 					return {
 						asSingleton: function(){
 							bindings[key] = createInstance(value);
+						},
+						asFunction: function(){
+							bindings[key] = function(){ return value; };
 						}
-					}
+					};
 				},
 				toSingleton: function(singleton){
 					bindings[key] = createInstance(singleton);
+				},
+				toFunction: function(fn){
+					bindings[key] = function(){ return fn; };
 				}
 			};
 		};
@@ -101,9 +118,10 @@
 		};
 	};
 
+	/* global exports:true, window:true, module:true, define:true */
 	// register for AMD module
 	if (typeof define === 'function' && define.amd) {
-	    define("subsumer", ioc);
+		define("subsumer", ioc);
 	}
 
 	// export for node.js
@@ -116,7 +134,7 @@
 
 	// browser
 	if (typeof window !== 'undefined') {
-		window['subsumer'] = ioc;
+		window.subsumer = ioc;
 	}
- 	
+	/* global exports:false, window:false, module:false, define:false */
 })();
diff --git a/subsumer.min.js b/subsumer.min.js
diff --git a/tests.min.js b/tests.min.js