specs/spec_helper.js specs/suite.html @@ -29,9 +29,9 @@ Screw.Unit(function() { MBX.JsController.destroyController('PrototypeTestController'); }); - it("should call afterCreate if it exists", function () { + it("should call initialize if it exists", function () { var thisController = MBX.JsController.create("ATestController", { - afterCreate: function () { + initialize: function () { this.anAfterCreateAttr = "cool"; } }); @@ -39,6 +39,35 @@ Screw.Unit(function() { MBX.JsController.destroyController("ATestController"); }); + describe("loosely coupled controllers", function () { + var MyModel; + before(function() { + Screw.MBXlooselyCoupledFired = false; + MyModel = MBX.JsModel.create("MyModel"); + MyController = MBX.JsController.create("MyModelController", { + model: MyModel, + looselyCoupled: true, + onInstanceCreate: function () { + Screw.MBXlooselyCoupledFired = true; + } + }); + }); + + after(function () { + MBX.JsModel.destroyModel("MyModel"); + }); + + it("should defer the subscription when loosely coupled", function (me) { + MyModel.create(); + expect(Screw.MBXlooselyCoupledFired).to(be_false); + using(me).wait(2).and_then(function () { + expect(Screw.MBXlooselyCoupledFired).to(be_true); + }); + }); + + + }); + describe("a new controller with a model", function () { var MyModel; before(function () { @@ -62,10 +91,6 @@ Screw.Unit(function() { expect(eventSubscriptions[2]).to(equal, [MBX, MyModel.Event.destroyInstance]); }); - it("should be able to find an instance given a valid DOM element", function () { - var el = $$(".mymodel .mymodel_") - }); - describe("callbacks", function () { var lastCallback, instance; before(function () { specs/specs/js_controller_spec.js @@ -9,6 +9,16 @@ Screw.Unit(function() { expect(MBX.JsModel.Event.newModel).to_not(be_null); }); + it("should call initialize on the model if it exists", function () { + var called = false; + MyModel = MBX.JsModel.create("MyModel", { + initialize: function () { + called = true; + } + }); + expect(called).to(be_true); + }); + it("should allow you to specify an afterCreate that gets executed after an instance is created", function () { MyModel = MBX.JsModel.create("MyModel", { instanceMethods: { specs/specs/js_model_spec.js @@ -22,6 +22,16 @@ Screw.Unit(function() { expect(MyView.newAttr).to(equal, "cool"); }); + it("should call initialize", function () { + var called = false; + MyModel = MBX.JsView.create({ + initialize: function () { + called = true; + } + }); + expect(called).to(be_true); + }); + describe("extended prototype elements", function () { it("should extend elements", function () { @@ -272,5 +282,28 @@ Screw.Unit(function() { }); + describe("loosely coupled view", function () { + before(function() { + Screw.MBXlooselyCoupledViewFired = false; + MyController = MBX.JsView.create({ + model: MyModel, + looselyCoupled: true, + onInstanceCreate: function () { + Screw.MBXlooselyCoupledViewFired = true; + } + }); + }); + + it("should defer the subscription when loosely coupled", function (me) { + MyModel.create(); + expect(Screw.MBXlooselyCoupledViewFired).to(be_false); + using(me).wait(2).and_then(function () { + expect(Screw.MBXlooselyCoupledViewFired).to(be_true); + }); + }); + + + }); + }); }); specs/specs/js_view_spec.js @@ -31,11 +31,6 @@ Screw.Unit(function() { queue.add(function () { called++; }); - - // make the event fire right away even though we're allowing the eventhandler - // to defer this - //TH.setTimeout.mock(); - expect(MBX.QueueController.subscriptions[queue.primaryKey()]).to_not(be_null); MBX.EventHandler.fireCustom(queue, "timer_complete", { queue: queue specs/specs/queue_controller_spec.js @@ -128,7 +128,7 @@ MBX.JsController = (function () { var newEvent = this.model.Event.newInstance; var destroyEvent = this.model.Event.destroyInstance; var attributeEvent = this.model.Event.changeAttribute; - var defer = this.loosleyCoupled; + var defer = this.looselyCoupled; this.eventSubscriptions = []; this.eventSubscriptions.push(MBX.EventHandler.subscribe(MBX, changeEvent, this._onInstanceChange.bind(this), {defer: defer})); @@ -174,7 +174,7 @@ MBX.JsController = (function () { /** Controllers allow some decently powerful hooks. You can specify a model, and an - onAfterCreate, onInstanceChange, onInstanceDestroy, onInstanceCreate. + onInstanceChange, onInstanceDestroy, onInstanceCreate. If your controller listens to a model, but you are not dependent on real-time updates, you can add the option "looselyCoupled: true" and all updates will be done with @@ -215,8 +215,8 @@ MBX.JsController = (function () { throw new Error("A controller with the name of " + name + " is already in use"); } var controller = new JsController(name, opts); - if (typeof controller.afterCreate == "function") { - controller.afterCreate(); + if (typeof controller.initialize == "function") { + controller.initialize(); } return controller; }; src/js_controller.js @@ -69,8 +69,8 @@ MBX.JsView = (function () { this._subscribeToEvents(); } - if (typeof this.afterCreate == 'function') { - this.afterCreate(); + if (typeof this.initialize == 'function') { + this.initialize(); } }; src/js_view.js specs/mvc_spec_helper.js specs/mvc_suite.html 7b9cb934e01d924c190c8be13323826e9341a8a3 topper topper@toppingdesign.com http://github.com/tobowers/mamoo/commit/3d05bbe727bc547e0eecc4bb4a2748d1d35c28e3 3d05bbe727bc547e0eecc4bb4a2748d1d35c28e3 2009-03-15T09:18:09-07:00 2009-03-15T09:18:09-07:00 spec out the looselyCoupled options on controllers and views 8c07e8e4076758702d22653aa14492a7a826fbf3 topper topper@toppingdesign.com