See GeppettoJS#51, resolve dependencies before calling initialize

mmikeyy · Sep 25, 2014 · dd827e3 · dd827e3
1 parent 64da9e3
commit dd827e3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/backbone.geppetto.js b/backbone.geppetto.js
@@ -40,7 +40,9 @@
     Resolver.prototype = {
         _createAndSetupInstance: function(Clazz, wiring) {
             var instance = new Clazz();
-            this.resolve(instance, wiring);
+            if (!instance.initialize) {
+                this.resolve(instance, wiring);
+            }
             return instance;
         },
 
@@ -69,15 +71,18 @@
         },
 
         _wrapConstructor: function(OriginalConstructor, wiring) {
+            if (OriginalConstructor.prototype.initialize) {
+                var context = this._context;
 
-            var context = this._context;
-
-            return OriginalConstructor.extend({
-                initialize: function() {
-                    context.resolver.resolve(this, wiring);
-                    OriginalConstructor.prototype.initialize.apply(this, arguments);
-                }
-            });
+                return OriginalConstructor.extend({
+                    initialize: function() {
+                        context.resolver.resolve(this, wiring);
+                        OriginalConstructor.prototype.initialize.apply(this, arguments);
+                    }
+                });
+            } else {
+                return OriginalConstructor;
+            }
         },
 
 
@@ -100,7 +105,7 @@
 
         wireClass: function(key, clazz, wiring) {
             this._mappings[key] = {
-                clazz: clazz,
+                clazz: this._wrapConstructor(clazz, wiring),
                 object: null,
                 type: TYPES.OTHER,
                 wiring: wiring
@@ -120,7 +125,7 @@
         wireSingleton: function(key, clazz, wiring) {
 
             this._mappings[key] = {
-                clazz: clazz,
+                clazz: this._wrapConstructor(clazz, wiring),
                 object: null,
                 type: TYPES.SINGLETON,
                 wiring: wiring

diff --git a/dist/backbone.geppetto.min.js b/dist/backbone.geppetto.min.js
diff --git a/specs/src/resolver-specs.js b/specs/src/resolver-specs.js
@@ -368,8 +368,12 @@ define([
             var clazz = function(){
                 clazzInstantiated++;
             };
+            var resolvedDependency;
             var singleton = Backbone.Model.extend({
-                wiring : ['clazz']
+                wiring : ['clazz'],
+                initialize : function(){
+                    resolvedDependency = this.clazz;
+                }
             });
             beforeEach(function(){
                 clazzInstantiated=0;
@@ -380,6 +384,10 @@ define([
                 var actual = resolver.getObject('singleton');
                 expect(clazzInstantiated ).to.equal(1);
             });
+            it("should resolve dependencies before initialization", function(){
+                var actual = resolver.getObject('singleton');
+                expect(resolvedDependency ).to.be.instanceOf(clazz);
+            });
         });
     });