tableling-rails 0.0.22 → 0.0.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWM5Yzc1OGI4NzQyOWQ2MTFkZDNiYTUyOTI2MjdiY2JmYjc4MDE2Ng==
+    YjRhZjkyZGZjNDlmM2FkY2Q0YTRiYzUyMGFiNmZmNDJjZTExZGFlZA==
   data.tar.gz: !binary |-
-    OGMwZmJlZDZlMWM1ZDU4MGZjYTlmMmQwMjVmZGRkMjg4ZGI1M2QzYw==
+    ODhiOWY0MzEyOTU2ZDc2YTg2ZmE5NDhhZGQ1MmZmNjgyOGYzMzI3Mg==
 SHA512:
   metadata.gz: !binary |-
-    NmZhYTVhZWZlOTA5Y2MxNTM3Y2JlYmE2NTM4ZTMzODc3MzBlZTY2NjZjNWJm
-    MDEwNjNjNzU1NDNiODUxMTg0NjdlZjYyZDE2OGY1ODNiNDJiZmRkYzllZmYx
-    MzI1MDE5YjU2NWNjM2E2ZDRlMDkxYThjNTEyNzUwZDU2ZDI4NDQ=
+    Yjk3NGE3NTMyNjlhMTVmNmM1NzQ3NjYzOTVhMDIyMjA4ZDgyYmVmZmE4YTA1
+    ODE3MzI5MGU3YjhkYTQyMjcwZWRkMzMxNGEwNjRkM2FkMWVhNDY1YWQzMDI1
+    OTYzNWRiNDgxOWY3NmZiZDJkYTk3MjRhNjkyOTdiZGMxMzFhNmE=
   data.tar.gz: !binary |-
-    M2E3MzE1Mzk3OWI3NmM3ZmM5YTM2OWEzOGJlNzE5MGNjMGI1YjAwZWE5ODAw
-    YWRjZDIzNmMyMGZmNWMzYmE1YzM4Y2JiNzFlMjUzYjE4NzdkODk0NGRlZDNm
-    MmI4ZGI2NjMwNGUyNDJmZjBlYWY0MTA3OTJhNmQ4M2M5NjkwMGY=
+    NzM1ZjYzOWY3N2ViYWVmMjVmMzViYzE1ZWI2NmJmYmFjNGQzYzE3NmFhZjUy
+    NWM3MGZhOTY4MWRlMDZkODdhODA5OGRhNGYwYTk5NjY4OTQ0NGNjMThiMjIy
+    YTk0YWE1MzVhZDlmZGYzOGEyYjU0YmQwOTIxOWU5N2UwMmEwY2Q=

data/VERSION

@@ -1 +1 @@
-0.0.22
+0.0.23

data/lib/tableling-rails/version.rb

@@ -1,3 +1,3 @@
 module Tableling
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

data/lib/tableling-rails/view.rb

@@ -50,9 +50,9 @@ module Tableling
 
       @fields.each{ |f| q = f.with_includes q }
 
-      response_options = {
+      response_options = (options[:response] || {}).merge({
         total: total
-      }
+      })
 
       page_size = options[:pageSize].to_i
       page_size = 10 if page_size <= 0

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

@@ -4048,15 +4048,15 @@ _.extend(Marionette.Module, {
 })(this, Backbone, _);
 
 /*!
- * Tableling v0.0.22
- * Copyright (c) 2012-2013 Simon Oulevay (Alpha Hydrae) <hydrae.alpha@gmail.com>
+ * Tableling v0.0.23
+ * Copyright (c) 2012-2014 Simon Oulevay (Alpha Hydrae) <hydrae.alpha@gmail.com>
  * Distributed under MIT license
  * https://github.com/AlphaHydrae/tableling
  */
 Backbone.Tableling = Tableling = (function(Backbone, _, $){
 
   var Tableling = {
-    version : "0.0.22"
+    version : "0.0.23"
   };
 
   // Tableling
@@ -4153,6 +4153,7 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
       var options = _.clone(this.fetchOptions);
       options.data = this.requestData();
       options.success = _.bind(this.processResponse, this);
+      options.reset = true;
   
       // `table:refreshing` is triggered every time new data is being fetched.
       // The first argument is the request data.
@@ -4379,6 +4380,7 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
       if (!this.events) {
         this.events = {};
       }
+      this.events.submit = 'onSubmit';
       this.events['change [name="' + this.name + '"]'] = 'update';
     },
   
@@ -4396,6 +4398,11 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
       var config = {};
       config[this.name] = this.ui.field.val();
       return config;
+    },
+  
+    onSubmit : function(e) {
+      e.preventDefault();
+      return false;
     }
   });
   
@@ -4628,7 +4635,7 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   
   Tableling.Plain.PageView = Tableling.Plain.Table.prototype.pageView = Tableling.Module.extend({
       
-    template : _.template('<div class="pagination"><ul><li class="first"><a href="#">&lt;&lt;</a></li><li class="previous"><a href="#">&lt;</a></li><li class="next"><a href="#">&gt;</a></li><li class="last"><a href="#">&gt;&gt;</a></li></ul></div>'),
+    template : _.template('<ul class="pagination"><li class="first"><a href="#">&lt;&lt;</a></li><li class="previous"><a href="#">&lt;</a></li><li class="next"><a href="#">&gt;</a></li><li class="last"><a href="#">&gt;&gt;</a></li></ul>'),
     pageTemplate : _.template('<li class="page"><a href="#"><%- number %></a></li>'),
   
     ui : {
@@ -4738,19 +4745,34 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   Tableling.Bootstrap = {};
   
   Tableling.Bootstrap.Table = Tableling.Plain.Table.extend({
-    template : _.template('<div class="header"><div class="pageSize pull-left" /><div class="quickSearch pull-right" /></div><div class="table" /><div class="footer"><div class="info pull-left" /><div class="page pull-right" /></div>')
+    template : _.template('<div class="header clearfix"><div class="pageSize pull-left" /><div class="quickSearch pull-right" /></div><div class="table" /><div class="footer clearfix"><div class="info pull-left" /><div class="page pull-right" /></div>')
   });
   
   Tableling.Bootstrap.TableView = Tableling.Plain.TableView.extend({});
   
   Tableling.Bootstrap.PageSizeView = Tableling.Bootstrap.Table.prototype.pageSizeView = Tableling.Plain.PageSizeView.extend({
   
+    tagName : 'form',
+    className : 'form-inline',
+    attributes : {
+      role : 'form'
+    },
     template : function(data) {
-      return _.template('<select name="pageSize" class="input-mini"><option>5</option><option>10</option><option>15</option></select> <%- entries %>', data);
+      return _.template('<div class="formGroup"><select name="pageSize" class="form-control"><option>5</option><option>10</option><option>15</option></select> <%- entries %></div>', data);
     }
   });
   
-  Tableling.Bootstrap.QuickSearchView = Tableling.Bootstrap.Table.prototype.quickSearchView = Tableling.Plain.QuickSearchView.extend({});
+  Tableling.Bootstrap.QuickSearchView = Tableling.Bootstrap.Table.prototype.quickSearchView = Tableling.Plain.QuickSearchView.extend({
+  
+    tagName : 'form',
+    className : 'form-inline',
+    attributes : {
+      role : 'form'
+    },
+    template : function(data) {
+      return _.template('<div class="formGroup"><input type="text" name="quickSearch" class="form-control" placeholder="<%- quickSearch %>" /></div>', data);
+    }
+  });
   
   Tableling.Bootstrap.InfoView = Tableling.Bootstrap.Table.prototype.infoView = Tableling.Plain.InfoView.extend({});
   

data/vendor/assets/javascripts/tableling.js

@@ -1,13 +1,13 @@
 /*!
- * Tableling v0.0.22
- * Copyright (c) 2012-2013 Simon Oulevay (Alpha Hydrae) <hydrae.alpha@gmail.com>
+ * Tableling v0.0.23
+ * Copyright (c) 2012-2014 Simon Oulevay (Alpha Hydrae) <hydrae.alpha@gmail.com>
  * Distributed under MIT license
  * https://github.com/AlphaHydrae/tableling
  */
 Backbone.Tableling = Tableling = (function(Backbone, _, $){
 
   var Tableling = {
-    version : "0.0.22"
+    version : "0.0.23"
   };
 
   // Tableling
@@ -104,6 +104,7 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
       var options = _.clone(this.fetchOptions);
       options.data = this.requestData();
       options.success = _.bind(this.processResponse, this);
+      options.reset = true;
   
       // `table:refreshing` is triggered every time new data is being fetched.
       // The first argument is the request data.
@@ -330,6 +331,7 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
       if (!this.events) {
         this.events = {};
       }
+      this.events.submit = 'onSubmit';
       this.events['change [name="' + this.name + '"]'] = 'update';
     },
   
@@ -347,6 +349,11 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
       var config = {};
       config[this.name] = this.ui.field.val();
       return config;
+    },
+  
+    onSubmit : function(e) {
+      e.preventDefault();
+      return false;
     }
   });
   
@@ -579,7 +586,7 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   
   Tableling.Plain.PageView = Tableling.Plain.Table.prototype.pageView = Tableling.Module.extend({
       
-    template : _.template('<div class="pagination"><ul><li class="first"><a href="#">&lt;&lt;</a></li><li class="previous"><a href="#">&lt;</a></li><li class="next"><a href="#">&gt;</a></li><li class="last"><a href="#">&gt;&gt;</a></li></ul></div>'),
+    template : _.template('<ul class="pagination"><li class="first"><a href="#">&lt;&lt;</a></li><li class="previous"><a href="#">&lt;</a></li><li class="next"><a href="#">&gt;</a></li><li class="last"><a href="#">&gt;&gt;</a></li></ul>'),
     pageTemplate : _.template('<li class="page"><a href="#"><%- number %></a></li>'),
   
     ui : {
@@ -689,19 +696,34 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   Tableling.Bootstrap = {};
   
   Tableling.Bootstrap.Table = Tableling.Plain.Table.extend({
-    template : _.template('<div class="header"><div class="pageSize pull-left" /><div class="quickSearch pull-right" /></div><div class="table" /><div class="footer"><div class="info pull-left" /><div class="page pull-right" /></div>')
+    template : _.template('<div class="header clearfix"><div class="pageSize pull-left" /><div class="quickSearch pull-right" /></div><div class="table" /><div class="footer clearfix"><div class="info pull-left" /><div class="page pull-right" /></div>')
   });
   
   Tableling.Bootstrap.TableView = Tableling.Plain.TableView.extend({});
   
   Tableling.Bootstrap.PageSizeView = Tableling.Bootstrap.Table.prototype.pageSizeView = Tableling.Plain.PageSizeView.extend({
   
+    tagName : 'form',
+    className : 'form-inline',
+    attributes : {
+      role : 'form'
+    },
     template : function(data) {
-      return _.template('<select name="pageSize" class="input-mini"><option>5</option><option>10</option><option>15</option></select> <%- entries %>', data);
+      return _.template('<div class="formGroup"><select name="pageSize" class="form-control"><option>5</option><option>10</option><option>15</option></select> <%- entries %></div>', data);
     }
   });
   
-  Tableling.Bootstrap.QuickSearchView = Tableling.Bootstrap.Table.prototype.quickSearchView = Tableling.Plain.QuickSearchView.extend({});
+  Tableling.Bootstrap.QuickSearchView = Tableling.Bootstrap.Table.prototype.quickSearchView = Tableling.Plain.QuickSearchView.extend({
+  
+    tagName : 'form',
+    className : 'form-inline',
+    attributes : {
+      role : 'form'
+    },
+    template : function(data) {
+      return _.template('<div class="formGroup"><input type="text" name="quickSearch" class="form-control" placeholder="<%- quickSearch %>" /></div>', data);
+    }
+  });
   
   Tableling.Bootstrap.InfoView = Tableling.Bootstrap.Table.prototype.infoView = Tableling.Plain.InfoView.extend({});
   

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

@@ -14642,15 +14642,15 @@ _.extend(Marionette.Module, {
 })(this, Backbone, _);
 
 /*!
- * Tableling v0.0.22
- * Copyright (c) 2012-2013 Simon Oulevay (Alpha Hydrae) <hydrae.alpha@gmail.com>
+ * Tableling v0.0.23
+ * Copyright (c) 2012-2014 Simon Oulevay (Alpha Hydrae) <hydrae.alpha@gmail.com>
  * Distributed under MIT license
  * https://github.com/AlphaHydrae/tableling
  */
 Backbone.Tableling = Tableling = (function(Backbone, _, $){
 
   var Tableling = {
-    version : "0.0.22"
+    version : "0.0.23"
   };
 
   // Tableling
@@ -14747,6 +14747,7 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
       var options = _.clone(this.fetchOptions);
       options.data = this.requestData();
       options.success = _.bind(this.processResponse, this);
+      options.reset = true;
   
       // `table:refreshing` is triggered every time new data is being fetched.
       // The first argument is the request data.
@@ -14973,6 +14974,7 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
       if (!this.events) {
         this.events = {};
       }
+      this.events.submit = 'onSubmit';
       this.events['change [name="' + this.name + '"]'] = 'update';
     },
   
@@ -14990,6 +14992,11 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
       var config = {};
       config[this.name] = this.ui.field.val();
       return config;
+    },
+  
+    onSubmit : function(e) {
+      e.preventDefault();
+      return false;
     }
   });
   
@@ -15222,7 +15229,7 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   
   Tableling.Plain.PageView = Tableling.Plain.Table.prototype.pageView = Tableling.Module.extend({
       
-    template : _.template('<div class="pagination"><ul><li class="first"><a href="#">&lt;&lt;</a></li><li class="previous"><a href="#">&lt;</a></li><li class="next"><a href="#">&gt;</a></li><li class="last"><a href="#">&gt;&gt;</a></li></ul></div>'),
+    template : _.template('<ul class="pagination"><li class="first"><a href="#">&lt;&lt;</a></li><li class="previous"><a href="#">&lt;</a></li><li class="next"><a href="#">&gt;</a></li><li class="last"><a href="#">&gt;&gt;</a></li></ul>'),
     pageTemplate : _.template('<li class="page"><a href="#"><%- number %></a></li>'),
   
     ui : {
@@ -15332,19 +15339,34 @@ Backbone.Tableling = Tableling = (function(Backbone, _, $){
   Tableling.Bootstrap = {};
   
   Tableling.Bootstrap.Table = Tableling.Plain.Table.extend({
-    template : _.template('<div class="header"><div class="pageSize pull-left" /><div class="quickSearch pull-right" /></div><div class="table" /><div class="footer"><div class="info pull-left" /><div class="page pull-right" /></div>')
+    template : _.template('<div class="header clearfix"><div class="pageSize pull-left" /><div class="quickSearch pull-right" /></div><div class="table" /><div class="footer clearfix"><div class="info pull-left" /><div class="page pull-right" /></div>')
   });
   
   Tableling.Bootstrap.TableView = Tableling.Plain.TableView.extend({});
   
   Tableling.Bootstrap.PageSizeView = Tableling.Bootstrap.Table.prototype.pageSizeView = Tableling.Plain.PageSizeView.extend({
   
+    tagName : 'form',
+    className : 'form-inline',
+    attributes : {
+      role : 'form'
+    },
     template : function(data) {
-      return _.template('<select name="pageSize" class="input-mini"><option>5</option><option>10</option><option>15</option></select> <%- entries %>', data);
+      return _.template('<div class="formGroup"><select name="pageSize" class="form-control"><option>5</option><option>10</option><option>15</option></select> <%- entries %></div>', data);
     }
   });
   
-  Tableling.Bootstrap.QuickSearchView = Tableling.Bootstrap.Table.prototype.quickSearchView = Tableling.Plain.QuickSearchView.extend({});
+  Tableling.Bootstrap.QuickSearchView = Tableling.Bootstrap.Table.prototype.quickSearchView = Tableling.Plain.QuickSearchView.extend({
+  
+    tagName : 'form',
+    className : 'form-inline',
+    attributes : {
+      role : 'form'
+    },
+    template : function(data) {
+      return _.template('<div class="formGroup"><input type="text" name="quickSearch" class="form-control" placeholder="<%- quickSearch %>" /></div>', data);
+    }
+  });
   
   Tableling.Bootstrap.InfoView = Tableling.Bootstrap.Table.prototype.infoView = Tableling.Plain.InfoView.extend({});
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tableling-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Simon Oulevay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -32,6 +32,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.txt
+- README.md
+- VERSION
+- lib/tableling-rails.rb
 - lib/tableling-rails/config.rb
 - lib/tableling-rails/engine.rb
 - lib/tableling-rails/errors.rb
@@ -42,13 +46,8 @@ files:
 - lib/tableling-rails/type_serializer.rb
 - lib/tableling-rails/version.rb
 - lib/tableling-rails/view.rb
-- lib/tableling-rails.rb
-- vendor/assets/javascripts/tableling.backbone.js
-- vendor/assets/javascripts/tableling.js
-- vendor/assets/javascripts/tableling.world.js
-- LICENSE.txt
-- README.md
-- VERSION
+- spec/dummy/README.rdoc
+- spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/javascripts/books.js
 - spec/dummy/app/assets/javascripts/bootstrap.js
@@ -75,6 +74,7 @@ files:
 - spec/dummy/app/models/book.rb
 - spec/dummy/app/views/books/index.html.haml
 - spec/dummy/app/views/layouts/application.html.haml
+- spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -90,7 +90,6 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/config.ru
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20121008115302_create_books.rb
 - spec/dummy/db/schema.rb
@@ -102,12 +101,13 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/Rakefile
-- spec/dummy/README.rdoc
 - spec/dummy/script/rails
 - spec/models/book_spec.rb
 - spec/spec_helper.rb
 - spec/version_spec.rb
+- vendor/assets/javascripts/tableling.backbone.js
+- vendor/assets/javascripts/tableling.js
+- vendor/assets/javascripts/tableling.world.js
 homepage: https://github.com/AlphaHydrae/tableling-rails
 licenses:
 - MIT
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Tableling gem for Ruby on Rails.