marionette-rails 1.0.1 → 1.0.2

data/lib/marionette-rails/version.rb

@@ -1,5 +1,5 @@
 module Marionette
   module Rails
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/vendor/assets/javascripts/backbone.marionette.js

@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v1.0.1
+// v1.0.2
 //
 // Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -17,10 +17,15 @@
  * https://github.com/marionettejs/backbone.wreqr/
  */
 
-// Backbone.BabySitter, v0.0.4
-// Copyright (c)2012 Derick Bailey, Muted Solutions, LLC.
+// Backbone.BabySitter
+// -------------------
+// v0.0.5
+//
+// Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
-// http://github.com/marionettejs/backbone.babysitter
+//
+// http://github.com/babysitterjs/backbone.babysitter
+
 // Backbone.ChildViewContainer
 // ---------------------------
 //
@@ -28,7 +33,7 @@
 // shut down child views.
 
 Backbone.ChildViewContainer = (function(Backbone, _){
-
+  
   // Container Constructor
   // ---------------------
 
@@ -194,9 +199,9 @@ Backbone.ChildViewContainer = (function(Backbone, _){
   //
   // Mix in methods from Underscore, for iteration, and other
   // collection related features.
-  var methods = ['forEach', 'each', 'map', 'find', 'detect', 'filter',
-    'select', 'reject', 'every', 'all', 'some', 'any', 'include',
-    'contains', 'invoke', 'toArray', 'first', 'initial', 'rest',
+  var methods = ['forEach', 'each', 'map', 'find', 'detect', 'filter', 
+    'select', 'reject', 'every', 'all', 'some', 'any', 'include', 
+    'contains', 'invoke', 'toArray', 'first', 'initial', 'rest', 
     'last', 'without', 'isEmpty', 'pluck'];
 
   _.each(methods, function(method) {
@@ -231,14 +236,14 @@ Backbone.Wreqr = (function(Backbone, Marionette, _){
 
 Wreqr.Handlers = (function(Backbone, _){
   "use strict";
-
+  
   // Constructor
   // -----------
 
   var Handlers = function(options){
     this.options = options;
     this._wreqrHandlers = {};
-
+    
     if (_.isFunction(this.initialize)){
       this.initialize(options);
     }
@@ -344,7 +349,7 @@ Wreqr.CommandStorage = (function(){
 
         // build the configuration
         commands = {
-          command: commandName,
+          command: commandName, 
           instances: []
         };
 
@@ -530,18 +535,18 @@ Marionette.getOption = function(target, optionName){
 // Trigger an event and a corresponding method name. Examples:
 //
 // `this.triggerMethod("foo")` will trigger the "foo" event and
-// call the "onFoo" method.
+// call the "onFoo" method. 
 //
 // `this.triggerMethod("foo:bar") will trigger the "foo:bar" event and
 // call the "onFooBar" method.
 Marionette.triggerMethod = (function(){
-
+  
   // split the event name on the :
   var splitter = /(^|:)(\w)/gi;
 
   // take the event section ("section1:section2:section3")
   // and turn it in to uppercase name
-  function getEventName(match, prefix, eventName) {
+  function getEventName(match, prefix, eventName) { 
     return eventName.toUpperCase();
   }
 
@@ -610,8 +615,8 @@ Marionette.MonitorDOMRefresh = (function(){
 // Marionette.bindEntityEvents & unbindEntityEvents
 // ---------------------------
 //
-// These methods are used to bind/unbind a backbone "entity" (collection/model)
-// to methods on a target object.
+// These methods are used to bind/unbind a backbone "entity" (collection/model) 
+// to methods on a target object. 
 //
 // The first parameter, `target`, must have a `listenTo` method from the
 // EventBinder object.
@@ -621,7 +626,7 @@ Marionette.MonitorDOMRefresh = (function(){
 //
 // The third parameter is a hash of { "event:name": "eventHandler" }
 // configuration. Multiple handlers can be separated by a space. A
-// function can be supplied instead of a string handler name.
+// function can be supplied instead of a string handler name. 
 
 (function(Marionette){
   "use strict";
@@ -663,7 +668,7 @@ Marionette.MonitorDOMRefresh = (function(){
       target.stopListening(entity, evt, method, target);
   }
 
-
+  
   // generic looping function
   function iterateEvents(target, entity, bindings, functionCallback, stringCallback){
     if (!entity || !bindings) { return; }
@@ -676,7 +681,7 @@ Marionette.MonitorDOMRefresh = (function(){
     // iterate the bindings and bind them
     _.each(bindings, function(methods, evt){
 
-      // allow for a function as the handler,
+      // allow for a function as the handler, 
       // or a list of event names as a string
       if (_.isFunction(methods)){
         functionCallback(target, entity, evt, methods);
@@ -686,7 +691,7 @@ Marionette.MonitorDOMRefresh = (function(){
 
     });
   }
-
+ 
   // Export Public API
   Marionette.bindEntityEvents = function(target, entity, bindings){
     iterateEvents(target, entity, bindings, bindToFunction, bindFromStrings);
@@ -713,7 +718,7 @@ Marionette.Callbacks = function(){
 _.extend(Marionette.Callbacks.prototype, {
 
   // Add a callback to be executed. Callbacks added here are
-  // guaranteed to execute, even if they are added after the
+  // guaranteed to execute, even if they are added after the 
   // `run` method is called.
   add: function(callback, contextOverride){
     this._callbacks.push({cb: callback, ctx: contextOverride});
@@ -724,8 +729,8 @@ _.extend(Marionette.Callbacks.prototype, {
     });
   },
 
-  // Run all registered callbacks with the context specified.
-  // Additional callbacks can be added after this has been run
+  // Run all registered callbacks with the context specified. 
+  // Additional callbacks can be added after this has been run 
   // and they will still be executed.
   run: function(options, context){
     this._deferred.resolve(context, options);
@@ -737,7 +742,7 @@ _.extend(Marionette.Callbacks.prototype, {
     var callbacks = this._callbacks;
     this._deferred = Marionette.$.Deferred();
     this._callbacks = [];
-
+    
     _.each(callbacks, function(cb){
       this.add(cb.cb, cb.ctx);
     }, this);
@@ -774,7 +779,7 @@ _.extend(Marionette.Controller.prototype, Backbone.Events, {
   }
 });
 
-// Region
+// Region 
 // ------
 //
 // Manage the visual regions of your composite application. See
@@ -828,19 +833,19 @@ _.extend(Marionette.Region, {
     }
 
     var selector, RegionType;
-
+   
     // get the selector for the region
-
+    
     if (regionIsString) {
       selector = regionConfig;
-    }
+    } 
 
     if (regionConfig.selector) {
       selector = regionConfig.selector;
     }
 
     // get the type for the region
-
+    
     if (regionIsType){
       RegionType = regionConfig;
     }
@@ -852,7 +857,7 @@ _.extend(Marionette.Region, {
     if (regionConfig.regionType) {
       RegionType = regionConfig.regionType;
     }
-
+    
     // build the region instance
     var region = new RegionType({
       el: selector
@@ -941,8 +946,8 @@ _.extend(Marionette.Region.prototype, Backbone.Events, {
     delete this.currentView;
   },
 
-  // Attach an existing view to the region. This
-  // will not call `render` or `onShow` for the new view,
+  // Attach an existing view to the region. This 
+  // will not call `render` or `onShow` for the new view, 
   // and will not replace the current HTML for the `el`
   // of the region.
   attachView: function(view){
@@ -1073,9 +1078,9 @@ Marionette.RegionManager = (function(Marionette){
   //
   // Mix in methods from Underscore, for iteration, and other
   // collection related features.
-  var methods = ['forEach', 'each', 'map', 'find', 'detect', 'filter',
-    'select', 'reject', 'every', 'all', 'some', 'any', 'include',
-    'contains', 'invoke', 'toArray', 'first', 'initial', 'rest',
+  var methods = ['forEach', 'each', 'map', 'find', 'detect', 'filter', 
+    'select', 'reject', 'every', 'all', 'some', 'any', 'include', 
+    'contains', 'invoke', 'toArray', 'first', 'initial', 'rest', 
     'last', 'without', 'isEmpty', 'pluck'];
 
   _.each(methods, function(method) {
@@ -1100,7 +1105,7 @@ Marionette.TemplateCache = function(templateId){
 };
 
 // TemplateCache object-level methods. Manage the template
-// caches from these method calls instead of creating
+// caches from these method calls instead of creating 
 // your own TemplateCache instances
 _.extend(Marionette.TemplateCache, {
   templateCaches: {},
@@ -1123,7 +1128,7 @@ _.extend(Marionette.TemplateCache, {
   // are specified, clears all templates:
   // `clear()`
   //
-  // If arguments are specified, clears each of the
+  // If arguments are specified, clears each of the 
   // specified templates from the cache:
   // `clear("#t1", "#t2", "...")`
   clear: function(){
@@ -1163,7 +1168,7 @@ _.extend(Marionette.TemplateCache.prototype, {
   // Load a template from the DOM, by default. Override
   // this method to provide your own template retrieval
   // For asynchronous loading with AMD/RequireJS, consider
-  // using a template-loader plugin as described here:
+  // using a template-loader plugin as described here: 
   // https://github.com/marionettejs/backbone.marionette/wiki/Using-marionette-with-requirejs
   loadTemplate: function(templateId){
     var template = Marionette.$(templateId).html();
@@ -1221,7 +1226,7 @@ Marionette.View = Backbone.View.extend({
   },
 
   // import the "triggerMethod" to trigger events with corresponding
-  // methods if the method exists
+  // methods if the method exists 
   triggerMethod: Marionette.triggerMethod,
 
   // Get the template for this view
@@ -1283,7 +1288,7 @@ Marionette.View = Backbone.View.extend({
     return triggerEvents;
   },
 
-  // Overriding Backbone.View's delegateEvents to handle
+  // Overriding Backbone.View's delegateEvents to handle 
   // the `triggers`, `modelEvents`, and `collectionEvents` configuration
   delegateEvents: function(events){
     this._delegateDOMEvents(events);
@@ -1330,15 +1335,16 @@ Marionette.View = Backbone.View.extend({
       return;
     }
 
-    // unbind UI elements
-    this.unbindUIElements();
-
     // mark as closed before doing the actual close, to
     // prevent infinite loops within "close" event handlers
     // that are trying to close other views
     this.isClosed = true;
     this.triggerMethod("close");
 
+    // unbind UI elements
+    this.unbindUIElements();
+
+    // remove the view from the DOM
     this.remove();
   },
 
@@ -1589,9 +1595,9 @@ Marionette.CollectionView = Marionette.View.extend({
       itemViewOptions = itemViewOptions.call(this, item, index);
     }
 
-    // build the view
+    // build the view 
     var view = this.buildItemView(item, ItemView, itemViewOptions);
-
+    
     // set up the child view event forwarding
     this.addChildViewEventForwarding(view);
 
@@ -1751,7 +1757,7 @@ Marionette.CompositeView = Marionette.CollectionView.extend({
     return itemView;
   },
 
-  // Serialize the collection for the view.
+  // Serialize the collection for the view. 
   // You can override the `serializeData` method in your own view
   // definition, to provide custom serialization for your view's data.
   serializeData: function(){
@@ -1775,7 +1781,7 @@ Marionette.CompositeView = Marionette.CollectionView.extend({
     this.triggerBeforeRender();
     var html = this.renderModel();
     this.$el.html(html);
-    // the ui bindings is done here and not at the end of render since they
+    // the ui bindings is done here and not at the end of render since they 
     // will not be available until after the model is rendered, but should be
     // available before the collection is rendered.
     this.bindUIElements();
@@ -1860,7 +1866,7 @@ Marionette.CompositeView = Marionette.CollectionView.extend({
 // Used for composite view management and sub-application areas.
 Marionette.Layout = Marionette.ItemView.extend({
   regionType: Marionette.Region,
-
+  
   // Ensure the regions are available when the `initialize` method
   // is called.
   constructor: function (options) {
@@ -1868,7 +1874,7 @@ Marionette.Layout = Marionette.ItemView.extend({
 
     this._firstRender = true;
     this._initializeRegions(options);
-
+    
     Marionette.ItemView.call(this, options);
   },
 
@@ -1883,11 +1889,11 @@ Marionette.Layout = Marionette.ItemView.extend({
       // reset the regions
       this._firstRender = false;
     } else if (this.isClosed){
-      // a previously closed layout means we need to
+      // a previously closed layout means we need to 
       // completely re-initialize the regions
       this._initializeRegions();
     } else {
-      // If this is not the first render call, then we need to
+      // If this is not the first render call, then we need to 
       // re-initializing the `el` for each region
       this._reInitializeRegions();
     }
@@ -1936,7 +1942,7 @@ Marionette.Layout = Marionette.ItemView.extend({
   },
 
   // Internal method to initialize the regions that have been defined in a
-  // `regions` attribute on this layout.
+  // `regions` attribute on this layout. 
   _initializeRegions: function (options) {
     var regions;
     this._initRegionManager();
@@ -1987,7 +1993,7 @@ Marionette.Layout = Marionette.ItemView.extend({
 //
 // Configure an AppRouter with `appRoutes`.
 //
-// App routers can only take one `controller` object.
+// App routers can only take one `controller` object. 
 // It is recommended that you divide your controller
 // objects in to smaller pieces of related functionality
 // and have multiple routers / controllers, instead of
@@ -2011,8 +2017,11 @@ Marionette.AppRouter = Backbone.Router.extend({
   // Internal method to process the `appRoutes` for the
   // router, and turn them in to routes that trigger the
   // specified method on the specified `controller`.
-  processAppRoutes: function(controller, appRoutes){
-    _.each(appRoutes, function(methodName, route) {
+  processAppRoutes: function(controller, appRoutes) {
+    var routeNames = _.keys(appRoutes).reverse(); // Backbone requires reverted order of routes
+
+    _.each(routeNames, function(route) {
+      var methodName = appRoutes[route];
       var method = controller[methodName];
 
       if (!method) {
@@ -2075,7 +2084,7 @@ _.extend(Marionette.Application.prototype, Backbone.Events, {
     this.triggerMethod("start", options);
   },
 
-  // Add regions to your app.
+  // Add regions to your app. 
   // Accepts a hash of named strings or Region objects
   // addRegions({something: "#someRegion"})
   // addRegions({something: Region.extend({el: "#someRegion"}) });
@@ -2280,7 +2289,7 @@ _.extend(Marionette.Module, {
   },
 
   _addModuleDefinition: function(parentModule, module, def, args){
-    var fn;
+    var fn; 
     var startWithParent;
 
     if (_.isFunction(def)){
@@ -2292,7 +2301,7 @@ _.extend(Marionette.Module, {
       // if an object is supplied
       fn = def.define;
       startWithParent = def.startWithParent;
-
+      
     } else {
       // if nothing is supplied
       startWithParent = true;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionette-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Backbone.Marionette for Rails