tabulatr2 0.9.15 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f23479a544dea98a12d51d712207eb073099c36a
-  data.tar.gz: 5bc9a22c42eb5682f397c2b2906dd78665f7868e
+  metadata.gz: b70faeab636c745520f3c94de294232af0540e1d
+  data.tar.gz: b3feca6e1aeabdf69b5b5ada582b2a6a91834957
 SHA512:
-  metadata.gz: 1bebe6ba5bf5ae4472fb13b18f679a00f31e1a3f31062945e535037483a44ad03c8fc93503a0a40a991e97dde628927b955ace7fd7299973735414e16bee2569
-  data.tar.gz: 1c288d8b9da7f52c75689feb9eb4eafa32f876d6a46f9d86cc514909ad08ab9a83bb7dc64a418f6e461f90736f51700d2927d71e588eda2289c28a3de5c45fbc
+  metadata.gz: 44a287bc0b2493272e229cf0646b3829a2c9f79424e8ca5a5e1717531cb56bd9349774c4b69139b6423c672dfd3f04e180687e3a9399706d6e3ce8e47cf68ab0
+  data.tar.gz: 30052dc24ecf51e7975bd54fd5adcf75d1cbea36295bb1b100fc070fbffdda79cacd01a07defe1f91d98ae84dafa91caaeccc813cea0d538f50f98a365cf7d21

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 ## 0.9.15
+ * Adds filter support for `enum`
+   If it detects an enum it creates a dropdown filter with the possible enum
+   values as options.
+
+   fixes #35
+
  * Removes bootstrap2 CSS modifications
 
 ## 0.9.6

data/README.md

@@ -18,11 +18,15 @@ gem 'tabulatr2'
 After that run `bundle install`.
 
 Also add `//= require tabulatr` to your application js file and `*= require tabulatr` to your CSS asset
-pipeline.
+pipeline. Make sure to add it after including the `bootstrap` assets.
 
 In order to get the provided `i18n` language files run
 `rails g tabulatr:install`
 
+## Example
+
+![example](https://cloud.githubusercontent.com/assets/570608/5580201/661c63c0-9047-11e4-9993-f71a0f1f4c00.png)
+
 ## The DSL
 
 `Tabulatr` provides an easy to use DSL to define the data to be used in your table. It is defined in `TabulatrData`

data/app/assets/javascripts/tabulatr/_tabulatr.js

@@ -9,6 +9,19 @@ function Tabulatr(id){
   this.hasInfiniteScrolling = false;
 }
 
+var cbfn = function(event, isInView, visiblePartX, visiblePartY) {
+  if (isInView && visiblePartY !== 'top' && visiblePartY !== 'bottom') {
+    var tableId = $(event.currentTarget).data('table');
+    var table_obj;
+    for(var i = 0; i < tabulatr_tables.length; i++){
+      if(tabulatr_tables[i].id === tableId){
+        table_obj = tabulatr_tables[i];
+      }
+    }
+    table_obj.updateTable({append: true});
+  }
+};
+
 var tabulatr_tables;
 Tabulatr.prototype = {
   constructor: Tabulatr,
@@ -108,7 +121,6 @@ Tabulatr.prototype = {
     }
     if(this.locked){ return; }
     this.locked = true;
-    var curTable = this;
     this.showLoadingSpinner();
     if(this.initialRequest && this.isAPersistedTable && localStorage[this.id]){
       data = JSON.parse(localStorage[this.id]);
@@ -150,7 +162,7 @@ Tabulatr.prototype = {
     }
   },
 
-  handleError: function(foo, bar){
+  handleError: function(){
     if(this.isAPersistedTable && this.initialRequest){
       this.initialRequest = false;
       this.locked = false;
@@ -161,54 +173,36 @@ Tabulatr.prototype = {
   insertTabulatrData: function(response){
     var tableId = response.meta.table_id;
     var tbody = $('#'+ tableId +' tbody');
-    if(!response.meta.append){
-      if(this.storePage){
-        $('#'+ tableId +' tbody tr').hide();
-      }else{
-        $('#'+ tableId +' tbody').html('');
-      }
-    }
-    if(response.data.length === 0){
-      this.moreResults = false;
-      $('.pagination_trigger[data-table='+ tableId +']').unbind('inview');
-    }else{
-      if(this.currentCount() + response.data.length >= response.meta.count){
-        this.moreResults = false;
-        $('.pagination_trigger[data-table='+ tableId + ']').unbind('inview');
-      }
-
-      // insert the actual data
-      for(var i = 0; i < response.data.length; i++){
-        var data = response.data[i];
-        var id = data.id;
-        var tr = $('#'+ tableId +' tr.empty_row').clone();
-        tr.removeClass('empty_row');
-        if(data._row_config.data){
-          tr.data(data._row_config.data);
-          delete data._row_config.data;
+
+    this.prepareTableForInsert(tableId, response.meta.append, response.data.length, response.meta.count);
+
+
+    // insert the actual data
+    for(var i = 0; i < response.data.length; i++){
+      var data = response.data[i];
+      var id = data.id;
+      var tr = $('#'+ tableId +' tr.empty_row').clone();
+      tr.removeClass('empty_row');
+      if(data._row_config.data){
+        tr.data(data._row_config.data);
+        delete data._row_config.data;
+      }
+      tr.attr(data._row_config);
+      tr.attr('data-page', response.meta.page);
+      tr.attr('data-id', id);
+      tr.find('td').each(function(index,element) {
+        var td = $(element);
+        var coltype = td.data('tabulatr-type');
+        var name = td.data('tabulatr-column-name');
+        var cont = data[name];
+        if(coltype === 'checkbox') {
+          cont = $("<input>").attr('type', 'checkbox').val(id).addClass('tabulatr-checkbox');
         }
-        tr.attr(data._row_config);
-        tr.attr('data-page', response.meta.page);
-        tr.attr('data-id', id);
-        tr.find('td').each(function(index,element) {
-          var td = $(element);
-          var coltype = td.data('tabulatr-type');
-          var name = td.data('tabulatr-column-name');
-          var cont = data[name];
-          if(coltype === 'checkbox') {
-            cont = $("<input>").attr('type', 'checkbox').val(id).addClass('tabulatr-checkbox');
-          }
-          td.html(cont);
-        });
-        tbody.append(tr);
-      }
+        td.html(cont);
+      });
+      tbody.append(tr);
     }
-    var count_string = $('.tabulatr_count[data-table='+ tableId +']').data('format-string');
-    count_string = count_string.replace(/%\{current\}/, response.meta.count);
-    count_string = count_string.replace(/%\{total\}/, response.meta.total);
-    count_string = count_string.replace(/%\{per_page\}/,
-      response.meta.pagesize);
-    $('.tabulatr_count[data-table='+ tableId +']').html(count_string);
+    this.updateInfoString(tableId, response);
 
     if(this.isAPersistedTable){
       this.retrieveTableFromLocalStorage(response);
@@ -216,7 +210,7 @@ Tabulatr.prototype = {
   },
 
 
-  replacer: function(match, attribute, offset, string){
+  replacer: function(match, attribute){
     return this.currentData[attribute];
   },
 
@@ -267,7 +261,7 @@ Tabulatr.prototype = {
     return hash;
   },
 
-  localDate: function(value, $td, $tr, obj){
+  localDate: function(value){
     return new Date(value).toLocaleString();
   },
 
@@ -279,6 +273,29 @@ Tabulatr.prototype = {
     this.initialRequest = false;
     this.locked = false;
     $('.tabulatr-spinner-box[data-table="'+ this.id +'"]').hide();
+  },
+
+  updateInfoString: function(tableId, response){
+    var count_string = $('.tabulatr_count[data-table='+ tableId +']').data('format-string');
+    count_string = count_string.replace(/%\{current\}/, response.meta.count);
+    count_string = count_string.replace(/%\{total\}/, response.meta.total);
+    count_string = count_string.replace(/%\{per_page\}/,
+      response.meta.pagesize);
+    $('.tabulatr_count[data-table='+ tableId +']').html(count_string);
+  },
+
+  prepareTableForInsert: function(tableId, append, dataCount, actualCount){
+    if(!append){
+      if(this.storePage){
+        $('#'+ tableId +' tbody tr').hide();
+      }else{
+        $('#'+ tableId +' tbody').html('');
+      }
+    }
+    if(dataCount === 0 || this.currentCount() + dataCount >= actualCount){
+      this.moreResults = false;
+      $('.pagination_trigger[data-table='+ tableId +']').unbind('inview');
+    }
   }
 
 };
@@ -294,7 +311,7 @@ $(document).on('ready page:load', function(){
     var tableId = table.attr('id');
     var table_obj;
     for(var i = 0; i < tabulatr_tables.length; i++){
-      if(tabulatr_tables[i].id == tableId){
+      if(tabulatr_tables[i].id === tableId){
         table_obj = tabulatr_tables[i];
       }
     }
@@ -334,7 +351,7 @@ $(document).on('ready page:load', function(){
     $('#'+ tableId +' .tabulatr-wrench').addClass('disabled');
     var table_obj;
     for(var i = 0; i < tabulatr_tables.length; i++){
-      if(tabulatr_tables[i].id == tableId){
+      if(tabulatr_tables[i].id === tableId){
         table_obj = tabulatr_tables[i];
       }
     }
@@ -345,7 +362,7 @@ $(document).on('ready page:load', function(){
     var tableId = $(this).data('table');
     var table_obj;
     for(var i = 0; i < tabulatr_tables.length; i++){
-      if(tabulatr_tables[i].id == tableId){
+      if(tabulatr_tables[i].id === tableId){
         table_obj = tabulatr_tables[i];
       }
     }
@@ -365,7 +382,7 @@ $(document).on('ready page:load', function(){
     var tableId = $(this).data('table');
     var table_obj;
     for(var i = 0; i < tabulatr_tables.length; i++){
-      if(tabulatr_tables[i].id == tableId){
+      if(tabulatr_tables[i].id === tableId){
         table_obj = tabulatr_tables[i];
       }
     }
@@ -377,7 +394,7 @@ $(document).on('ready page:load', function(){
     var tableId = $(this).parents('table').prop('id');
     var table_obj;
     for(var i = 0; i < tabulatr_tables.length; i++){
-      if(tabulatr_tables[i].id == tableId){
+      if(tabulatr_tables[i].id === tableId){
         table_obj = tabulatr_tables[i];
       }
     }
@@ -400,7 +417,7 @@ $(document).on('ready page:load', function(){
     var $markAllCheckbox = $table.find('.tabulatr_mark_all');
     var table_obj;
     for(var i = 0; i < tabulatr_tables.length; i++){
-      if(tabulatr_tables[i].id == tableId){
+      if(tabulatr_tables[i].id === tableId){
         table_obj = tabulatr_tables[i];
       }
     }
@@ -435,7 +452,7 @@ $(document).on('ready page:load', function(){
     var tableId = $(this).closest('div').data('table');
     var table_obj;
     for(var i = 0; i < tabulatr_tables.length; i++){
-      if(tabulatr_tables[i].id == tableId){
+      if(tabulatr_tables[i].id === tableId){
         table_obj = tabulatr_tables[i];
       }
     }
@@ -451,11 +468,11 @@ $(document).on('ready page:load', function(){
 
   $(document).on('click', 'a[data-tabulatr-reset]',function(){
     var a = $(this);
-    var tableObj, tableName;
+    var tableObj;
     var tableId = a.data('tabulatrReset');
-    a.parents('.tabulatr-outer-wrapper').removeClass('filtered')
+    a.parents('.tabulatr-outer-wrapper').removeClass('filtered');
     for(var i = 0; i < tabulatr_tables.length; i++){
-      if(tabulatr_tables[i].id == tableId){
+      if(tabulatr_tables[i].id === tableId){
         tableObj = tabulatr_tables[i];
         tableObj.resetTable();
         return false;
@@ -484,7 +501,7 @@ $(document).on('ready page:load', function(){
       }
       tabulatr_tables.push(tabulatrTable);
       for(var i = 0; i < tabulatr_tables.length; i++){
-        if(tabulatr_tables[i].id == tableId){
+        if(tabulatr_tables[i].id === tableId){
           tableObj = tabulatr_tables[i];
         }
       }
@@ -510,7 +527,7 @@ $(document).on('click', '.pagination a[data-page]', function(){
   $('.tabulatr_mark_all[data-table='+ tableId +']').prop('indeterminate', false);
   var table_obj;
   for(var i = 0; i < tabulatr_tables.length; i++){
-    if(tabulatr_tables[i].id == tableId){
+    if(tabulatr_tables[i].id === tableId){
       table_obj = tabulatr_tables[i];
     }
   }
@@ -529,24 +546,3 @@ $(document).on('change', 'select[data-tabulatr-date-filter]', function() {
     select.parents('.tabulatr-filter-row').find(".from_to").hide().val('');
   }
 });
-
-
-var cbfn = function(event, isInView, visiblePartX, visiblePartY) {
-  if (isInView) {
-    // element is now visible in the viewport
-    if (visiblePartY == 'top') {
-      // top part of element is visible
-    } else if (visiblePartY == 'bottom') {
-      // bottom part of element is visible
-    } else {
-      var tableId = $(event.currentTarget).data('table');
-      var table_obj;
-      for(var i = 0; i < tabulatr_tables.length; i++){
-        if(tabulatr_tables[i].id == tableId){
-          table_obj = tabulatr_tables[i];
-        }
-      }
-      table_obj.updateTable({append: true});
-    }
-  }
-};

data/app/assets/stylesheets/{tabulatr/application.css.scss → tabulatr.scss}

@@ -57,10 +57,6 @@
     opacity: 1;
   }
 
-  .popover .tabulatr_filter_form {
-    width: 400px;
-  }
-
   .tabulatr_filtered_column{
     text-decoration: underline;
   }
@@ -192,4 +188,12 @@
     position: relative;
     text-align: center;
   }
+
+  .tabulatr-filter-row{
+    label{
+      display: block;
+    }
+  }
 }
+
+@import 'font-awesome';

data/app/views/tabulatr/_tabulatr_batch_actions_menu.html.slim

@@ -23,7 +23,7 @@
   - iname = "#{formatted_name}_batch"
   .dropdown
     a.btn.btn-default data-toggle="dropdown" href="#"
-      i.icon-cog.glyphicon.glyphicon-cog.fa.fa-cog'
+      i.icon-cog.glyphicon.glyphicon-cog.fa.fa-cog>
       i.icon-caret-down.glyphicon.glyphicon-chevron-down.fa.fa-caret-down
     ul.dropdown-menu role="menu" aria-labelledby="dLabel"
       - table_options[:batch_actions].each do |key, label|

data/app/views/tabulatr/_tabulatr_buttons.html.slim

@@ -1,4 +1,3 @@
-//{:buttons=>[{:icon=>:"eye-open", :path=>"/products/1", :options=>{:class=>"btn-success"}}, {:icon=>:pencil, :path=>"/products/1/edit", :options=>{:class=>"btn-warning"}}], :submenu=>[{:icon=>:star, :path=>"/products/1", :label=>"Dolle Sache"}, :divider, {:icon=>:"trash-o", :path=>"/products/1", :label=>"Löschen", :options=>{:confirm=>"echt?", :class=>"btn-danger", :method=>:delete}}]}
 .btn-group
   - buttons[:buttons].each do |button|
     - o = (button[:options] || {}).merge(class: "btn btn-sm btn-default #{button[:options].try(:[], :class)}")

data/app/views/tabulatr/_tabulatr_filter_dialog.html.slim

@@ -89,5 +89,10 @@
                           label.control-label for="#{formatted_name}_#{name}_filter_from"
                             = "Bis"
                           input.tabulatr_filter.form-control.date-picker.from_to.hidden type="text" id="#{formatted_name}_#{name}_filter_to" name="#{iname}[date][to]"
+                  - elsif column.filter == :enum
+                    select.form-control name=iname data-tabulatr-attribute=name
+                      option= I18n.t('tabulatr.enum_filter.none')
+                      - column.klass.try(column.name.to_s.pluralize.to_sym).each do |key, value|
+                        option value=value = key
                   - else
                     input.tabulatr_filter.form-control type="text" data-tabulatr-attribute="#{name}" name="#{iname}[like]"

data/lib/tabulatr/generators/tabulatr/templates/tabulatr.yml

@@ -19,6 +19,8 @@ en:
       both: All
       'yes': Yes
       'no': No
+    enum_filter:
+      none: ''
 
 de:
   tabulatr:
@@ -41,3 +43,5 @@ de:
       both: Alle
       'yes': Ja
       'no': Nein
+    enum_filter:
+      none: ''

data/lib/tabulatr/renderer/column.rb

@@ -182,7 +182,11 @@ class Tabulatr::Renderer::Column
   def determine_appropriate_filter!
     case self.klass.columns_hash[self.name.to_s].try(:type)
     when :integer, :float, :decimal
-      self.filter = :exact
+      if self.klass.respond_to?(:defined_enums) && self.klass.defined_enums.keys.include?(self.name.to_s)
+        self.filter = :enum
+      else
+        self.filter = :exact
+      end
     when :string, :text
       self.filter = :like
     when :date, :time, :datetime, :timestamp

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.9.15"
+  VERSION = "0.9.16"
 end

data/spec/dummy/app/assets/stylesheets/application.scss

@@ -0,0 +1,2 @@
+@import "bootstrap";
+@import "tabulatr";

data/spec/dummy/app/models/product.rb

@@ -1,4 +1,7 @@
 class Product < ActiveRecord::Base
+  if self.respond_to?(:enum)
+    enum status: [:in_stock, :short, :out_of_stock]
+  end
 
   belongs_to :vendor
   has_and_belongs_to_many :tags

data/spec/dummy/app/tabulatr_data/product_tabulatr_data.rb

@@ -8,6 +8,7 @@ class ProductTabulatrData < Tabulatr::Data
 
   column :title
   column :id
+  column :status
   column :price, table_column_options: {filter: :range} do "#{record.price} EUR" end # <- Block evaluiert im Kontext EINES Records
   column :edit_link do link_to "edit #{record.title}", product_path(record) end
   # column :name,
@@ -36,7 +37,7 @@ class ProductTabulatrData < Tabulatr::Data
     b.submenu do |s|
       s.button :star, product_path(r), label: 'Dolle Sache'
       s.divider
-      s.button :'trash-o', product_path(r), label: 'Löschen', confirm: 'echt?', class: 'btn-danger', method: :delete
+      s.button :'trash-o', product_path(r), label: 'Löschen', class: 'btn-danger', method: :delete, data: {confirm: 'echt?'}
     end
     "haha!"
   end

data/spec/dummy/app/views/products/simple_index.html.erb

@@ -1,4 +1,4 @@
 <%= table_for Product, paginate: true, persistent: false,
   batch_actions: {a: "Hallo", b: "Du da!"},
-  columns: [:'_buttons', :title, :price, :active, :vendor_product_name, :updated_at,
+  columns: [:'_buttons', :title, :price, :active, :vendor_product_name, :updated_at, :status,
             {vendor: :name}, 'tags:title'] %>

data/spec/dummy/config/locales/tabulatr.yml

@@ -19,7 +19,8 @@ en:
       both: All
       'yes': Yes
       'no': No
-
+    enum_filter:
+      none: ''
 de:
   tabulatr:
     rows_per_page: 'Ergebnisse pro Seite'
@@ -41,3 +42,5 @@ de:
       both: Alle
       'yes': Ja
       'no': Nein
+    enum_filter:
+      none: ''

data/spec/dummy/db/migrate/20141223164833_add_status_to_products.rb

@@ -0,0 +1,5 @@
+class AddStatusToProducts < ActiveRecord::Migration
+  def change
+    add_column :products, :status, :integer, default: 0
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140128140114) do
+ActiveRecord::Schema.define(version: 20141223164833) do
 
   create_table "products", force: true do |t|
     t.integer  "vendor_id"
@@ -21,6 +21,8 @@ ActiveRecord::Schema.define(version: 20140128140114) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "publish_at"
+    t.string   "type"
+    t.integer  "status",     default: 0
   end
 
   add_index "products", ["vendor_id"], name: "index_products_on_vendor_id"

data/spec/features/tabulatrs_spec.rb

@@ -131,14 +131,12 @@ feature "Tabulatr" do
       visit simple_index_products_path
       click_link 'Filter'
       fill_in("product_filter[products:title][like]", with: "ore")
-      find('.tabulatr-submit-table').click
       expect(page).to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'lorem')
       expect(page).to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'labore')
       expect(page).to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'dolore')
 
       within(".tabulatr_filter_form") do
         fill_in("product_filter[products:title][like]", :with => "loreem")
-        find('.tabulatr-submit-table').click
       end
       expect(page).not_to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'lorem')
       expect(page).not_to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'labore')
@@ -151,7 +149,6 @@ feature "Tabulatr" do
       visit simple_index_products_path
       click_link 'Filter'
       find('form.tabulatr_filter_form').fill_in("product_filter[vendor:name]", with: "producer")
-      find('.tabulatr-submit-table').click
       expect(page).not_to have_selector('td[data-tabulatr-column-name="vendor:name"]', text: @vendor1.name)
       expect(page).to have_selector('td[data-tabulatr-column-name="vendor:name"]', text: @vendor2.name)
     end
@@ -164,18 +161,45 @@ feature "Tabulatr" do
       click_link 'Filter'
       within('.tabulatr_filter_form') do
         fill_in("product_filter[products:price][from]", :with => 4)
+        wait_for_ajax
         fill_in("product_filter[products:price][to]", :with => 10)
-        find('.tabulatr-submit-table').click
+        wait_for_ajax
       end
-      expect(page).to have_css(".tabulatr_table tbody tr[data-id='#{Product.first.id}']", text: 'foo')
-      expect(page).to have_no_css(".tabulatr_table tbody tr[data-id='#{Product.last.id}']")
+      expect(page).to have_no_css('.tabulatr-spinner-box')
+      expect(page).to have_css(".tabulatr_table tbody tr", text: 'foo')
+      expect(page).to have_no_css(".tabulatr_table tbody tr", text: 'bar')
       within('.tabulatr_filter_form') do
         fill_in("product_filter[products:price][from]", :with => 12)
+        wait_for_ajax
         fill_in("product_filter[products:price][to]", :with => 19)
-        find('.tabulatr-submit-table').click
+        wait_for_ajax
       end
-      expect(page).to have_css(".tabulatr_table tbody tr[data-id='#{Product.last.id}']")
-      expect(page).to have_no_css(".tabulatr_table tbody tr[data-id='#{Product.first.id}']")
+      expect(page).to have_no_css('.tabulatr-spinner-box')
+      expect(page).to have_css(".tabulatr_table tbody tr", text: 'bar')
+      expect(page).to have_no_css(".tabulatr_table tbody tr", text: 'foo')
+    end
+
+    scenario "filters enums", js: true do
+      skip unless Product.respond_to?(:enum)
+      Product.create!([{title: 'foo', price: 5, status: 'in_stock'},
+                       {title: 'bar', price: 10, status: 'out_of_stock'}])
+      visit simple_index_products_path
+      expect(page).to have_css('.tabulatr_table tbody', text: 'foo')
+      expect(page).to have_css('.tabulatr_table tbody', text: 'bar')
+      click_link 'Filter'
+      within('.tabulatr_filter_form') do
+        select 'in_stock', from: 'product_filter[products:status]'
+      end
+      expect(page).to have_no_css('.tabulatr-spinner-box')
+      expect(page).to have_css('.tabulatr_table tbody', text: 'foo')
+      expect(page).to have_no_css('.tabulatr_table tbody', text: 'bar')
+      within('.tabulatr_filter_form') do
+        select 'out_of_stock', from: 'product_filter[products:status]'
+      end
+      expect(page).to have_no_css('.tabulatr-spinner-box')
+      expect(page).to have_css('.tabulatr_table tbody', text: 'bar')
+      expect(page).to have_no_css('.tabulatr_table tbody', text: 'foo')
+
     end
 
     scenario 'removes the filters', js: true do
@@ -184,7 +208,6 @@ feature "Tabulatr" do
       click_link 'Filter'
       within(".tabulatr_filter_form") do
         fill_in("product_filter[products:title][like]", with: "foo")
-        find('.tabulatr-submit-table').click
       end
       expect(page).not_to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'bar')
       expect(page).to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'foo')

data/spec/lib/tabulatr/data/dsl_spec.rb

@@ -1,19 +1,19 @@
 require 'rails_helper'
 
 describe Tabulatr::Data::DSL do
-  class DummySpecClass
+  class DummyDSLClass
     extend Tabulatr::Data::DSL
   end
 
   before(:each) do
-    DummySpecClass.instance_variable_set('@table_columns', [])
+    DummyDSLClass.instance_variable_set('@table_columns', [])
   end
 
   describe '#column' do
     it 'escapes table and column names' do
-      allow(DummySpecClass).to receive(:main_class).and_return(Product)
-      DummySpecClass.column(:active)
-      table_column = DummySpecClass.instance_variable_get('@table_columns').first
+      allow(DummyDSLClass).to receive(:main_class).and_return(Product)
+      DummyDSLClass.column(:active)
+      table_column = DummyDSLClass.instance_variable_get('@table_columns').first
       expect(table_column.filter_sql).to match(/\"products\".\"active\"/)
       expect(table_column.sort_sql).to match(/\"products\".\"active\"/)
     end
@@ -21,9 +21,9 @@ describe Tabulatr::Data::DSL do
 
   describe '#association' do
     it 'escapes table and column names' do
-      allow(DummySpecClass).to receive(:main_class).and_return(Product)
-      DummySpecClass.association(:vendor, :name)
-      table_column = DummySpecClass.instance_variable_get('@table_columns').first
+      allow(DummyDSLClass).to receive(:main_class).and_return(Product)
+      DummyDSLClass.association(:vendor, :name)
+      table_column = DummyDSLClass.instance_variable_get('@table_columns').first
       expect(table_column.filter_sql).to match(/\"vendors\".\"name\"/)
       expect(table_column.sort_sql).to match(/\"vendors\".\"name\"/)
     end

data/spec/lib/tabulatr/data/filtering_spec.rb

@@ -1,12 +1,12 @@
 require 'rails_helper'
 
 describe Tabulatr::Data::Filtering do
-  class DummySpecClass
+  class DummyFilteringClass
     include Tabulatr::Data::Filtering
   end
 
   before(:each) do
-    @dummy = DummySpecClass.new
+    @dummy = DummyFilteringClass.new
     @dummy.instance_variable_set('@relation', Product.all)
     @yesterday = Product.create!(publish_at: DateTime.new(2013, 12, 31, 0, 0))
     @today = Product.create!(publish_at: DateTime.new(2014, 1, 1, 15, 0))

data/spec/lib/tabulatr/data/formatting_spec.rb

@@ -1,13 +1,13 @@
 require 'rails_helper'
 
 describe Tabulatr::Data::Formatting do
-  class DummySpecClass
+  class DummyFormattingClass
     include Tabulatr::Data::Formatting
     def table_columns; end
   end
 
   before(:each) do
-    @dummy = DummySpecClass.new
+    @dummy = DummyFormattingClass.new
     @dummy.instance_variable_set('@relation', Product.all)
     column = Tabulatr::Renderer::Column.from(
         name: :title,

data/spec/lib/tabulatr/data/pagination_spec.rb

@@ -1,12 +1,12 @@
 require 'rails_helper'
 
 describe Tabulatr::Data::Pagination do
-  class DummySpecClass
+  class DummyPaginationClass
     include Tabulatr::Data::Pagination
   end
 
   before(:all) do
-    @dummy = DummySpecClass.new
+    @dummy = DummyPaginationClass.new
   end
   describe '.compute_pagination' do
     it "computes an offset" do

data/spec/lib/tabulatr/data/sorting_spec.rb

@@ -1,12 +1,13 @@
 require 'rails_helper'
 
 describe Tabulatr::Data::Sorting do
-  class DummySpecClass
+  class DummySortingClass
     include Tabulatr::Data::Sorting
+    def table_columns; end
   end
 
   before(:each) do
-    @dummy = DummySpecClass.new
+    @dummy = DummySortingClass.new
     @dummy.instance_variable_set('@relation', Product.all)
     @dummy.instance_variable_set('@table_name', 'products')
     @dummy.instance_variable_set('@base', Product)

data/spec/lib/tabulatr/renderer/checkbox_spec.rb

@@ -6,7 +6,9 @@ describe Tabulatr::Renderer::Checkbox do
 
     it "generates a checkbox" do
       checkbox = Tabulatr::Renderer::Checkbox.new
-      expect(checkbox.human_name).to eq('<input class="tabulatr_mark_all" id="mark_all" name="mark_all" type="checkbox" value="1" />')
+      expect(checkbox.human_name).to match(/\A<input.+\/>\z/)
+      expect(checkbox.human_name).to match(/class="tabulatr_mark_all"/)
+      expect(checkbox.human_name).to match(/type="checkbox"/)
     end
 
   end

data/spec/rails_helper.rb

@@ -14,9 +14,10 @@ Capybara.register_driver :poltergeist do |app|
   Capybara::Poltergeist::Driver.new(app, {js_errors: true})
 end
 
+
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+Dir[Rails.root.join("../support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = false

data/spec/support/wait_for_ajax.rb

@@ -0,0 +1,16 @@
+# from http://robots.thoughtbot.com/automatically-wait-for-ajax-with-capybara
+module WaitForAjax
+  def wait_for_ajax
+    Timeout.timeout(Capybara.default_wait_time) do
+      loop until finished_all_ajax_requests?
+    end
+  end
+
+  def finished_all_ajax_requests?
+    page.evaluate_script('jQuery.active').zero?
+  end
+end
+
+RSpec.configure do |config|
+  config.include WaitForAjax, type: :feature
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.9.16
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,8 +125,7 @@ files:
 - app/assets/javascripts/tabulatr/_tabulatr.js
 - app/assets/javascripts/tabulatr/application.js
 - app/assets/javascripts/tabulatr/jquery.inview.min.js
-- app/assets/stylesheets/tabulatr.css.scss
-- app/assets/stylesheets/tabulatr/application.css.scss
+- app/assets/stylesheets/tabulatr.scss
 - app/views/tabulatr/_tabulatr_actual_table.html.slim
 - app/views/tabulatr/_tabulatr_batch_actions_menu.html.slim
 - app/views/tabulatr/_tabulatr_buttons.html.slim
@@ -177,7 +176,7 @@ files:
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css.scss
+- spec/dummy/app/assets/stylesheets/application.scss
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/concerns/.keep
 - spec/dummy/app/controllers/products_controller.rb
@@ -225,6 +224,7 @@ files:
 - spec/dummy/db/migrate/20130730132321_create_products.rb
 - spec/dummy/db/migrate/20130730132348_create_tags.rb
 - spec/dummy/db/migrate/20140128140114_add_publish_at_to_products.rb
+- spec/dummy/db/migrate/20141223164833_add_status_to_products.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
@@ -244,6 +244,7 @@ files:
 - spec/lib/tabulatr/renderer/renderer_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
+- spec/support/wait_for_ajax.rb
 - tabulatr.gemspec
 homepage: http://github.com/metaminded/tabulatr2
 licenses:
@@ -266,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A tight DSL to build tables of ActiveRecord models with sorting, pagination,
@@ -277,7 +278,7 @@ test_files:
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css.scss
+- spec/dummy/app/assets/stylesheets/application.scss
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/concerns/.keep
 - spec/dummy/app/controllers/products_controller.rb
@@ -325,6 +326,7 @@ test_files:
 - spec/dummy/db/migrate/20130730132321_create_products.rb
 - spec/dummy/db/migrate/20130730132348_create_tags.rb
 - spec/dummy/db/migrate/20140128140114_add_publish_at_to_products.rb
+- spec/dummy/db/migrate/20141223164833_add_status_to_products.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
@@ -344,3 +346,4 @@ test_files:
 - spec/lib/tabulatr/renderer/renderer_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
+- spec/support/wait_for_ajax.rb

data/app/assets/stylesheets/tabulatr.css.scss

@@ -1,2 +0,0 @@
-@import 'tabulatr/application';
-@import 'font-awesome';

data/spec/dummy/app/assets/stylesheets/application.css.scss

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require tabulatr
- */
-
-@import "bootstrap";