Add factory to view mappings

Resolves #50
GeppettoJS · Sep 12, 2014 · 5d479cc · 5d479cc
1 parent 221af79
commit 5d479cc
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 9 deletions.
diff --git a/backbone.geppetto.js b/backbone.geppetto.js
@@ -40,6 +40,12 @@
         return new FactoryFunction();
     }
 
+    function createFactory(clazz) {
+        return function() {
+            return applyToConstructor(clazz, _.toArray(arguments));
+        };
+    }
+
     var Resolver = function(context) {
         this._mappings = {};
         this._context = context;
@@ -89,18 +95,17 @@
             return output;
         },
 
-        _wrapConstructor: function(OriginalConstructor, wiring) {
-            if (OriginalConstructor.prototype.initialize) {
-                var context = this._context;
-
-                return OriginalConstructor.extend({
-                    initialize: function() {
+        _wrapConstructor: function(clazz, wiring) {
+            var context = this._context;
+            if (clazz.extend) {
+                return clazz.extend({
+                    constructor: function() {
                         context.resolver.resolve(this, wiring);
-                        OriginalConstructor.prototype.initialize.apply(this, arguments);
+                        clazz.prototype.constructor.apply(this, arguments);
                     }
                 });
             } else {
-                return OriginalConstructor;
+                return clazz;
             }
         },
 
@@ -143,7 +148,7 @@
 
         wireView: function(key, clazz, wiring) {
             this._mappings[key] = {
-                clazz: this._wrapConstructor(clazz, wiring),
+                clazz: createFactory(this._wrapConstructor(clazz, wiring)),
                 object: null,
                 type: TYPES.VIEW
             };

diff --git a/specs/src/resolver-specs.js b/specs/src/resolver-specs.js
@@ -336,6 +336,29 @@ define([
                 context.dispatch('event:foo');
                 expect(contextEventSpy).to.have.been.called;
             });
+            it("should be a factory method (as well)", function(){
+                var factory = resolver.getObject(key);
+                var view = factory();
+                expect(view).to.be.instanceOf(clazz);
+            });
+            it("should call the factory view's original 'initialize' function when instantiated", function() {
+                var initializeSpy = sinon.spy();
+                expect(initializeSpy).not.to.have.been.called;
+                clazz.prototype.initialize = function() {
+                    initializeSpy();
+                };
+                var factory = resolver.getObject(key);
+                var viewInstance = factory();
+                expect(initializeSpy).to.have.been.calledOnce;
+            });
+            it("should be injected with its dependencies when instantiated by the factory", function() {
+                clazz.prototype.wiring = ['foo'];
+                var foo = {};
+                resolver.wireValue('foo', foo);
+                var factory = resolver.getObject(key);
+                var viewInstance = factory();
+                expect(viewInstance.foo).to.equal(foo);
+            });
         });
         describe("when wrapping a constructor", function() {
             it("should allow wrapped constructor to handle initialization parameters in similar fashion as unwrapped constructor)", function() {