tabulatr2 0.9.12 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a47c45c08c541dbbb460f8aa315f35db38c82c8
-  data.tar.gz: e6fd77a9e25389bcfbbca3e82d8064842b421211
+  metadata.gz: 7c84d124ea6a79ae026aa59ba8a1365a1bc6ae16
+  data.tar.gz: 85d817921b527a2a5ab2f0427080b64d14830a86
 SHA512:
-  metadata.gz: fbb8191710b05154d82532ba5b316c4914f95ea415bac16c0cc73bc6426381e3cdd5e11b7091564afd570553167639ea991b2dbcdaefaef439aea1ddc6baf086
-  data.tar.gz: d28ea60364b7841bc1c1125402754d8f9920c17d4dd88af0a7eb775ed4e5c51321998de725598b731ba46731b354bc5e75078683c514b0c655292a927efbd080
+  metadata.gz: 8de26639ec20250a03e347ee476320bd9f7eddf964bd5893266828c77350d35ccebe99cc3f8ab4e9de82e04280235c8a932cc7b76a89d7ad5244a45313c97635
+  data.tar.gz: 7a003812abef8c87fbe511f3950c9d9d9d31312190a13720d7c996a3c1a8d4f5f760dd71d5e27a338b9691c9532fd9f080ff0fad68603469524dd3cb5dba50b7

data/Gemfile

@@ -14,6 +14,7 @@ group :development, :test do
   gem 'sqlite3', :require => 'sqlite3'
   gem 'rspec', '~> 2.14.1'
   gem 'rspec-rails', '~> 2.14.0'
+  gem 'minitest'
   gem 'capybara'
   gem 'launchy'
   gem 'database_cleaner', '< 1.1.0'

data/README.md

@@ -344,6 +344,7 @@ the columns in the block of `table_for`.
   wrap: nil,
   th_html: false,
   filter_html: false,
+  filter_label: nil,
   filter: true,          # whether this column should be filterable
   sortable: true,        # whethter this column should be sortable
   format: nil,

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

@@ -2,11 +2,11 @@ $(function(){
   Tabulatr.prototype.retrieveTableFromLocalStorage = function(response){
     var currentStorage = JSON.parse(localStorage[this.id]);
     if(currentStorage !== undefined){
-      $('.pagination[data-table='+ this.id +'] a[data-page='+ response.meta.page +']'); 
+      $('.pagination[data-table='+ this.id +'] a[data-page='+ response.meta.page +']');
       var $table = $('#' + this.id);
       var tableName = this.id.split('_')[0];
-      if(currentStorage[tableName +'_sort'] != ''){
-        var sortParam = currentStorage[tableName +'_sort'];
+      var sortParam = currentStorage[tableName +'_sort'];
+      if(sortParam && sortParam != ''){
         var header = $table.find('th.tabulatr-sortable[data-tabulatr-column-name="'+ sortParam.split(' ')[0] +'"]');
         header.attr('data-sorted', sortParam.split(' ')[1]);
         header.addClass('sorted');
@@ -18,11 +18,11 @@ $(function(){
       for(var i = 0; i < objKeys.length; i++){
         elem = $('[name="'+ objKeys[i] +'"]');
         if(elem.length > 0){
-          elem.val(currentStorage[objKeys[i]]);
+          var val = currentStorage[objKeys[i]];
+          elem.val(val);
           formParent = elem.parents('.form-group[data-filter-column-name]');
-          if(formParent.length > 0){
-            formParent.show();
-            formParent.siblings('[data-filter-column-name="_submit"]').show();
+          if(formParent.length > 0 && val && val.length > 0){
+            $('.tabulatr-outer-wrapper[data-table-id="'+this.id+'"]').addClass('filtered')
           }
         }
       }
@@ -34,8 +34,8 @@ $(function(){
     localStorage.removeItem(this.id);
     $('table#'+ this.id).find('th.sorted').removeClass('sorted').removeAttr('data-sorted');
     $('form[data-table='+ this.id +'] input.search').val('');
-    $('[data-table-id="'+ this.id +'"] [data-filter-column-name]').hide().find('input[type=text], input[type=hidden], select').val('');
+    $('[data-table-id="'+ this.id +'"] [data-filter-column-name]').find('input[type=text], input[type=hidden], select').val('');
     $('.tabulatr_filter_form[data-table='+ this.id +'] input[name="'+ tableName +'_sort"]').val('');
     this.updateTable({page: 1}, true);
   };
-});
+});

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

@@ -357,6 +357,10 @@ $(document).on('ready page:load', function(){
     return false;
   });
 
+  $('form.tabulatr_filter_form input, form.tabulatr_filter_form select').change(function(){
+    $(this).parents('form.tabulatr_filter_form').submit();
+  });
+
   $('form.tabulatr_filter_form').submit(function(){
     var tableId = $(this).data('table');
     var table_obj;
@@ -369,32 +373,6 @@ $(document).on('ready page:load', function(){
     return false;
   });
 
-  $('.tabulatr_table').on('click', 'i.tabulatr_remove_filter', function(){
-    var $th = $(this).closest('th');
-    var name = $th.data('tabulatr-form-name').
-                  replace(/\[(like|checkbox|from|to)\]/, '');
-    name = name.replace(/(:|\.|\[|\])/g,'\\$1');
-    $th.removeClass('tabulatr_filtered_column');
-    if($('[name^='+ name +']').is(':checkbox')){
-      $('[name^='+ name +']').prop('checked', false);
-    }else{
-      $('[name^='+ name +']').val('');
-    }
-    var tableId = $(this).closest('.tabulatr_table').attr('id');
-    $(this).remove();
-    var table_obj;
-    for(var i = 0; i < tabulatr_tables.length; i++){
-      if(tabulatr_tables[i].id == tableId){
-        table_obj = tabulatr_tables[i];
-      }
-    }
-    if(table_obj.hasInfiniteScrolling){
-      $('.pagination_trigger[data-table='+ tableId +']').bind('inview', cbfn);
-    }
-    table_obj.updateTable({});
-    return false;
-  });
-
   $('.tabulatr_mark_all').click(function(){
     var tableId = $(this).parents('table').prop('id');
     var table_obj;
@@ -472,8 +450,10 @@ $(document).on('ready page:load', function(){
   });
 
   $(document).on('click', 'a[data-tabulatr-reset]',function(){
+    var a = $(this);
     var tableObj, tableName;
-    var tableId = $(this).data('tabulatrReset');
+    var tableId = a.data('tabulatrReset');
+    a.parents('.tabulatr-outer-wrapper').removeClass('filtered')
     for(var i = 0; i < tabulatr_tables.length; i++){
       if(tabulatr_tables[i].id == tableId){
         tableObj = tabulatr_tables[i];
@@ -511,6 +491,12 @@ $(document).on('ready page:load', function(){
       tableObj.updateTable({}, false);
     });
   }
+
+  $(document).on('click', 'a[data-show-filters-for]', function(){
+    var a = $(this);
+    a.parents('.tabulatr-outer-wrapper').addClass('filtered');
+  });
+
 });
 
 $(document).on('click', '.pagination a[data-page]', function(){
@@ -533,52 +519,14 @@ $(document).on('click', '.pagination a[data-page]', function(){
 });
 
 
-// TODO: We absolutely need to clean that up!
-
-$(document).on('click', 'a[data-show-table-filter]', function(){
-  var a = $(this);
-  var name = a.data('show-table-filter');
-  var tableId = a.parents('.tabulatr-filter-menu-wrapper').data('table-id');
-  var filterForm = $('.tabulatr_filter_form[data-table="'+ tableId +'"]');
-  filterForm.find($('div[data-filter-column-name="'+ name +'"]')).show('blind');
-  filterForm.find($('div[data-filter-column-name="_submit"]')).show('blind');
-
-  a.hide();
-  return false;
-});
-
-$(document).on('click', 'a[data-hide-table-filter]', function(){
-  var a = $(this);
-  var nam = a.data('hide-table-filter');
-  var filterForm = a.parents('.tabulatr_filter_form');
-  var t = filterForm.find($('div[data-filter-column-name="'+nam+'"]'));
-  t.hide();
-  t.find('input[type=text]').val("");
-  t.find('select').val('');
-  var filterMenu = $('.tabulatr-filter-menu-wrapper[data-table-id="'+ filterForm.data('table') +'"]');
-  filterMenu.find($('a[data-show-table-filter="'+nam+'"]')).show();
-  if (filterForm.find($('div[data-filter-column-name]:visible')).length <= 2)
-    filterForm.find($('div[data-filter-column-name="_submit"]')).hide('blind');
-
-  var tableId = filterForm.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.submitFilterForm();
-  return false;
-});
-
 $(document).on('change', 'select[data-tabulatr-date-filter]', function() {
   var select = $(this);
   var option = select.find('option:selected');
   var val = option.val();
   if (val === 'from_to') {
-    select.parents('.controls').find(".from_to").show().removeClass('hidden');
+    select.parents('.tabulatr-filter-row').find(".from_to").show().removeClass('hidden');
   } else {
-    select.parents('.controls').find(".from_to").hide().val('');
+    select.parents('.tabulatr-filter-row').find(".from_to").hide().val('');
   }
 });
 
@@ -601,4 +549,4 @@ var cbfn = function(event, isInView, visiblePartX, visiblePartY) {
       table_obj.updateTable({append: true});
     }
   }
-};
+};

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

@@ -19,156 +19,177 @@
 //  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 //  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-.tabulatr-sort{
-  opacity: 0.3;
-}
+.tabulatr-outer-wrapper {
 
-.tabulatr-sort:hover{
-  cursor: pointer;
-}
+  .tabulatr-filter-col {
+    display:none;
+  }
+  .tabulatr-table-col {
+    @extend .col-xs-12;
+  }
 
-.sorted{
-  opacity: 1;
-}
+  &.filtered {
+    .tabulatr-filter-col {
+      display:block;
+      @extend .col-xs-4;
+      @extend .col-sm-3;
+      @extend .col-lg-2;
+    }
+    .tabulatr-table-col {
+      @extend .col-xs-8;
+      @extend .col-sm-9;
+      @extend .col-lg-10;
+    }
+    a[data-show-filters-for] {
+      display: none;
+    }
+  }
 
-i.tabulatr_remove_filter:hover{
-  cursor: pointer;
-}
+  .tabulatr-sort{
+    opacity: 0.3;
+  }
 
-.tabulatr_filtered_column{
-  text-decoration: underline;
-}
+  .tabulatr-sort:hover{
+    cursor: pointer;
+  }
 
-.tabulatr-per-page {
-  margin: 20px 10px;
-  a.active{
-    background-color: red;
+  .sorted{
+    opacity: 1;
   }
-}
 
-.table-controls div{
-  margin: 20px 10px;
-  display: inline-block;
-  vertical-align: middle;
-}
+  .popover .tabulatr_filter_form {
+    width: 400px;
+  }
 
-.table-controls i, .tabulatr_table i{
-  margin-right: 5px;
-}
+  .tabulatr_filtered_column{
+    text-decoration: underline;
+  }
 
-.table-controls .form-inline{
-  display: inline-block;
-  position: relative;
-  vertical-align: top;
-}
+  .tabulatr-per-page {
+    margin: 20px 10px;
+    a.active{
+      background-color: red;
+    }
+  }
 
-#tabulatr-wrench{
-  margin-left: 10px;
-}
+  .table-controls div{
+    margin: 20px 10px;
+    display: inline-block;
+    vertical-align: middle;
+  }
 
+  .table-controls i, .tabulatr_table i{
+    margin-right: 5px;
+  }
 
+  .table-controls .form-inline{
+    display: inline-block;
+    position: relative;
+    vertical-align: top;
+  }
 
-div[data-filter-column-name] {
-  display:none;
-}
+  #tabulatr-wrench{
+    margin-left: 10px;
+  }
 
-th.tabulatr-sortable {
-  cursor: pointer;
+  th.tabulatr-sortable {
+    cursor: pointer;
 
-  &.sorted {
+    &.sorted {
 
-    &[data-sorted=asc] {
-      &:after {
-        content: " \25B2";
-        margin-left: 5px;
+      &[data-sorted=asc] {
+        &:after {
+          content: " \25B2";
+          margin-left: 5px;
+        }
       }
-    }
 
-    &[data-sorted=desc] {
-      &:after {
-        content: " \25BC";
-        margin-left: 5px;
+      &[data-sorted=desc] {
+        &:after {
+          content: " \25BC";
+          margin-left: 5px;
+        }
       }
     }
   }
-}
 
-table.tabulatr_table {
-  td, th {
-    &[align=right] {
-      text-align: right;
-    }
+  table.tabulatr_table {
+    td, th {
+      &[align=right] {
+        text-align: right;
+      }
 
-    &[align=center] {
-      text-align: center;
+      &[align=center] {
+        text-align: center;
+      }
+    }
+    tr.empty_row{
+      display: none;
     }
   }
-  tr.empty_row{
-    display: none;
-  }
-}
 
-.tabulatr-table-controls-wrapper {
-  display: block;
-  padding-top: 10px;
+  .tabulatr-table-controls-wrapper {
+    display: block;
+    padding-top: 10px;
 
-  .tabulatr-filter-menu-wrapper {
-    display: inline-block;
-    padding: 20px 0 20px 0;
-  }
+    .tabulatr-filter-menu-wrapper {
+      display: inline-block;
+      padding: 20px 0 20px 0;
+    }
 
-  .tabulatr-batch-actions-menu-wrapper {
-    display: inline-block;
-    padding: 20px 0 20px 20px;
-  }
+    .tabulatr-batch-actions-menu-wrapper {
+      display: inline-block;
+      padding: 20px 0 20px 20px;
+    }
 
-  .tabulatr-paginator-wrapper {
-    display: inline-block;
-    padding: 0;
-    text-align: center;
+    .tabulatr-paginator-wrapper {
+      display: inline-block;
+      padding: 0;
+      text-align: center;
 
-    .pagination{
-      margin: 10px 0;
-      vertical-align: middle;
-    }
+      .pagination{
+        margin: 10px 0;
+        vertical-align: middle;
+      }
 
-    .pagination_trigger{
-      width: 1px;
-      height: 1px;
-      position: relative;
-      float: left;
-      opacity: 1;
+      .pagination_trigger{
+        width: 1px;
+        height: 1px;
+        position: relative;
+        float: left;
+        opacity: 1;
+      }
     }
-  }
 
-  .tabulatr-info-string-wrapper {
-    display: inline-block;
-    padding: 20px 20px 20px 0;
-  }
+    .tabulatr-info-string-wrapper {
+      display: inline-block;
+      padding: 20px 20px 20px 0;
+    }
 
-  .tabulatr-fuzzy-search-field-wrapper {
-    display: inline-block;
-    float: right;
-    padding: 20px 0 20px 0;
-  }
+    .tabulatr-fuzzy-search-field-wrapper {
+      display: inline-block;
+      float: right;
+      padding: 20px 0 20px 0;
+    }
 
-  .tabulatr-filter-dialog-wrapper {
-    display: block;
+    .tabulatr-filter-dialog-wrapper {
+      display: block;
 
-    .submit-table{
-      z-index: 2;
+      .submit-table{
+        z-index: 2;
+      }
     }
   }
-}
 
-.tabulatr-table-controls-wrapper.row{
-  margin: 0;
-}
+  .tabulatr-table-controls-wrapper.row{
+    margin: 0;
+  }
 
-.tabulatr-spinner-box{
-  width: 100%;
-  height: 50px;
-  display: none;
-  position: relative;
-  text-align: center;
+  .tabulatr-spinner-box{
+    width: 100%;
+    height: 50px;
+    display: none;
+    position: relative;
+    text-align: center;
+  }
 }

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

@@ -20,70 +20,74 @@
 /  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-form.form.form-horizontal.tabulatr_filter_form data-table=table_id  data-remote="true" role='form'
-  input name="#{formatted_name}_sort" type="hidden" value=table_options[:order_by]
-  - if table_options[:filter] && columns.select(&:filter).present?
-    - columns.select(&:filter).each do |column|
-      - name = column.full_name
-      .control-group.form-group data-filter-column-name=name
-        - iname = "#{formatted_name}_filter[#{name}]"
-        - filter_name = "tabulatr_form_#{name}"
+.tabulatr-filter-popover title="Filter" data-table=table_id
+  form.form.tabulatr_filter_form data-table=table_id  data-remote="true" role='form'
+    .panel.panel-default
+      .panel-heading
+        = t('tabulatr.filter')
+        .btn-group.pull-right
+          a.tabulatr-reset-table.btn.btn-danger.btn-xs data-tabulatr-reset=table_id
+            = fa_icon :remove
+          a.tabulatr-submit-table.btn.btn-primary.btn-xs
+            = fa_icon 'arrow-right'
+      .panel-body
+        .wech style='text-indent: -2000px; height: 0px'
+          = submit_tag "Anwenden"
+        input name="#{formatted_name}_sort" type="hidden" value=table_options[:order_by]
+        - if table_options[:filter] && columns.select(&:filter).present?
+          - columns.select(&:filter).each do |column|
+            - name = column.full_name
+            .row.tabulatr-filter-row
+              .col-xs-12
+                .control-group.form-group data-filter-column-name=name
+                  - iname = "#{formatted_name}_filter[#{name}]"
+                  - filter_name = "tabulatr_form_#{name}"
 
-        label.control-label.col-sm-3.col-xs-12 for=filter_name
-          = column.human_name
+                  label.control-label for=filter_name
+                    = column.filter_label || column.human_name
 
-        .controls.col-sm-9.col-xs-12.row
-          - if column.filter.is_a?(Hash) || column.filter.is_a?(Array) || column.filter.is_a?(String)
-            .col-sm-11
-              select.form-control id=name name=iname
-                - if column.filter.class.is_a?(String)
-                  = column.filter
-                - else
-                  option
-                  = options_for_select(column.filter)
-          - elsif column.filter == :range
-            .col-sm-5
-              input.tabulatr_filter.form-control type="text" id="#{name}_from" data-tabulatr-attribute="#{name}_from" name="#{iname}[from]"
-            span.col-sm-1.text-center —
-            .col-sm-5
-              input.tabulatr_filter.form-control type="text" id="#{name}_to" data-tabulatr-attribute="#{name}_to" name="#{iname}[to]"
-          - elsif column.filter == :checkbox
-            .col-sm-11
-              = select_tag(iname, options_for_select([ \
-                  [t('tabulatr.boolean_filter.both'), ""],
-                  [t('tabulatr.boolean_filter.no'), "false"],
-                  [t('tabulatr.boolean_filter.yes'), "true"]] \
-                ), class: 'form-control')
-          - elsif column.filter == :exact
-            .col-sm-11
-              input.tabulatr_filter.form-control type="text" id="#{name}_exact" data-tabulatr-attribute="#{name}" name="#{iname}"
-          - elsif column.filter == :date
-            .col-sm-3
-              select.form-control name="#{iname}[date][simple]" data-tabulatr-date-filter="#{formatted_name}_#{name}_filter"
-                option= I18n.t("tabulatr.date_filter.none")
-                option value="today"= I18n.t("tabulatr.date_filter.today")
-                option value="yesterday"= I18n.t("tabulatr.date_filter.yesterday")
-                option value="this_week"= I18n.t("tabulatr.date_filter.this_week")
-                option value="last_7_days"= I18n.t("tabulatr.date_filter.last_7_days")
-                option value="this_month"= I18n.t("tabulatr.date_filter.this_month")
-                option value="last_30_days"= I18n.t("tabulatr.date_filter.last_30_days")
-                option value="from_to"= I18n.t("tabulatr.date_filter.from_to")
-            .col-sm-1
-            .col-sm-3
-              input.tabulatr_filter.form-control.date-picker.hidden.from_to type="text" id="#{formatted_name}_#{name}_filter_from" name="#{iname}[date][from]"
-            .col-sm-1.text-center
-              .span.from_to.hidden
-                |—
-            .col-sm-3
-              input.tabulatr_filter.form-control.date-picker.from_to.hidden type="text" id="#{formatted_name}_#{name}_filter_to" name="#{iname}[date][to]"
-          - else
-            .col-sm-11
-              input.tabulatr_filter.form-control type="text" data-tabulatr-attribute="#{name}" name="#{iname}[like]"
-          .col-sm-1
-            = link_to "✕", '#', 'data-hide-table-filter' => name, class: 'form-control btn btn-danger btn-mini'
-
-    .control-group.form-group data-filter-column-name="_submit"
-      label.control-label.col-md-3 for="_submit"
-        | 
-      .controls.col-md-9
-        input.submit-table.btn.btn-primary.btn-mini.btn-sm type='submit' value=I18n.t('tabulatr.apply_filters')
+                  - if column.filter.is_a?(Hash) || column.filter.is_a?(Array) || column.filter.is_a?(String)
+                    select.form-control.no-chosen id=name name=iname
+                      - if column.filter.class.is_a?(String)
+                        = column.filter
+                      - else
+                        option
+                        = options_for_select(column.filter)
+                  - elsif column.filter == :range
+                    .col-sm-5
+                      input.tabulatr_filter.form-control type="text" id="#{name}_from" data-tabulatr-attribute="#{name}_from" name="#{iname}[from]"
+                    span.col-sm-1.text-center —
+                    .col-sm-5
+                      input.tabulatr_filter.form-control type="text" id="#{name}_to" data-tabulatr-attribute="#{name}_to" name="#{iname}[to]"
+                  - elsif column.filter == :checkbox
+                    .col-xs-12
+                      = select_tag(iname, options_for_select([ \
+                          [t('tabulatr.boolean_filter.both'), ""],
+                          [t('tabulatr.boolean_filter.no'), "false"],
+                          [t('tabulatr.boolean_filter.yes'), "true"]] \
+                        ), class: 'form-control no-chosen')
+                  - elsif column.filter == :exact
+                    input.tabulatr_filter.form-control type="text" id="#{name}_exact" data-tabulatr-attribute="#{name}" name="#{iname}"
+                  - elsif column.filter == :date
+                    select.form-control.no-chosen name="#{iname}[date][simple]" data-tabulatr-date-filter="#{formatted_name}_#{name}_filter"
+                      option= I18n.t("tabulatr.date_filter.none")
+                      option value="today"= I18n.t("tabulatr.date_filter.today")
+                      option value="yesterday"= I18n.t("tabulatr.date_filter.yesterday")
+                      option value="this_week"= I18n.t("tabulatr.date_filter.this_week")
+                      option value="last_7_days"= I18n.t("tabulatr.date_filter.last_7_days")
+                      option value="this_month"= I18n.t("tabulatr.date_filter.this_month")
+                      option value="last_30_days"= I18n.t("tabulatr.date_filter.last_30_days")
+                      option value="from_to"= I18n.t("tabulatr.date_filter.from_to")
+                    .row.from_to.hidden
+                      .col-xs-6
+                        .control-group
+                          label.control-label for="#{formatted_name}_#{name}_filter_from"
+                            = "Von"
+                          input.tabulatr_filter.form-control.date-picker.hidden.from_to type="text" id="#{formatted_name}_#{name}_filter_from" name="#{iname}[date][from]"
+                      .col-xs-6
+                        .control-group
+                          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]"
+                  - else
+                    input.tabulatr_filter.form-control type="text" data-tabulatr-attribute="#{name}" name="#{iname}[like]"

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

@@ -20,11 +20,6 @@
 /  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 - if table_options[:filter] && columns.select(&:filter).present?
-  .dropdown
-    a.btn.btn-default data-toggle="dropdown" href="#"
-      i.icon-filter.glyphicon.glyphicon-filter.fa.fa-filter'
-      i.icon-caret-down.glyphicon.glyphicon-chevron-down.fa.fa-caret-down
-    ul.dropdown-menu role="menu" aria-labelledby="dLabel"
-      - columns.select(&:filter).each do |column|
-        li
-          = link_to column.human_name, '#', "data-show-table-filter" => column.full_name
+    a.btn.btn-default data-show-filters-for=table_id href="#"
+      => t('tabulatr.filter')
+      i.icon-caret-right.glyphicon.glyphicon-chevron-right.fa.fa-caret-right

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

@@ -23,29 +23,30 @@
     klass: klass, classname: classname, table_id: table_id,
     formatted_name: formatted_name }
 
-.tabulatr-table-controls-wrapper.row data-table-id=table_id
-  .tabulatr-filter-menu-wrapper.col-xs-3.col-sm-1 data-table-id=table_id
-    = render '/tabulatr/tabulatr_filter_menu', opts
-
-  .tabulatr-batch-actions-menu-wrapper.col-xs-3.col-sm-1 data-table-id=table_id
-    = render '/tabulatr/tabulatr_batch_actions_menu', opts
-
-  - if tabulatr_data.search?
-    .tabulatr-fuzzy-search-field-wrapper.col-xs-6.col-sm-2 data-table-id=table_id
-      = render '/tabulatr/tabulatr_fuzzy_search_field', opts
-
-  - if table_options[:pagination_position].in?([:top, :both])
-    .tabulatr-paginator-wrapper.col-xs-12.col-sm-8 data-table-id=table_id
-      = render '/tabulatr/tabulatr_paginator', opts
-
-.tabulatr-filter-dialog-wrapper data-table-id=table_id
-  = render '/tabulatr/tabulatr_filter_dialog', opts
-
-- if table_options[:counter_position].in?([:top, :both])
-  .tabulatr-info-string-wrapper data-table-id=table_id
-    = render '/tabulatr/tabulatr_info_string', opts
-
-= render '/tabulatr/tabulatr_actual_table', opts
+.row.tabulatr-outer-wrapper data-table-id=table_id
+  .tabulatr-filter-col data-table-id=table_id
+    = render '/tabulatr/tabulatr_filter_dialog', opts
+  .tabulatr-table-col.col-xs-12 data-table-id=table_id
+    .tabulatr-table-controls-wrapper.row data-table-id=table_id
+      .tabulatr-filter-menu-wrapper.col-xs-3.col-sm-1 data-table-id=table_id
+        = render '/tabulatr/tabulatr_filter_menu', opts
+
+      .tabulatr-batch-actions-menu-wrapper.col-xs-3.col-sm-1 data-table-id=table_id
+        = render '/tabulatr/tabulatr_batch_actions_menu', opts
+
+      - if tabulatr_data.search?
+        .tabulatr-fuzzy-search-field-wrapper.col-xs-6.col-sm-2 data-table-id=table_id
+          = render '/tabulatr/tabulatr_fuzzy_search_field', opts
+
+      - if table_options[:pagination_position].in?([:top, :both])
+        .tabulatr-paginator-wrapper.col-xs-12.col-sm-8 data-table-id=table_id
+          = render '/tabulatr/tabulatr_paginator', opts
+
+
+    - if table_options[:counter_position].in?([:top, :both])
+      .tabulatr-info-string-wrapper data-table-id=table_id
+        = render '/tabulatr/tabulatr_info_string', opts
+    = render '/tabulatr/tabulatr_actual_table', opts
 
 - if table_options[:counter_position].in?([:bottom, :both])
   .tabulatr-info-string-wrapper data-table-id=table_id

data/lib/tabulatr/data/dsl.rb

@@ -46,12 +46,12 @@ module Tabulatr::Data::DSL
 
   def column(name, header: nil, sort_sql: nil, filter_sql: nil, sql: nil, table_column_options: {},
     classes: nil, width: false, align: false, valign: false, wrap: nil, th_html: false,
-    filter_html: false, filter: true, sortable: true, format: nil, map: true, cell_style: {},
+    filter_html: false, filter_label: nil, filter: true, sortable: true, format: nil, map: true, cell_style: {},
     header_style: {},
     &block)
     @table_columns ||= []
     table_column_options = {classes: classes, width: width, align: align, valign: valign, wrap: wrap,
-      th_html: th_html, filter_html: filter_html, filter: filter, sortable: sortable,
+      th_html: th_html, filter_html: filter_html, filter_label: filter_label, filter: filter, sortable: sortable,
       format: format, map: map, cell_style: cell_style, header_style: header_style,
       header: header
     }.merge(table_column_options)
@@ -59,8 +59,8 @@ module Tabulatr::Data::DSL
     table_column = Tabulatr::Renderer::Column.from(
       table_column_options.merge(name: name,
         klass: @base,
-        sort_sql: sort_sql || sql || "#{table_name}.#{name}",
-        filter_sql: filter_sql || sql || "#{table_name}.#{name}",
+        sort_sql: sort_sql || sql || "#{main_class.quoted_table_name}.#{ActiveRecord::Base.connection.quote_column_name(name)}",
+        filter_sql: filter_sql || sql || "#{main_class.quoted_table_name}.#{ActiveRecord::Base.connection.quote_column_name(name)}",
         table_name: table_name.to_sym,
         output: block_given? ? block : ->(record){record.send(name)}))
     @table_columns << table_column
@@ -68,35 +68,35 @@ module Tabulatr::Data::DSL
 
   def association(assoc, name, header: nil, sort_sql: nil, filter_sql: nil, sql: nil, table_column_options: {},
     classes: nil, width: false, align: false, valign: false, wrap: nil, th_html: false,
-    filter_html: false, filter: true, sortable: true, format: nil, map: true, cell_style: {},
+    filter_html: false, filter_label: nil, filter: true, sortable: true, format: nil, map: true, cell_style: {},
     header_style: {},
     &block)
     @table_columns ||= []
     table_column_options = {classes: classes, width: width, align: align, valign: valign, wrap: wrap,
-      th_html: th_html, filter_html: filter_html, filter: filter, sortable: sortable,
+      th_html: th_html, filter_html: filter_html, filter_label: filter_label, filter: filter, sortable: sortable,
       format: format, map: map, cell_style: cell_style, header_style: header_style,
       header: header
     }.merge(table_column_options)
     assoc_klass = main_class.reflect_on_association(assoc.to_sym)
-    t_name = assoc_klass.try(:table_name)
+    t_name = assoc_klass.try(:quoted_table_name)
     table_column = Tabulatr::Renderer::Association.from(
       table_column_options.merge(name: name, table_name: assoc,
         klass: assoc_klass.try(:klass),
-        sort_sql: sort_sql || sql || "#{t_name}.#{name}",
-        filter_sql: filter_sql || sql || "#{t_name}.#{name}",
-        output: block_given? ? block : ->(record){record.send(assoc).try(name)}))
+        sort_sql: sort_sql || sql || "#{t_name}.#{ActiveRecord::Base.connection.quote_column_name(name)}",
+        filter_sql: filter_sql || sql || "#{t_name}.#{ActiveRecord::Base.connection.quote_column_name(name)}",
+        output: block_given? ? block : ->(record){a=record.send(assoc); a.try(:read_attribute, name) || a.try(name)}))
     @table_columns << table_column
   end
 
   def actions(header: nil, name: nil, table_column_options: {},
     classes: nil, width: false, align: false, valign: false, wrap: nil, th_html: false,
-    filter_html: false, filter: true, sortable: true, format: nil, map: true, cell_style: {},
+    filter_html: false, filter_label: nil, filter: true, sortable: true, format: nil, map: true, cell_style: {},
     header_style: {},
     &block)
     raise 'give a block to action column' unless block_given?
     @table_columns ||= []
     table_column_options = {classes: classes, width: width, align: align, valign: valign, wrap: wrap,
-      th_html: th_html, filter_html: filter_html, filter: filter, sortable: sortable,
+      th_html: th_html, filter_html: filter_html, filter_label: filter_label, filter: filter, sortable: sortable,
       format: format, map: map, cell_style: cell_style, header_style: header_style
     }.merge(table_column_options)
     table_column = Tabulatr::Renderer::Action.from(

data/lib/tabulatr/data/filtering.rb

@@ -67,7 +67,7 @@ module Tabulatr::Data::Filtering
 
   def apply_condition(n,v)
     if ['true', 'false'].include?(v)
-      @relation = @relation.where(:"#{n.filter_sql}" => Tabulatr::Utility.string_to_boolean(v))
+      @relation = @relation.where("#{n.filter_sql} = ?", Tabulatr::Utility.string_to_boolean(v))
     elsif v.is_a?(String)
       apply_string_condition("#{n.filter_sql} = ?", v)
     elsif v.is_a?(Hash)

data/lib/tabulatr/renderer/column.rb

@@ -25,7 +25,7 @@ class Tabulatr::Renderer::Column
   include ActiveModel::Model
 
   attr_accessor *%i{name header width align valign wrap type th_html filter_html
-    filter filter_width range_filter_symbol
+    filter_label filter filter_width range_filter_symbol
     sortable table_name block klass format map classes cell_style header_style
     sort_sql filter_sql output}
 
@@ -40,6 +40,7 @@ class Tabulatr::Renderer::Column
     wrap: nil,
     th_html: false,
     filter_html: false,
+    filter_label: nil,
     filter: true,
     sortable: true,
     format: nil,
@@ -62,6 +63,7 @@ class Tabulatr::Renderer::Column
       wrap: wrap,
       th_html: th_html,
       filter_html: filter_html,
+      filter_label: filter_label,
       filter: filter,
       sortable: sortable,
       format: format,
@@ -85,6 +87,7 @@ class Tabulatr::Renderer::Column
     self.wrap = hash[:wrap] || self.wrap
     self.th_html = hash[:th_html] || self.th_html
     self.filter_html = hash[:filter_html] || self.filter_html
+    self.filter_label = hash[:filter_label] || self.filter_label
     self.filter = hash[:filter] || self.filter
     self.sortable = hash[:sortable] || self.sortable
     self.format = hash[:format] || self.format

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.9.12"
+  VERSION = "0.9.13"
 end

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

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Tabulatr::Data::DSL do
+  class DummySpecClass
+    extend Tabulatr::Data::DSL
+  end
+
+  before(:each) do
+    DummySpecClass.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
+      expect(table_column.filter_sql).to match(/\"products\".\"active\"/)
+      expect(table_column.sort_sql).to match(/\"products\".\"active\"/)
+    end
+  end
+
+  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
+      expect(table_column.filter_sql).to match(/\"vendors\".\"name\"/)
+      expect(table_column.sort_sql).to match(/\"vendors\".\"name\"/)
+    end
+  end
+end

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Tabulatr::Renderer do
 
   def double_view
-    view = double(controller: double(controller_name: 'products', action_name: 'index'))
+    view = double(controller: double(controller_name: 'products', action_name: 'index'), render: '')
     view.instance_variable_set('@_tabulatr_table_index', 0)
     view
   end
@@ -24,4 +24,14 @@ describe Tabulatr::Renderer do
       expect(renderer.instance_variable_get('@table_options')[:persistent]).to eq true
     end
   end
+
+  describe '#build_table' do
+    it 'gets columns by their names' do
+      renderer = Tabulatr::Renderer.new(Product, double_view)
+      renderer.build_table(['_buttons'], 'ProductTabulatrData')
+      columns = renderer.instance_variable_get('@columns')
+      expect(columns.count).to be(1)
+      expect(columns.first).to be_instance_of(Tabulatr::Renderer::Buttons)
+    end
+  end
 end

data/tabulatr.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 
 
   s.add_runtime_dependency('rails', '~> 4.0')
-  s.add_dependency('slim', '~> 2.0.0', '>= 2.0.0')
+  s.add_dependency('slim', '~> 2.0')
   s.add_dependency('tilt', '~> 1.4', '>= 1.4.1')
   s.add_dependency('font-awesome-rails', '~> 4.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -32,20 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -213,6 +207,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/features/tabulatrs_spec.rb
 - spec/lib/tabulatr/data/data_spec.rb
+- spec/lib/tabulatr/data/dsl_spec.rb
 - spec/lib/tabulatr/data/filtering_spec.rb
 - spec/lib/tabulatr/data/formatting_spec.rb
 - spec/lib/tabulatr/data/pagination_spec.rb
@@ -311,6 +306,7 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/features/tabulatrs_spec.rb
 - spec/lib/tabulatr/data/data_spec.rb
+- spec/lib/tabulatr/data/dsl_spec.rb
 - spec/lib/tabulatr/data/filtering_spec.rb
 - spec/lib/tabulatr/data/formatting_spec.rb
 - spec/lib/tabulatr/data/pagination_spec.rb