js_stack 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcee6f489f0b24c8b69b1eac5dec1b29be4f7484
-  data.tar.gz: ce93f0127c785c3d511fb012099e4c75ff122637
+  metadata.gz: 76c185bc4f7a94369ab13fa9482415f86a1f331b
+  data.tar.gz: bc92abb38284758ebec53d1a48d89e1fc419a8e3
 SHA512:
-  metadata.gz: 0a4cf05e07abc47e36a01c25aa2d15d1ea533ad84d37a1d129f1ee983f805874df33f72dce9f749c250624431cef5b90848d54072ef6f378b8d6245b58ab5d6d
-  data.tar.gz: 1a1b808931ae8919670a58b211f92ce94dc427f3ddd6d870a73f8392be6dc2f7ec399d4bff46ae5f61b7268831c00c748c7998c5d50ee5ab288553d8e1dd2dfa
+  metadata.gz: b33aa6b7e27f9811e669c8b0f53ac88c4efb74615ce3f57061fb068d6372cc35ad1c9123712cebe0b977b6fbb8820aef64c4aaee9f73a355780bf9ec1784a331
+  data.tar.gz: 178e838a1992bea00634e29ae64bc2795d675f0877c0b4ed37275a5a377bf9596741be699268fb7c97e4149ce7fb4173f3539b0907011ae0899e7fec8afe56d2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+# 0.6.8
+
+* update marionette 2.0.1 -> 2.0.3 [@gvl]
+* update backbone.paginator 2.0.1 -> 2.0.2 [@gvl]
+* update backbone.virtualcollection 0.4.15 -> 0.5.0 [@gvl]
+
 # 0.6.7
 
 * update backbone.associations 0.6.1 -> 0.6.2 [@gvl]

data/README.md

@@ -1,4 +1,4 @@
-# js_stack [![Dependency Status](https://gemnasium.com/netguru/js_stack.png)](https://gemnasium.com/netguru/js_stack) [![Gem Version](https://badge.fury.io/rb/js_stack.png)](http://badge.fury.io/rb/js_stack)
+# js_stack [![Dependency Status](http://img.shields.io/gemnasium/netguru/js_stack.svg?style=flat)](https://gemnasium.com/netguru/js_stack) [![Gem Version](http://img.shields.io/gem/v/js_stack.svg?style=flat)](http://badge.fury.io/rb/js_stack)
 
 Standard JS SPA stack we use at netguru
 
@@ -53,10 +53,10 @@ Examples:
 | Library | Versions | Changelog | Homepage |
 | :-----: | :------: | :-------: | :------: |
 | backbone | **1.1.2**, 1.0.0 | [changelog](http://backbonejs.org/#changelog) | [homepage](http://backbonejs.org/) |
-| marionette | **2.0.1**, 1.8.8, 1.7.4, 1.6.4, 1.5.1, 1.4.1, 1.1.0 | [changelog](https://github.com/marionettejs/backbone.marionette/blob/master/changelog.md) | [homepage](http://marionettejs.com/) |
+| marionette | **2.0.3**, 1.8.8, 1.7.4, 1.6.4, 1.5.1, 1.4.1, 1.1.0 | [changelog](https://github.com/marionettejs/backbone.marionette/blob/master/changelog.md) | [homepage](http://marionettejs.com/) |
 | underscore | **1.6.0**, 1.5.2 | [changelog](http://underscorejs.org/#changelog) | [homepage](http://underscorejs.org/) |
 | hamlcoffee | **1.16** | [changelog](https://github.com/netzpirat/haml_coffee_assets/blob/master/CHANGELOG.md) | [homepage](https://github.com/netzpirat/haml_coffee_assets) |
-| js-routes | **0.9.8** | none | [homepage](https://github.com/railsware/js-routes) |
+| js-routes | **0.9.8** | [changelog](https://github.com/railsware/js-routes/blob/master/CHANGELOG.md) | [homepage](https://github.com/railsware/js-routes) |
 
 ### Plugins
 
@@ -66,13 +66,13 @@ Examples:
 | backbone deepmodel | **0.10.4** | [changelog](https://github.com/powmedia/backbone-deep-model#changelog) | [homepage](https://github.com/powmedia/backbone-deep-model) | Yes
 | backbone mutators | **0.4.2** | [changelog](https://github.com/asciidisco/Backbone.Mutators#changelog) | [homepage](https://github.com/asciidisco/Backbone.Mutators) | No
 | backbone pageable | **1.4.8**, 1.3.2 | [changelog](https://github.com/backbone-paginator/backbone-pageable#change-log) | [homepage](https://github.com/wyuenho/backbone-pageable) | Yes
-| backbone paginator | **2.0.1** | [changelog](https://github.com/backbone-paginator/backbone.paginator/wiki/Changelog) | [homepage](https://github.com/backbone-paginator/backbone.paginator) | No
+| backbone paginator | **2.0.2** | [changelog](https://github.com/backbone-paginator/backbone.paginator/wiki/Changelog) | [homepage](https://github.com/backbone-paginator/backbone.paginator) | No
 | backbone routefilter | **0.2.1** | [changelog](https://github.com/boazsender/backbone.routefilter#release-history) | [homepage](https://github.com/boazsender/backbone.routefilter) | No
 | backbone stickit | **0.8.0**, 0.7.0, 0.6.3 | [changelog](http://nytimes.github.io/backbone.stickit/#change-log) | [homepage](http://nytimes.github.io/backbone.stickit/) | Yes
 | backbone validation | **0.9.1**, 0.8.1 | [changelog](https://github.com/thedersen/backbone.validation#release-notes) | [homepage](https://github.com/thedersen/backbone.validation) | Yes
-| backbone virtualcollection | **0.4.15** | [changelog](https://github.com/p3drosola/Backbone.VirtualCollection#changelog) | [homepage](https://github.com/p3drosola/Backbone.VirtualCollection) | Yes
+| backbone virtualcollection | **0.5.0**, 0.4.15 | [changelog](https://github.com/p3drosola/Backbone.VirtualCollection#changelog) | [homepage](https://github.com/p3drosola/Backbone.VirtualCollection) | Yes
 | cocktail | **0.5.8** | none | [homepage](https://github.com/onsi/cocktail) | No
-| momentjs | **2.7.0** | [changelog](https://github.com/moment/moment/#changelog) | [homepage](https://github.com/derekprior/momentjs-rails) | No
+| momentjs | **2.7.0** | [changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) | [homepage](https://github.com/derekprior/momentjs-rails) | No
 | underscore inflections | **0.2.1** | none | [homepage](https://github.com/geetarista/underscore.inflections) | No
 | underscore string | **2.3.2** | [changelog](https://github.com/epeli/underscore.string#changelog) | [homepage](http://epeli.github.io/underscore.string/) | No
 > Default: library is included in `js_stack/plugins`

data/lib/js_stack/version.rb

@@ -1,3 +1,3 @@
 module JsStack
-  VERSION = '0.6.7'
+  VERSION = '0.6.8'
 end

data/vendor/assets/javascripts/js_stack/base/marionette/{2.0.1.js → 2.0.3.js}

@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v2.0.1
+// v2.0.3
 //
 // Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -489,7 +489,7 @@
 
   var Marionette = Backbone.Marionette = {};
 
-  Marionette.VERSION = '2.0.1';
+  Marionette.VERSION = '2.0.3';
 
   Marionette.noConflict = function() {
     root.Marionette = previousMarionette;
@@ -589,7 +589,7 @@
   // Mix in methods from Underscore, for iteration, and other
   // collection related features.
   // Borrowing this code from Backbone.Collection:
-  // http://backbonejs.org/docs/backbone.html#section-106
+  // http://backbonejs.org/docs/backbone.html#section-121
   Marionette.actAsCollection = function(object, listProperty) {
     var methods = ['forEach', 'each', 'map', 'find', 'detect', 'filter',
       'select', 'reject', 'every', 'all', 'some', 'any', 'include',
@@ -855,7 +855,6 @@
   // modules and routers, and as a mediator for workflow
   // and coordination of other objects, views, and more.
   Marionette.Controller = function(options) {
-    this.triggerMethod = Marionette.triggerMethod;
     this.options = options || {};
 
     if (_.isFunction(this.initialize)) {
@@ -888,7 +887,7 @@
 
   });
 
-  /* jshint maxcomplexity: 10, maxstatements: 27 */
+  /* jshint maxcomplexity: 10, maxstatements: 29 */
 
   // Region
   // ------
@@ -1044,6 +1043,13 @@
       var _shouldShowView = isDifferentView || forceShow;
 
       if (_shouldShowView) {
+
+        // We need to listen for if a view is destroyed
+        // in a way other than through the region.
+        // If this happens we need to remove the reference
+        // to the currentView since once a view has been destroyed
+        // we can not reuse it.
+        view.once('destroy', _.bind(this.empty, this));
         view.render();
 
         if (isChangingView) {
@@ -1051,7 +1057,12 @@
         }
 
         this.triggerMethod('before:show', view);
-        this.triggerMethod.call(view, 'before:show');
+
+        if (_.isFunction(view.triggerMethod)) {
+          view.triggerMethod('before:show');
+        } else {
+          this.triggerMethod.call(view, 'before:show');
+        }
 
         this.attachHtml(view);
         this.currentView = view;
@@ -1103,19 +1114,31 @@
     // current view, it does nothing and returns immediately.
     empty: function() {
       var view = this.currentView;
-      if (!view || view.isDestroyed) { return; }
 
-      this.triggerMethod('before:empty', view);
-
-      // call 'destroy' or 'remove', depending on which is found
-      if (view.destroy) { view.destroy(); }
-      else if (view.remove) { view.remove(); }
+      // If there is no view in the region
+      // we should not remove anything
+      if (!view) { return; }
 
+      this.triggerMethod('before:empty', view);
+      this._destroyView();
       this.triggerMethod('empty', view);
 
+      // Remove region pointer to the currentView
       delete this.currentView;
     },
 
+    // call 'destroy' or 'remove', depending on which is found
+    // on the view (if showing a raw Backbone view or a Marionette View)
+    _destroyView: function() {
+      var view = this.currentView;
+
+      if (view.destroy && !view.isDestroyed) {
+        view.destroy();
+      } else if (view.remove) {
+        view.remove();
+      }
+    },
+
     // 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`
@@ -1855,20 +1878,18 @@
     // more control over events being triggered, around the rendering
     // process
     _renderChildren: function() {
-      this.startBuffering();
-
       this.destroyEmptyView();
       this.destroyChildren();
 
-      if (!this.isEmpty(this.collection)) {
+      if (this.isEmpty(this.collection)) {
+        this.showEmptyView();
+      } else {
         this.triggerMethod('before:render:collection', this);
+        this.startBuffering();
         this.showCollection();
+        this.endBuffering();
         this.triggerMethod('render:collection', this);
-      } else {
-        this.showEmptyView();
       }
-
-      this.endBuffering();
     },
 
     // Internal method to loop through collection and show each child view.
@@ -2605,12 +2626,7 @@
       // Wraps several of the view's methods
       // calling the methods first on each behavior
       // and then eventually calling the method on the view.
-      Behaviors.wrap(view, behaviors, [
-        'bindUIElements', 'unbindUIElements',
-        'delegateEvents', 'undelegateEvents',
-        'behaviorEvents', 'triggerMethod',
-        'setElement', 'destroy'
-      ]);
+      Behaviors.wrap(view, behaviors, _.keys(methods));
     }
 
     var methods = {

data/vendor/assets/javascripts/js_stack/base/marionette.js

@@ -1 +1 @@
-//= require js_stack/base/marionette/2.0.1
+//= require js_stack/base/marionette/2.0.3

data/vendor/assets/javascripts/js_stack/plugins/backbone/paginator/{2.0.1.js → 2.0.2.js}

@@ -1,5 +1,5 @@
 /*
-  backbone.paginator 2.0.1
+  backbone.paginator 2.0.2
   http://github.com/backbone-paginator/backbone.paginator
 
   Copyright (c) 2013 Jimmy Yuen Ho Wong and contributors
@@ -63,7 +63,6 @@
   var _isObject = _.isObject;
   var _keys = _.keys;
   var _isUndefined = _.isUndefined;
-  var _result = _.result;
   var ceil = Math.ceil;
   var floor = Math.floor;
   var max = Math.max;
@@ -1129,7 +1128,8 @@
       var data = options.data || {};
 
       // dedup query params
-      var url = _result(options, "url") || _result(this, "url") || '';
+      var url = options.url || this.url || "";
+      if (_isFunction(url)) url = url.call(this);
       var qsi = url.indexOf('?');
       if (qsi != -1) {
         _extend(data, queryStringToParams(url.slice(qsi + 1)));

data/vendor/assets/javascripts/js_stack/plugins/backbone/virtualcollection/0.5.0.js

@@ -0,0 +1,204 @@
+(function (root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    define(['backbone', 'underscore'], function (Backbone, _) {
+      Backbone.VirtualCollection = factory(root, Backbone, _);
+      root.VirtualCollection = Backbone.VirtualCollection;
+    });
+  } else if (typeof exports !== 'undefined') {
+    var Backbone = require('backbone');
+    var _ = require('underscore');
+    module.exports = factory(root, Backbone, _);
+  } else {
+    root.Backbone.VirtualCollection = factory(root, root.Backbone, root._);
+    root.VirtualCollection = root.Backbone.VirtualCollection;
+  }
+}(this, function (root, Backbone, _) {
+  var VirtualCollection = Backbone.Collection.extend({
+
+    constructor: function (collection, options) {
+      options = options || {};
+      this.collection = collection;
+
+      if (options.comparator !== undefined) this.comparator = options.comparator;
+      if (options.close_with) this.bindLifecycle(options.close_with, 'close'); // Marionette 1.*
+      if (options.destroy_with) this.bindLifecycle(options.destroy_with, 'destroy'); // Marionette 2.*
+      if (!this.model) this.model = collection.model;
+
+      this.accepts = VirtualCollection.buildFilter(options.filter);
+      this._rebuildIndex();
+      this.listenTo(this.collection, 'add', this._onAdd);
+      this.listenTo(this.collection, 'remove', this._onRemove);
+      this.listenTo(this.collection, 'change', this._onChange);
+      this.listenTo(this.collection, 'reset',  this._onReset);
+      this.listenTo(this.collection, 'sort',  this._onSort);
+
+      this.initialize.apply(this, arguments);
+    },
+
+    // Marionette 1.*
+    bindLifecycle: function (view, method_name) {
+      view.on(method_name, _.bind(this.stopListening, this));
+    },
+
+    updateFilter: function (filter) {
+      this.accepts = VirtualCollection.buildFilter(filter);
+      this._rebuildIndex();
+      this.trigger('filter', this, filter);
+      this.trigger('reset', this, filter);
+      return this;
+    },
+
+    _rebuildIndex: function () {
+      this._reset();
+      this.collection.each(function (model, i) {
+        if (this.accepts(model, i)) {
+          this.models.push(model);
+          this._byId[model.cid] = model;
+          if (model.id) this._byId[model.id] = model;
+        }
+      }, this);
+      this.length = this.models.length;
+
+      if (this.comparator) this.sort({silent: true});
+    },
+
+    orderViaParent: function (options) {
+      this.models = this.collection.filter(function (model) {
+        return (this._byId[model.cid] !== undefined);
+      }, this);
+      if (!options.silent) this.trigger('sort', this, options);
+    },
+
+    _onSort: function (collection, options) {
+      if (this.comparator !== undefined) return;
+      this.orderViaParent(options);
+    },
+
+    _onAdd: function (model, collection, options) {
+      if (this.accepts(model, options.index)) {
+        this._indexAdd(model);
+        this.trigger('add', model, this, options);
+      }
+    },
+
+    _onRemove: function (model, collection, options) {
+      if (!this.get(model)) return;
+
+      var i = this._indexRemove(model)
+      , options_clone = _.clone(options);
+      options_clone.index = i;
+
+      this.trigger('remove', model, this, options_clone);
+    },
+
+    _onChange: function (model, options) {
+      var already_here = this.get(model);
+
+      if (this.accepts(model, options.index)) {
+        if (already_here) {
+          this.trigger('change', model, this, options);
+        } else {
+          this._indexAdd(model);
+          this.trigger('add', model, this, options);
+        }
+      } else {
+        if (already_here) {
+          var i = this._indexRemove(model)
+          , options_clone = _.clone(options);
+          options_clone.index = i;
+          this.trigger('remove', model, this, options_clone);
+        }
+      }
+    },
+
+    _onReset: function (collection, options) {
+      this._rebuildIndex();
+      this.trigger('reset', this, options);
+    },
+
+    sortedIndex: function (model, value, context) {
+      var iterator = _.isFunction(value) ? value : function(target) {
+        return target.get(value);
+      };
+
+      if (iterator.length == 1) {
+         return _.sortedIndex(this.models, model, iterator, context);
+       } else {
+         return sortedIndexTwo(this.models, model, iterator, context);
+       }
+    },
+
+    _indexAdd: function (model) {
+      if (this.get(model)) return;
+      var i;
+      // uses a binsearch to find the right index
+      if (this.comparator) {
+        i = this.sortedIndex(model, this.comparator, this);
+      } else if (this.comparator === undefined) {
+        i = this.sortedIndex(model, function (target) {
+         //TODO: indexOf traverses the array every time the iterator is called
+          return this.collection.indexOf(target);
+        }, this);
+      } else {
+        i = this.length;
+      }
+      this.models.splice(i, 0, model);
+      this._byId[model.cid] = model;
+      if (model.id) this._byId[model.id] = model;
+      this.length += 1;
+    },
+
+    _indexRemove: function (model) {
+      var i = this.indexOf(model);
+      if (i === -1) return i;
+      this.models.splice(i, 1);
+      delete this._byId[model.cid];
+      if (model.id) delete this._byId[model.id];
+      this.length -= 1;
+      return i;
+    }
+
+  }, { // static props
+
+    buildFilter: function (options) {
+      if (!options) {
+        return function () {
+          return true;
+        };
+      } else if (_.isFunction(options)) {
+        return options;
+      } else if (options.constructor === Object) {
+        return function (model) {
+          return !Boolean(_(Object.keys(options)).detect(function (key) {
+            return model.get(key) !== options[key];
+          }));
+        };
+      }
+    }
+  });
+
+  // methods that alter data should proxy to the parent collection
+  _.each(['add', 'remove', 'set', 'reset', 'push', 'pop', 'unshift', 'shift', 'slice', 'sync', 'fetch'], function (method_name) {
+    VirtualCollection.prototype[method_name] = function () {
+      return this.collection[method_name].apply(this.collection, _.toArray(arguments));
+    };
+  });
+
+  /**
+
+  Equivalent to _.sortedIndex, but for comparators with two arguments
+
+  **/
+  function sortedIndexTwo (array, obj, iterator, context) {
+    var low = 0, high = array.length;
+    while (low < high) {
+      var mid = (low + high) >>> 1;
+      iterator.call(context, obj, array[mid]) > 0 ? low = mid + 1 : high = mid;
+    }
+    return low;
+  }
+
+  _.extend(VirtualCollection.prototype, Backbone.Events);
+
+  return VirtualCollection;
+}));

data/vendor/assets/javascripts/js_stack/plugins/backbone.paginator.js

@@ -1 +1 @@
-//= require js_stack/plugins/backbone/paginator/2.0.1
+//= require js_stack/plugins/backbone/paginator/2.0.2

data/vendor/assets/javascripts/js_stack/plugins/backbone.virtualcollection.js

@@ -1 +1 @@
-//= require js_stack/plugins/backbone/virtualcollection/0.4.15
+//= require js_stack/plugins/backbone/virtualcollection/0.5.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: js_stack
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Tomasz Pewiński
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml_coffee_assets
@@ -113,7 +113,7 @@ files:
 - vendor/assets/javascripts/js_stack/base/marionette/1.6.4.js
 - vendor/assets/javascripts/js_stack/base/marionette/1.7.4.js
 - vendor/assets/javascripts/js_stack/base/marionette/1.8.8.js
-- vendor/assets/javascripts/js_stack/base/marionette/2.0.1.js
+- vendor/assets/javascripts/js_stack/base/marionette/2.0.3.js
 - vendor/assets/javascripts/js_stack/base/underscore.js
 - vendor/assets/javascripts/js_stack/base/underscore/1.5.2.js
 - vendor/assets/javascripts/js_stack/base/underscore/1.6.0.js
@@ -133,7 +133,7 @@ files:
 - vendor/assets/javascripts/js_stack/plugins/backbone/mutators/0.4.2.js
 - vendor/assets/javascripts/js_stack/plugins/backbone/pageable/1.3.2.js
 - vendor/assets/javascripts/js_stack/plugins/backbone/pageable/1.4.8.js
-- vendor/assets/javascripts/js_stack/plugins/backbone/paginator/2.0.1.js
+- vendor/assets/javascripts/js_stack/plugins/backbone/paginator/2.0.2.js
 - vendor/assets/javascripts/js_stack/plugins/backbone/routefilter/0.2.1.js
 - vendor/assets/javascripts/js_stack/plugins/backbone/stickit/0.6.3.js
 - vendor/assets/javascripts/js_stack/plugins/backbone/stickit/0.7.0.js
@@ -141,6 +141,7 @@ files:
 - vendor/assets/javascripts/js_stack/plugins/backbone/validation/0.8.1.js
 - vendor/assets/javascripts/js_stack/plugins/backbone/validation/0.9.1.js
 - vendor/assets/javascripts/js_stack/plugins/backbone/virtualcollection/0.4.15.js
+- vendor/assets/javascripts/js_stack/plugins/backbone/virtualcollection/0.5.0.js
 - vendor/assets/javascripts/js_stack/plugins/cocktail.js
 - vendor/assets/javascripts/js_stack/plugins/cocktail/0.5.8.js
 - vendor/assets/javascripts/js_stack/plugins/moment.js