build 2.0.0-pre.1

package.json

@@ -1,7 +1,7 @@
 {
   "name": "orchestra",
   "description": "Simplify Backbone.Marionette applcations with an opinionated set of dependencies",
-  "version": "1.5.1",
+  "version": "2.0.0-pre.1",
   "authors": [
     "Andrew Humphreys <ahumphreys87@googlemail.com>",
     "Joe Fitter <hello@joefitter.com>",
@@ -19,12 +19,11 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "backbone": "1.2.3",
+    "backbone": "^1.3.3",
     "backbone-routing": "^0.2.0",
     "backbone-validation": "^0.11.5",
     "backbone.cocktail": "0.5.10",
-    "backbone.marionette": "^2.4.2",
-    "backbone.radio": "^1.0.0",
+    "backbone.marionette": "3.0.0-pre.3",
     "backbone.service": "^0.5.2",
     "backbone.stickit": "^0.9.0",
     "backbone.storage": "0.2.1",
@@ -35,7 +34,7 @@
     "i18next": "2.3.5",
     "i18next-sprintf-postprocessor": "0.0.6",
     "jquery": "2.1.1",
-    "lodash": "^3.10.1",
+    "lodash": "^4.0.0",
     "moment": "^2.8.3",
     "numeral": "^1.5.3"
   },

src/index.js

@@ -27,13 +27,6 @@ if (window.__agent) {
 
 handlebarsHelpers();
 
-var func = Backbone.Marionette.Module.create;
-
-Backbone.Marionette.Module.create = function(app, moduleNames, moduleDefinition) {
-  moduleDefinition.namespace = moduleNames;
-  func.apply(this, arguments);
-};
-
 // build orchestra framework
 const Orchestra = {};
 _.extend(Orchestra, Backbone);
@@ -66,6 +59,7 @@ _.extend(Orchestra, {
       this.instances[namespace] = new this.Application({
         namespace: namespace
       });
+      console.log(namespace, this.instances);
       this.listenTo(this.instances[namespace], 'destroy', () => {
         delete this.instances[namespace];
       });

tests/fixtures/mixins/touch.view.js

@@ -20,7 +20,7 @@ module.exports = {
 
 		var props = _.extend(defaultProps, props);
 
-		return Orchestra.ItemView.extend(props);
+		return Orchestra.View.extend(props);
 	},
 
 	boot: function(view, mixViewProps) {

tests/spec/index-spec.js

@@ -12,8 +12,8 @@ describe('Orchestra', function() {
 	});
 
 	it('should expose Marionette classes', function() {
-		expect(this.Orchestra.CompositeView).to.be.a('function');
-		expect(this.Orchestra.Module).to.be.a('function');
+		expect(this.Orchestra.View).to.be.a('function');
+		expect(this.Orchestra.CollectionView).to.be.a('function');
 	});
 
 	it('should expose the TouchView object', function() {
@@ -92,13 +92,13 @@ describe('Orchestra', function() {
 
 			it('should return new \'main\' orchestra instance', function() {
 				component = this.Orchestra.getInstance('main');
-				expect(component.namespace).to.eql('main');
+				expect(component.options.namespace).to.eql('main');
 			});
 
 			it('should store reference for instance in instances object', function() {
 				this.Orchestra.getInstance('main');
 				expect(this.Orchestra.instances.main).to.be.an('object');
-				expect(this.Orchestra.instances.main.namespace).to.eql('main');
+				expect(this.Orchestra.instances.main.options.namespace).to.eql('main');
 			});
 
 		});
@@ -116,15 +116,4 @@ describe('Orchestra', function() {
 		});
 	});
 
-	describe('Module.create()', function() {
-		before(function() {
-			this.instance = this.Orchestra.getInstance('main');
-		});
-
-		it('should add namespace to options of the module', function() {
-			this.Orchestra.Module.create(this.instance, 'custom.module', {});
-			expect(this.instance.custom.module.options.namespace).to.eql('custom.module');
-		});
-	});
-
 });