tableling-rails 0.0.24 → 0.0.25

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTUxMzMyYjBkZDk5OGVhMTQwZTljNzNjNDE2ZTNkOGE1ZDllMzU2NA==
+    Y2M5OTYxOGJlMmYyNmVmYWUyNDcxYTg3ZTU1YzA3YTIzNmM1Yzg3YQ==
   data.tar.gz: !binary |-
-    ZGMzZjA0ODRiZTEzZTZlNjVjMWQzYmQyOWZmNGI2NDgwY2ZmMzY0YQ==
+    Y2M5MTI1NTJiZGYyMDkzYTdkYjE3NGQ2YjA2ZDIzYzQ4NDQyMDVkMQ==
 SHA512:
   metadata.gz: !binary |-
-    NTE4NGRjZjVhMzBhMGM4NWE5MmZkZGI3NTMwYmExNTA3NDg2ZDNkN2JlYzBj
-    YzNhNmY3M2ZlNWY0ZmVkNzljYzg1YjgwNzZmMzA3OWMyYWMzZWRkYzZlMDM3
-    NDUxMzliNDM4Nzk0Y2U2ODRhMjI1Zjk0ZmYzZWI5MTgxODI1MDI=
+    MmM2ZjZiNDA2NzYzZTY1MzdkMDFiMWYxNzdhNTkzMTRlNDE1YmY1ZTMxMDA0
+    ODA3ZDc0MTA2Njc3ODZhZDY1ODQ5MDQwNTQzYjU3MWQzOTI0MzM2Y2I4YTRl
+    YTg0ODNkNWQ0ZDQ2NjdjYzc3NTJkM2VjYmI5MDU4YTY4OTRjNmU=
   data.tar.gz: !binary |-
-    YTMwYjEwNTQwYzY4ZTQ4ZWVmZmVmZmU2NmI4OWRmMWNhZmI5OTA3NmI4ZGI0
-    OGQzMmJkY2YxZjM0YzMyYjNmOTBiN2U3NTAxZGE1MTZhM2ZiNWI0Y2IwMWU4
-    MjNmOGQ0M2FkNmIzNTE0MmYxNGE5MWZlY2U5MDc4ODJiMzIyY2U=
+    ZjI1MWE1MWYyNTE4NzU0Mjc1NzRlZmE1NTRjNGUxNWQ2NDM4ZWVmYWMxNGM5
+    Zjk1YWI4OTY1ZWMwZTM0YzIzMzIyNDdkMGFjNmYxM2RiM2Q4N2YzMGE4ZGUx
+    NTAyZWUzNjA3MjBjYWM3MzNiNWIxOTFkZDI0OGM4ZWIwODFjNjY=

data/VERSION

@@ -1 +1 @@
-0.0.24
+0.0.25

data/lib/tableling-rails/version.rb

@@ -1,3 +1,3 @@
 module Tableling
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

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

@@ -4090,7 +4090,7 @@ _.extend(Marionette.Module, {
 })(this, Backbone, _);
 
 /*!
- * Tableling v0.0.24
+ * Tableling v0.0.25
  * Copyright (c) 2012-2014 Simon Oulevay (Alpha Hydrae) <hydrae.alpha@gmail.com>
  * Distributed under MIT license
  * https://github.com/AlphaHydrae/tableling
@@ -4098,7 +4098,7 @@ _.extend(Marionette.Module, {
 Backbone.Tableling = Tableling = (function(Backbone, _, $){
 
   var Tableling = {
-    version : "0.0.24"
+    version : "0.0.25"
   };
 
 // Tableling
@@ -4118,7 +4118,9 @@ Tableling.Table = Backbone.Marionette.Layout.extend({
   initialize: function(options) {
     options = options || {};
 
-    this.collection = options.collection;
+    if (!this.getCollection(this.getResource())) {
+      throw new Error('Missing collection; pass it to the constructor or override #getCollection');
+    }
 
     // Table options can also be overriden for each instance at construction.
     this.config = _.extend(_.clone(this.config || {}), _.result(options, 'config') || {});
@@ -4156,8 +4158,12 @@ Tableling.Table = Backbone.Marionette.Layout.extend({
     }
   },
 
+  getResource: function() {
+    return this.collection || this.model;
+  },
+
   // Subclasses must return the Backbone.Collection used to fetch data.
-  getCollection: function() {
+  getCollection: function(resource) {
     return this.collection;
   },
 
@@ -4212,7 +4218,7 @@ Tableling.Table = Backbone.Marionette.Layout.extend({
     // The first argument is the request data.
     this.ventTrigger('table:refreshing', options.data);
 
-    this.getCollection().fetch(options);
+    this.getResource().fetch(options);
   },
 
   // ### Request
@@ -4221,9 +4227,9 @@ Tableling.Table = Backbone.Marionette.Layout.extend({
   },
 
   // ### Response
-  processResponse: function(collection, response) {
+  processResponse: function(resource, response) {
 
-    this.config.length = collection.length;
+    this.config.length = this.getCollection(resource).length;
 
     // Tableling expects the response from a fetch to have a `total` property
     // which is the total number of items (not just in the current page).
@@ -4319,7 +4325,7 @@ Tableling.Modular = Tableling.Table.extend({
     var options = _.extend(this.getModuleOptions(name), { vent: this.vent });
 
     // The collection is also passed to view classes.
-    _.defaults(options, { collection: this.getCollection() });
+    _.defaults(options, { collection: this.getCollection(this.getResource()) });
 
     var view = new viewClass(options);
 

data/vendor/assets/javascripts/tableling.js

@@ -1,5 +1,5 @@
 /*!
- * Tableling v0.0.24
+ * Tableling v0.0.25
  * Copyright (c) 2012-2014 Simon Oulevay (Alpha Hydrae) <hydrae.alpha@gmail.com>
  * Distributed under MIT license
  * https://github.com/AlphaHydrae/tableling
@@ -7,7 +7,7 @@
 Backbone.Tableling = Tableling = (function(Backbone, _, $){
 
   var Tableling = {
-    version : "0.0.24"
+    version : "0.0.25"
   };
 
 // Tableling
@@ -27,7 +27,9 @@ Tableling.Table = Backbone.Marionette.Layout.extend({
   initialize: function(options) {
     options = options || {};
 
-    this.collection = options.collection;
+    if (!this.getCollection(this.getResource())) {
+      throw new Error('Missing collection; pass it to the constructor or override #getCollection');
+    }
 
     // Table options can also be overriden for each instance at construction.
     this.config = _.extend(_.clone(this.config || {}), _.result(options, 'config') || {});
@@ -65,8 +67,12 @@ Tableling.Table = Backbone.Marionette.Layout.extend({
     }
   },
 
+  getResource: function() {
+    return this.collection || this.model;
+  },
+
   // Subclasses must return the Backbone.Collection used to fetch data.
-  getCollection: function() {
+  getCollection: function(resource) {
     return this.collection;
   },
 
@@ -121,7 +127,7 @@ Tableling.Table = Backbone.Marionette.Layout.extend({
     // The first argument is the request data.
     this.ventTrigger('table:refreshing', options.data);
 
-    this.getCollection().fetch(options);
+    this.getResource().fetch(options);
   },
 
   // ### Request
@@ -130,9 +136,9 @@ Tableling.Table = Backbone.Marionette.Layout.extend({
   },
 
   // ### Response
-  processResponse: function(collection, response) {
+  processResponse: function(resource, response) {
 
-    this.config.length = collection.length;
+    this.config.length = this.getCollection(resource).length;
 
     // Tableling expects the response from a fetch to have a `total` property
     // which is the total number of items (not just in the current page).
@@ -228,7 +234,7 @@ Tableling.Modular = Tableling.Table.extend({
     var options = _.extend(this.getModuleOptions(name), { vent: this.vent });
 
     // The collection is also passed to view classes.
-    _.defaults(options, { collection: this.getCollection() });
+    _.defaults(options, { collection: this.getCollection(this.getResource()) });
 
     var view = new viewClass(options);
 

data/vendor/assets/javascripts/tableling.world.js

@@ -14966,7 +14966,7 @@ _.extend(Marionette.Module, {
 })(this, Backbone, _);
 
 /*!
- * Tableling v0.0.24
+ * Tableling v0.0.25
  * Copyright (c) 2012-2014 Simon Oulevay (Alpha Hydrae) <hydrae.alpha@gmail.com>
  * Distributed under MIT license
  * https://github.com/AlphaHydrae/tableling
@@ -14974,7 +14974,7 @@ _.extend(Marionette.Module, {
 Backbone.Tableling = Tableling = (function(Backbone, _, $){
 
   var Tableling = {
-    version : "0.0.24"
+    version : "0.0.25"
   };
 
 // Tableling
@@ -14994,7 +14994,9 @@ Tableling.Table = Backbone.Marionette.Layout.extend({
   initialize: function(options) {
     options = options || {};
 
-    this.collection = options.collection;
+    if (!this.getCollection(this.getResource())) {
+      throw new Error('Missing collection; pass it to the constructor or override #getCollection');
+    }
 
     // Table options can also be overriden for each instance at construction.
     this.config = _.extend(_.clone(this.config || {}), _.result(options, 'config') || {});
@@ -15032,8 +15034,12 @@ Tableling.Table = Backbone.Marionette.Layout.extend({
     }
   },
 
+  getResource: function() {
+    return this.collection || this.model;
+  },
+
   // Subclasses must return the Backbone.Collection used to fetch data.
-  getCollection: function() {
+  getCollection: function(resource) {
     return this.collection;
   },
 
@@ -15088,7 +15094,7 @@ Tableling.Table = Backbone.Marionette.Layout.extend({
     // The first argument is the request data.
     this.ventTrigger('table:refreshing', options.data);
 
-    this.getCollection().fetch(options);
+    this.getResource().fetch(options);
   },
 
   // ### Request
@@ -15097,9 +15103,9 @@ Tableling.Table = Backbone.Marionette.Layout.extend({
   },
 
   // ### Response
-  processResponse: function(collection, response) {
+  processResponse: function(resource, response) {
 
-    this.config.length = collection.length;
+    this.config.length = this.getCollection(resource).length;
 
     // Tableling expects the response from a fetch to have a `total` property
     // which is the total number of items (not just in the current page).
@@ -15195,7 +15201,7 @@ Tableling.Modular = Tableling.Table.extend({
     var options = _.extend(this.getModuleOptions(name), { vent: this.vent });
 
     // The collection is also passed to view classes.
-    _.defaults(options, { collection: this.getCollection() });
+    _.defaults(options, { collection: this.getCollection(this.getResource()) });
 
     var view = new viewClass(options);
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tableling-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Simon Oulevay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails