tableling-rails 0.0.6 → 0.0.7

data/lib/tableling-rails/version.rb

@@ -1,3 +1,3 @@
 module Tableling
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/dummy/app/assets/javascripts/books.js

@@ -54,6 +54,9 @@ var BooksTable = Tableling.Bootstrap.Table.extend({
     collection: new BooksCollection({
       model: Book
     })
+  },
+  pageSizeViewOptions : {
+    sizes : [ 5, 10, 15 ]
   }
 });
 

data/spec/dummy/log/development.log

@@ -7165,3 +7165,113 @@ Processing by BooksController#page as JSON
    (0.3ms)  SELECT COUNT(*) FROM "books" 
   Book Load (0.1ms)  SELECT "books".* FROM "books" LIMIT 5 OFFSET 0
 Completed 200 OK in 3ms (Views: 0.5ms | ActiveRecord: 0.4ms)
+
+
+Started GET "/" for 127.0.0.1 at 2012-10-17 11:17:04 +0200
+Processing by BooksController#index as HTML
+  Rendered books/index.html.haml within layouts/application (1.0ms)
+Compiled tableling.world.js  (38ms)  (pid 6723)
+Compiled application.js  (5ms)  (pid 6723)
+Completed 200 OK in 87ms (Views: 87.3ms | ActiveRecord: 0.0ms)
+
+
+Started POST "/books/page" for 127.0.0.1 at 2012-10-17 11:17:04 +0200
+Processing by BooksController#page as JSON
+  Parameters: {"page"=>"1", "pageSize"=>"10"}
+   (0.2ms)  SELECT COUNT(*) FROM "books" 
+  Book Load (0.1ms)  SELECT "books".* FROM "books" LIMIT 10 OFFSET 0
+Completed 200 OK in 3ms (Views: 0.6ms | ActiveRecord: 0.3ms)
+
+
+Started POST "/books/page" for 127.0.0.1 at 2012-10-17 11:17:08 +0200
+Processing by BooksController#page as JSON
+  Parameters: {"page"=>"1", "pageSize"=>"15"}
+   (0.1ms)  SELECT COUNT(*) FROM "books" 
+  Book Load (0.1ms)  SELECT "books".* FROM "books" LIMIT 15 OFFSET 0
+Completed 200 OK in 3ms (Views: 1.4ms | ActiveRecord: 0.3ms)
+
+
+Started POST "/books/page" for 127.0.0.1 at 2012-10-17 11:17:09 +0200
+Processing by BooksController#page as JSON
+  Parameters: {"page"=>"1", "pageSize"=>"10"}
+   (0.2ms)  SELECT COUNT(*) FROM "books" 
+  Book Load (0.2ms)  SELECT "books".* FROM "books" LIMIT 10 OFFSET 0
+Completed 200 OK in 2ms (Views: 0.7ms | ActiveRecord: 0.4ms)
+
+
+Started GET "/" for 127.0.0.1 at 2012-10-17 11:17:09 +0200
+Processing by BooksController#index as HTML
+  Rendered books/index.html.haml within layouts/application (0.2ms)
+Completed 200 OK in 16ms (Views: 15.4ms | ActiveRecord: 0.0ms)
+
+
+Started POST "/books/page" for 127.0.0.1 at 2012-10-17 11:17:09 +0200
+Processing by BooksController#page as JSON
+  Parameters: {"page"=>"1", "pageSize"=>"10"}
+   (0.2ms)  SELECT COUNT(*) FROM "books" 
+  Book Load (0.1ms)  SELECT "books".* FROM "books" LIMIT 10 OFFSET 0
+Completed 200 OK in 3ms (Views: 0.9ms | ActiveRecord: 0.3ms)
+
+
+Started GET "/" for 127.0.0.1 at 2012-10-17 11:17:33 +0200
+Processing by BooksController#index as HTML
+  Rendered books/index.html.haml within layouts/application (0.2ms)
+Compiled books.js  (0ms)  (pid 6723)
+Compiled application.js  (8ms)  (pid 6723)
+Completed 200 OK in 87ms (Views: 86.5ms | ActiveRecord: 0.0ms)
+
+
+Started POST "/books/page" for 127.0.0.1 at 2012-10-17 11:17:33 +0200
+Processing by BooksController#page as JSON
+  Parameters: {"page"=>"1", "pageSize"=>"5"}
+   (0.2ms)  SELECT COUNT(*) FROM "books" 
+  Book Load (0.1ms)  SELECT "books".* FROM "books" LIMIT 5 OFFSET 0
+Completed 200 OK in 2ms (Views: 0.4ms | ActiveRecord: 0.3ms)
+
+
+Started POST "/books/page" for 127.0.0.1 at 2012-10-17 11:17:35 +0200
+Processing by BooksController#page as JSON
+  Parameters: {"page"=>"1", "pageSize"=>"10"}
+   (0.2ms)  SELECT COUNT(*) FROM "books" 
+  Book Load (0.1ms)  SELECT "books".* FROM "books" LIMIT 10 OFFSET 0
+Completed 200 OK in 2ms (Views: 0.8ms | ActiveRecord: 0.3ms)
+
+
+Started POST "/books/page" for 127.0.0.1 at 2012-10-17 11:17:36 +0200
+Processing by BooksController#page as JSON
+  Parameters: {"page"=>"1", "pageSize"=>"5"}
+   (0.2ms)  SELECT COUNT(*) FROM "books" 
+  Book Load (0.2ms)  SELECT "books".* FROM "books" LIMIT 5 OFFSET 0
+Completed 200 OK in 2ms (Views: 0.5ms | ActiveRecord: 0.4ms)
+
+
+Started POST "/books/page" for 127.0.0.1 at 2012-10-17 11:17:37 +0200
+Processing by BooksController#page as JSON
+  Parameters: {"page"=>"1", "pageSize"=>"5", "quickSearch"=>"tale"}
+   (0.2ms)  SELECT COUNT(*) FROM "books" WHERE (LOWER(books.title) LIKE '%tale%' OR LOWER(books.author) LIKE '%tale%')
+  Book Load (0.1ms)  SELECT "books".* FROM "books" WHERE (LOWER(books.title) LIKE '%tale%' OR LOWER(books.author) LIKE '%tale%') LIMIT 5 OFFSET 0
+Completed 200 OK in 2ms (Views: 0.2ms | ActiveRecord: 0.4ms)
+
+
+Started POST "/books/page" for 127.0.0.1 at 2012-10-17 11:17:38 +0200
+Processing by BooksController#page as JSON
+  Parameters: {"page"=>"1", "pageSize"=>"5"}
+   (0.2ms)  SELECT COUNT(*) FROM "books" 
+  Book Load (0.1ms)  SELECT "books".* FROM "books" LIMIT 5 OFFSET 0
+Completed 200 OK in 2ms (Views: 0.4ms | ActiveRecord: 0.3ms)
+
+
+Started POST "/books/page" for 127.0.0.1 at 2012-10-17 11:17:39 +0200
+Processing by BooksController#page as JSON
+  Parameters: {"page"=>"2", "pageSize"=>"5"}
+   (0.2ms)  SELECT COUNT(*) FROM "books" 
+  Book Load (0.1ms)  SELECT "books".* FROM "books" LIMIT 5 OFFSET 5
+Completed 200 OK in 2ms (Views: 0.4ms | ActiveRecord: 0.3ms)
+
+
+Started POST "/books/page" for 127.0.0.1 at 2012-10-17 11:17:40 +0200
+Processing by BooksController#page as JSON
+  Parameters: {"page"=>"1", "pageSize"=>"5"}
+   (0.2ms)  SELECT COUNT(*) FROM "books" 
+  Book Load (0.1ms)  SELECT "books".* FROM "books" LIMIT 5 OFFSET 0
+Completed 200 OK in 2ms (Views: 0.4ms | ActiveRecord: 0.3ms)

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

@@ -3094,7 +3094,7 @@ Marionette.EventAggregator = Backbone.Wreqr.EventAggregator;
   return Marionette;
 })(Backbone, _, $ || window.jQuery || window.Zepto || window.ender);
 /*!
- * Tableling v0.0.9
+ * Tableling v0.0.10
  * Copyright (c) 2012 Simon Oulevay (Alpha Hydrae) <hydrae.alpha@gmail.com>
  * Distributed under MIT license
  * https://github.com/AlphaHydrae/tableling
@@ -3102,7 +3102,7 @@ Marionette.EventAggregator = Backbone.Wreqr.EventAggregator;
 Backbone.Tableling = Tableling = (function(Backbone, _, $){
 
   var Tableling = {
-    version : "0.0.9"
+    version : "0.0.10"
   };
 
   // Tableling
@@ -3116,8 +3116,7 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   
     // Default table options can be overriden by subclasses.
     tableling : {
-      page : 1,
-      pageSize : 15
+      page : 1
     },
   
     initialize : function(options) {
@@ -3141,8 +3140,8 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   
     // Called once rendering is complete. By default, it updates the table.
     setup : function() {
-      this.vent.trigger('table:setup', this.filterConfig(this.tableling, true));
-      this.vent.trigger('table:update');
+      this.ventTrigger('table:setup', this.filterConfig(this.tableling, true));
+      this.ventTrigger('table:update');
     },
   
     // Subclasses must return the Backbone.Collection used to fetch data.
@@ -3237,11 +3236,11 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
     ventTrigger : function() {
   
       var args = Array.prototype.slice.call(arguments);
-      this.vent.trigger.apply(this.vent, args);
-  
       if (Tableling.debug) {
-        console.log(args.shift() + ' - ' + JSON.stringify(args));
+        console.log(_.first(args) + ' - ' + JSON.stringify(args.slice(1)));
       }
+  
+      this.vent.trigger.apply(this.vent, args);
     }
   });
   
@@ -3354,10 +3353,13 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
     initialize : function(options) {
       this.vent = options.vent;
   
-      // The `refresh` method of the view is called once the view is rendered
-      // and every time the table is refreshed.
+      // The `setup` method of the view is called when the table
+      // is first set up.
+      this.vent.on('table:setup', this.setup, this);
+  
+      // The `refresh` method of the view is called every time the table
+      // is refreshed.
       this.vent.on('table:refreshed', this.refresh, this);
-      this.on('render', this.refresh, this);
     },
   
     // Call `update` to trigger an update of the table.
@@ -3365,10 +3367,13 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
       this.vent.trigger('table:update', this.config());
     },
   
+    // Implementations should override this to set initial values.
+    setup : function(config) {
+    },
+  
     // Implementations should override this to stay up to date with
-    // the table state. Note that the data parameter will be undefined
-    // on the first refresh when the view is rendered.
-    refresh : function(data) {
+    // the table state.
+    refresh : function(config) {
     },
   
     // New table configuration to be sent on updates. For example,
@@ -3385,6 +3390,8 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   // defaults and only requires a `name` and a `template` parameter.
   Tableling.FieldModule = Tableling.Module.extend({
   
+    // TODO: check name
+  
     initialize : function(options) {
   
       Tableling.Module.prototype.initialize.call(this, options);
@@ -3402,6 +3409,11 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
       this.events['change [name="' + this.name + '"]'] = 'update';
     },
   
+    setup : function(config) {
+      this.ui.field.val(config[this.name]);
+      this.vent.trigger('table:update', this.config(), { refresh : false });
+    },
+  
     // The table property updated is the one with the same name as the module.
     config : function() {
       var config = {};
@@ -3514,7 +3526,26 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   Tableling.Plain.PageSizeView = Tableling.Plain.Table.prototype.pageSizeView = Tableling.FieldModule.extend({
     // TODO: update current page intelligently
     name : 'pageSize',
-    template : _.template('<select name="pageSize"><option>5</option><option>10</option><option>15</option></select> entries per page')
+    template : _.template('<select name="pageSize" /> entries per page'),
+    sizes : [ 10, 15, 20, 25, 50 ],
+  
+    ui : {
+      field : 'select'
+    },
+  
+    initialize : function(options) {
+      Tableling.FieldModule.prototype.initialize.call(this, options);
+      this.sizes = _.clone(options.sizes || this.sizes);
+    },
+  
+    onRender : function() {
+      this.ui.field.empty();
+      _.each(this.sizes, _.bind(this.addSize, this));
+    },
+  
+    addSize : function(size) {
+      $('<option />').text(size).appendTo(this.ui.field);
+    }
   });
   
   Tableling.Plain.QuickSearchView = Tableling.Plain.Table.prototype.quickSearchView = Tableling.FieldModule.extend({

data/vendor/assets/javascripts/tableling.js

@@ -1,5 +1,5 @@
 /*!
- * Tableling v0.0.9
+ * Tableling v0.0.10
  * Copyright (c) 2012 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.9"
+    version : "0.0.10"
   };
 
   // Tableling
@@ -21,8 +21,7 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   
     // Default table options can be overriden by subclasses.
     tableling : {
-      page : 1,
-      pageSize : 15
+      page : 1
     },
   
     initialize : function(options) {
@@ -46,8 +45,8 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   
     // Called once rendering is complete. By default, it updates the table.
     setup : function() {
-      this.vent.trigger('table:setup', this.filterConfig(this.tableling, true));
-      this.vent.trigger('table:update');
+      this.ventTrigger('table:setup', this.filterConfig(this.tableling, true));
+      this.ventTrigger('table:update');
     },
   
     // Subclasses must return the Backbone.Collection used to fetch data.
@@ -142,11 +141,11 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
     ventTrigger : function() {
   
       var args = Array.prototype.slice.call(arguments);
-      this.vent.trigger.apply(this.vent, args);
-  
       if (Tableling.debug) {
-        console.log(args.shift() + ' - ' + JSON.stringify(args));
+        console.log(_.first(args) + ' - ' + JSON.stringify(args.slice(1)));
       }
+  
+      this.vent.trigger.apply(this.vent, args);
     }
   });
   
@@ -259,10 +258,13 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
     initialize : function(options) {
       this.vent = options.vent;
   
-      // The `refresh` method of the view is called once the view is rendered
-      // and every time the table is refreshed.
+      // The `setup` method of the view is called when the table
+      // is first set up.
+      this.vent.on('table:setup', this.setup, this);
+  
+      // The `refresh` method of the view is called every time the table
+      // is refreshed.
       this.vent.on('table:refreshed', this.refresh, this);
-      this.on('render', this.refresh, this);
     },
   
     // Call `update` to trigger an update of the table.
@@ -270,10 +272,13 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
       this.vent.trigger('table:update', this.config());
     },
   
+    // Implementations should override this to set initial values.
+    setup : function(config) {
+    },
+  
     // Implementations should override this to stay up to date with
-    // the table state. Note that the data parameter will be undefined
-    // on the first refresh when the view is rendered.
-    refresh : function(data) {
+    // the table state.
+    refresh : function(config) {
     },
   
     // New table configuration to be sent on updates. For example,
@@ -290,6 +295,8 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   // defaults and only requires a `name` and a `template` parameter.
   Tableling.FieldModule = Tableling.Module.extend({
   
+    // TODO: check name
+  
     initialize : function(options) {
   
       Tableling.Module.prototype.initialize.call(this, options);
@@ -307,6 +314,11 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
       this.events['change [name="' + this.name + '"]'] = 'update';
     },
   
+    setup : function(config) {
+      this.ui.field.val(config[this.name]);
+      this.vent.trigger('table:update', this.config(), { refresh : false });
+    },
+  
     // The table property updated is the one with the same name as the module.
     config : function() {
       var config = {};
@@ -419,7 +431,26 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   Tableling.Plain.PageSizeView = Tableling.Plain.Table.prototype.pageSizeView = Tableling.FieldModule.extend({
     // TODO: update current page intelligently
     name : 'pageSize',
-    template : _.template('<select name="pageSize"><option>5</option><option>10</option><option>15</option></select> entries per page')
+    template : _.template('<select name="pageSize" /> entries per page'),
+    sizes : [ 10, 15, 20, 25, 50 ],
+  
+    ui : {
+      field : 'select'
+    },
+  
+    initialize : function(options) {
+      Tableling.FieldModule.prototype.initialize.call(this, options);
+      this.sizes = _.clone(options.sizes || this.sizes);
+    },
+  
+    onRender : function() {
+      this.ui.field.empty();
+      _.each(this.sizes, _.bind(this.addSize, this));
+    },
+  
+    addSize : function(size) {
+      $('<option />').text(size).appendTo(this.ui.field);
+    }
   });
   
   Tableling.Plain.QuickSearchView = Tableling.Plain.Table.prototype.quickSearchView = Tableling.FieldModule.extend({

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

@@ -14224,7 +14224,7 @@ Marionette.EventAggregator = Backbone.Wreqr.EventAggregator;
   return Marionette;
 })(Backbone, _, $ || window.jQuery || window.Zepto || window.ender);
 /*!
- * Tableling v0.0.9
+ * Tableling v0.0.10
  * Copyright (c) 2012 Simon Oulevay (Alpha Hydrae) <hydrae.alpha@gmail.com>
  * Distributed under MIT license
  * https://github.com/AlphaHydrae/tableling
@@ -14232,7 +14232,7 @@ Marionette.EventAggregator = Backbone.Wreqr.EventAggregator;
 Backbone.Tableling = Tableling = (function(Backbone, _, $){
 
   var Tableling = {
-    version : "0.0.9"
+    version : "0.0.10"
   };
 
   // Tableling
@@ -14246,8 +14246,7 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   
     // Default table options can be overriden by subclasses.
     tableling : {
-      page : 1,
-      pageSize : 15
+      page : 1
     },
   
     initialize : function(options) {
@@ -14271,8 +14270,8 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   
     // Called once rendering is complete. By default, it updates the table.
     setup : function() {
-      this.vent.trigger('table:setup', this.filterConfig(this.tableling, true));
-      this.vent.trigger('table:update');
+      this.ventTrigger('table:setup', this.filterConfig(this.tableling, true));
+      this.ventTrigger('table:update');
     },
   
     // Subclasses must return the Backbone.Collection used to fetch data.
@@ -14367,11 +14366,11 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
     ventTrigger : function() {
   
       var args = Array.prototype.slice.call(arguments);
-      this.vent.trigger.apply(this.vent, args);
-  
       if (Tableling.debug) {
-        console.log(args.shift() + ' - ' + JSON.stringify(args));
+        console.log(_.first(args) + ' - ' + JSON.stringify(args.slice(1)));
       }
+  
+      this.vent.trigger.apply(this.vent, args);
     }
   });
   
@@ -14484,10 +14483,13 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
     initialize : function(options) {
       this.vent = options.vent;
   
-      // The `refresh` method of the view is called once the view is rendered
-      // and every time the table is refreshed.
+      // The `setup` method of the view is called when the table
+      // is first set up.
+      this.vent.on('table:setup', this.setup, this);
+  
+      // The `refresh` method of the view is called every time the table
+      // is refreshed.
       this.vent.on('table:refreshed', this.refresh, this);
-      this.on('render', this.refresh, this);
     },
   
     // Call `update` to trigger an update of the table.
@@ -14495,10 +14497,13 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
       this.vent.trigger('table:update', this.config());
     },
   
+    // Implementations should override this to set initial values.
+    setup : function(config) {
+    },
+  
     // Implementations should override this to stay up to date with
-    // the table state. Note that the data parameter will be undefined
-    // on the first refresh when the view is rendered.
-    refresh : function(data) {
+    // the table state.
+    refresh : function(config) {
     },
   
     // New table configuration to be sent on updates. For example,
@@ -14515,6 +14520,8 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   // defaults and only requires a `name` and a `template` parameter.
   Tableling.FieldModule = Tableling.Module.extend({
   
+    // TODO: check name
+  
     initialize : function(options) {
   
       Tableling.Module.prototype.initialize.call(this, options);
@@ -14532,6 +14539,11 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
       this.events['change [name="' + this.name + '"]'] = 'update';
     },
   
+    setup : function(config) {
+      this.ui.field.val(config[this.name]);
+      this.vent.trigger('table:update', this.config(), { refresh : false });
+    },
+  
     // The table property updated is the one with the same name as the module.
     config : function() {
       var config = {};
@@ -14644,7 +14656,26 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   Tableling.Plain.PageSizeView = Tableling.Plain.Table.prototype.pageSizeView = Tableling.FieldModule.extend({
     // TODO: update current page intelligently
     name : 'pageSize',
-    template : _.template('<select name="pageSize"><option>5</option><option>10</option><option>15</option></select> entries per page')
+    template : _.template('<select name="pageSize" /> entries per page'),
+    sizes : [ 10, 15, 20, 25, 50 ],
+  
+    ui : {
+      field : 'select'
+    },
+  
+    initialize : function(options) {
+      Tableling.FieldModule.prototype.initialize.call(this, options);
+      this.sizes = _.clone(options.sizes || this.sizes);
+    },
+  
+    onRender : function() {
+      this.ui.field.empty();
+      _.each(this.sizes, _.bind(this.addSize, this));
+    },
+  
+    addSize : function(size) {
+      $('<option />').text(size).appendTo(this.ui.field);
+    }
   });
   
   Tableling.Plain.QuickSearchView = Tableling.Plain.Table.prototype.quickSearchView = Tableling.FieldModule.extend({

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tableling-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: