Merge pull request #2511 from jasonLaster/metal

Backbone Metal 🤘

.jshintrc

@@ -8,6 +8,7 @@
     "jQuery"     : true,
     "_"          : true,
     "Backbone"   : true,
+    "Metal"      : true,
     "Marionette" : true
   },
 

Gruntfile.js

@@ -28,6 +28,8 @@ module.exports = function(grunt) {
         ' *\n' +
         ' * Includes Radio\n' +
         ' * https://github.com/marionettejs/backbone.radio/\n' +
+        ' * Includes Metal\n' +
+        ' * https://github.com/marionettejs/backbone-metal/\n' +
         ' */\n\n\n'
     },
 
@@ -250,6 +252,10 @@ module.exports = function(grunt) {
       radio: {
         src: './node_modules/backbone.radio/build/backbone.radio.js',
         dest: './tmp/backbone.radio.bare.js'
+      },
+      metal: {
+        src: './node_modules/backbone-metal/dist/backbone-metal.js',
+        dest: './tmp/backbone.metal.bare.js'
       }
     }
   });

SpecRunner.html

@@ -66,12 +66,14 @@
     <script src="node_modules/backbone/backbone.js"></script>
     <script src="node_modules/backbone.babysitter/lib/backbone.babysitter.js"></script>
     <script src="node_modules/backbone.radio/build/backbone.radio.js"></script>
+    <script src="node_modules/backbone-metal/dist/backbone-metal.js"></script>
 
 
     <script>
         window.Marionette = Backbone.Marionette = {};
         window.slice = Array.prototype.slice;
     </script>
+    <script src="src/metal.js"></script>
     <script src="src/trigger-method.js"></script>
     <script src="src/bind-entity-events.js"></script>
     <script src="src/radio-helpers.js"></script>

bower.json

@@ -38,6 +38,7 @@
     "underscore": "1.4.4 - 1.6.0",
     "backbone.babysitter": "^0.1.0",
     "backbone.radio": "^0.9.0",
+    "backbone-metal": "^0.5.0",
     "jquery": "^1.8.0 || ^2.0.0"
   }
 }

component.json

@@ -31,6 +31,7 @@
   "dependencies": {
     "marionettejs/backbone.babysitter": "*",
     "marionettejs/backbone.radio": "*",
+    "marionettejs/backbone-metal": "*",
     "jashkenas/backbone": "*",
     "jashkenas/underscore": "*"
   },

package.json

@@ -43,6 +43,7 @@
     "backbone.babysitter": "^0.1.0",
     "backbone.radio": "^0.9.0",
     "backbone": "1.0.0 - 1.1.2",
+    "backbone-metal": "^0.5.0",
     "underscore": "1.4.4 - 1.6.0"
   },
   "devDependencies": {

src/build/bundled.js

@@ -22,6 +22,9 @@
   /* istanbul ignore next */
   // @include ../../tmp/backbone.radio.bare.js
 
+  /* istanbul ignore next */
+  // @include ../../tmp/backbone.metal.bare.js
+
   var previousMarionette = root.Marionette;
   var previousMn = root.Mn;
 
@@ -43,6 +46,8 @@
   // @include ../radio-helpers.js
 
   // @include ../error.js
+  // @include ../metal.js
+
   // @include ../object.js
   // @include ../region.js
   // @include ../region-manager.js

src/build/core.js

@@ -1,7 +1,7 @@
 (function(root, factory) {
 
   if (typeof define === 'function' && define.amd) {
-    define(['backbone', 'underscore','backbone.radio', 'backbone.babysitter'],
+    define(['backbone', 'underscore','backbone.radio', 'backbone.babysitter','backbone-metal'],
       function(Backbone, _) {
       return (root.Marionette = root.Mn = factory(root, Backbone, _));
     });
@@ -10,6 +10,7 @@
     var _ = require('underscore');
     var BabySitter = require('backbone.babysitter');
     var Radio = require('backbone.radio');
+    var Metal = require('backbone-metal');
     module.exports = factory(root, Backbone, _);
   } else {
     root.Marionette = root.Mn = factory(root, root.Backbone, root._);
@@ -39,6 +40,8 @@
   // @include ../radio-helpers.js
 
   // @include ../error.js
+  // @include ../metal.js
+
   // @include ../object.js
   // @include ../region.js
   // @include ../region-manager.js

src/metal.js

@@ -0,0 +1,3 @@
+// Add Backbone.Metal extensions here
+// 1. Marionette.Class
+// 2. Marionette.Error and Marionette.Deprecate

test/unit/setup/node.js

@@ -32,6 +32,7 @@ global.$ = global.jQuery = require('jquery');
 global._ = require('underscore');
 global.Backbone = require('backbone');
 global.Backbone.$ = global.$;
+global.Metal = require('backbone-metal');
 global.Marionette = Backbone.Marionette = {};
 require('backbone.babysitter');
 require('backbone.radio');
@@ -41,6 +42,7 @@ requireHelper('radio-helpers');
 requireHelper('trigger-method');
 requireHelper('helpers');
 requireHelper('dom-refresh');
+requireHelper('metal');
 requireHelper('object');
 requireHelper('app-router');
 requireHelper('application');

test/unit/trigger-method.spec.js

@@ -160,12 +160,12 @@ describe('trigger event and method name', function() {
 
     describe('when the context does not have triggerMethod defined', function() {
       beforeEach(function() {
-        this.view = new Backbone.View();
-        this.view.onFoo = this.methodHandler;
-        this.view.on('foo', this.eventHandler);
+        this.obj = _.extend({}, Backbone.Events);
+        this.obj.onFoo = this.methodHandler;
+        this.obj.on('foo', this.eventHandler);
         this.triggerMethodSpy = this.sinon.spy(Marionette, 'triggerMethod');
 
-        Marionette.triggerMethodOn(this.view, 'foo');
+        Marionette.triggerMethodOn(this.obj, 'foo');
       });
 
       it('should trigger the event', function() {