tabulatr2 0.9.16 → 0.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b70faeab636c745520f3c94de294232af0540e1d
-  data.tar.gz: b3feca6e1aeabdf69b5b5ada582b2a6a91834957
+  metadata.gz: 28a75cdd6eebb48110ace894527bd211edb4bec0
+  data.tar.gz: 6d553772fe2733c6e6f129ce5f05296d0fbeb520
 SHA512:
-  metadata.gz: 44a287bc0b2493272e229cf0646b3829a2c9f79424e8ca5a5e1717531cb56bd9349774c4b69139b6423c672dfd3f04e180687e3a9399706d6e3ce8e47cf68ab0
-  data.tar.gz: 30052dc24ecf51e7975bd54fd5adcf75d1cbea36295bb1b100fc070fbffdda79cacd01a07defe1f91d98ae84dafa91caaeccc813cea0d538f50f98a365cf7d21
+  metadata.gz: 677da86fdeedcbab796ba3904e5e27e34d881ac3f8b38d954b49143dc7635c513af0a4186eb3f4f45757466b21b1c3cf1d7ecad690d54e4ecb445a4ada400101
+  data.tar.gz: a14ec3f70fe10b9ea241f8c608d78b39dbb7f89b57e3386a77a979c1ad13e11acfe6a7485d221b591dc65567432c5e26e0054ed5d31b25e62b3dedc924c1aec3

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.9.17
+ * If a batch action is executed without checking any rows it
+   will be applied to all rows in the current filter
+
+ * Add filter `enum_multiselect`
+
+   Example:
+   ```
+   column :status, filter: :enum_multiselect
+   ```
+
+## 0.9.16
+   Adds `paginate` as config option
+
 ## 0.9.15
  * Adds filter support for `enum`
    If it detects an enum it creates a dropdown filter with the possible enum

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

@@ -256,7 +256,14 @@ Tabulatr.prototype = {
     var form_array = $('.tabulatr_filter_form[data-table="'+ this.id +'"]')
       .find('input:visible,select:visible,input[type=hidden]').serializeArray();
     for(var i = 0; i < form_array.length; i++){
-      hash[form_array[i].name] = form_array[i].value;
+      if(hash[form_array[i].name] !== undefined){
+        if(!Array.isArray(hash[form_array[i].name])){
+          hash[form_array[i].name] = [hash[form_array[i].name]];
+        }
+        hash[form_array[i].name].push(form_array[i].value);
+      }else{
+        hash[form_array[i].name] = form_array[i].value;
+      }
     }
     return hash;
   },
@@ -347,15 +354,21 @@ $(document).on('ready page:load', function(){
     var params = {page: 1};
     params[name] = key;
     params.tabulatr_checked = {checked_ids: jQuery.map($('#'+ tableId +' .tabulatr-checkbox:checked'), function(el){return $(el).val();}).join(',')};
-    $('.tabulatr_mark_all[data-table='+ tableId +']').prop('indeterminate', false).prop('checked', false);
-    $('#'+ tableId +' .tabulatr-wrench').addClass('disabled');
-    var table_obj;
-    for(var i = 0; i < tabulatr_tables.length; i++){
-      if(tabulatr_tables[i].id === tableId){
-        table_obj = tabulatr_tables[i];
+    var confirmation = true;
+    if(params.tabulatr_checked.checked_ids == ''){
+      confirmation = confirm(a.parents('ul').data('confirm-text'));
+    }
+    if(confirmation){
+      $('.tabulatr_mark_all[data-table='+ tableId +']').prop('indeterminate', false).prop('checked', false);
+      $('#'+ tableId +' .tabulatr-wrench').addClass('disabled');
+      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(params, true);
     }
-    table_obj.updateTable(params, true);
   });
 
   $('form.tabulatr-fuzzy-search').submit(function(){

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

@@ -25,7 +25,7 @@
     a.btn.btn-default data-toggle="dropdown" href="#"
       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"
+    ul.dropdown-menu role="menu" aria-labelledby="dLabel" data-confirm-text=t('tabulatr.batch_confirm_text')
       - table_options[:batch_actions].each do |key, label|
         li
           = link_to label, '#', class: "batch-action-inputs", data: { \

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

@@ -66,7 +66,7 @@
                           [t('tabulatr.boolean_filter.no'), "false"],
                           [t('tabulatr.boolean_filter.yes'), "true"]] \
                         ), class: 'form-control no-chosen')
-                  - elsif column.filter == :exact
+                  - elsif [:exact, :integer, :decimal].member? column.filter
                     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"
@@ -94,5 +94,12 @@
                       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
+                  - elsif column.filter == :enum_multiselect
+                    - column.klass.try(column.name.to_s.pluralize.to_sym).each do |key, value|
+                      .row
+                        .col-xs-2
+                          = check_box_tag "#{iname}[]", value, true, {id: "check_box_#{key}"}
+                        .col-xs-10
+                          = label_tag "check_box_#{key}", key
                   - else
                     input.tabulatr_filter.form-control type="text" data-tabulatr-attribute="#{name}" name="#{iname}[like]"

data/lib/tabulatr/data/data.rb

@@ -43,7 +43,6 @@ class Tabulatr::Data
 
     @batch_actions = block if block_given?
 
-    execute_batch_actions(batch_params(params), check_params(params))
 
     # count
     total = @relation.count
@@ -54,11 +53,11 @@ class Tabulatr::Data
     apply_sorting(sort_params params)
     join_required_tables(params)
 
+    execute_batch_actions(batch_params(params), check_params(params))
+
     pagination = compute_pagination(params[:page], params[:pagesize])
     apply_pagination(pagination.slice(:offset, :pagesize))
 
-    # TODO: batch actions and checked ids
-
     # get the records
     found = apply_formats(locals: locals, controller: controller)
 
@@ -87,6 +86,7 @@ class Tabulatr::Data
   def execute_batch_actions batch_param, selected_ids
     if batch_param.present? && @batch_actions.present?
       batch_param = batch_param.keys.first.to_sym if batch_param.is_a?(Hash)
+      selected_ids = @relation.map(&:id) if selected_ids.empty?
       @batch_actions.yield(Invoker.new(batch_param, selected_ids))
     end
   end
@@ -115,11 +115,13 @@ class Tabulatr::Data
   end
 
   def join_required_tables(params)
-    tt = (params[:arguments].split(",").select{|s| s[':']}.map do |s|
-          s.split(':').first
-        end.uniq.map(&:to_sym))
-    tt.delete(@table_name.to_sym)
-    @includes = @includes + tt
+    if params[:arguments].present?
+      tt = (params[:arguments].split(",").select{|s| s[':']}.map do |s|
+            s.split(':').first
+          end.uniq.map(&:to_sym))
+      tt.delete(@table_name.to_sym)
+      @includes = @includes + tt
+    end
     # @relation = @relation.includes(@includes.map(&:to_sym)).references(@includes.map(&:to_sym))
     @relation = @relation.eager_load(@includes.map(&:to_sym))
     # @relation = @relation.group("#{@table_name}.#{@base.primary_key}")

data/lib/tabulatr/data/filtering.rb

@@ -66,19 +66,25 @@ module Tabulatr::Data::Filtering
   end
 
   def apply_condition(n,v)
-    if ['true', 'false'].include?(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)
-      apply_hash_condition(n, v)
-    else
-      raise "Wrong filter type: #{v.class}"
+    case n.filter
+    when :checkbox then apply_boolean_condition(n, v)
+    when :decimal  then apply_string_condition("#{n.filter_sql} = ?", v.to_f)
+    when :integer  then apply_string_condition("#{n.filter_sql} = ?", v.to_i)
+    when :enum     then apply_string_condition("#{n.filter_sql} = ?", v.to_i)
+    when :enum_multiselect then apply_array_condition(n, v)
+    when :exact    then apply_string_condition("#{n.filter_sql} = ?", v)
+    when :like     then apply_like_condition(n, v[:like])
+    when :date     then apply_date_condition(n, v[:date])
+    when :range    then apply_range_condition(n, v)
+    else raise "Wrong filter type for #{n.name}: #{n.filter}"
     end
   end
 
+  def apply_boolean_condition(n, value)
+    @relation = @relation.where("#{n.filter_sql} = ?", Tabulatr::Utility.string_to_boolean(value))
+  end
+
   def apply_date_condition(n, cond)
-    return unless cond.present?
     today = Date.today
     case cond[:simple]
     when 'none' then return
@@ -112,14 +118,20 @@ module Tabulatr::Data::Filtering
      @relation = @relation.where(replacement_string, value) if value.present?
   end
 
-  def apply_hash_condition(column_name, hash)
+  def apply_like_condition(column_name, value)
     like ||= Tabulatr::Utility.like_statement
-    apply_string_condition("#{column_name.filter_sql} #{like} ?", "%#{hash[:like]}%") if hash[:like].present?
-    apply_date_condition(column_name, hash[:date])
+    apply_string_condition("#{column_name.filter_sql} #{like} ?", "%#{value}%") if value.present?
+  end
+
+  def apply_range_condition(column_name, hash)
     apply_string_condition("#{column_name.filter_sql} >= ?", "#{hash[:from]}")
     apply_string_condition("#{column_name.filter_sql} <= ?", "#{hash[:to]}")
   end
 
+  def apply_array_condition(column, value)
+    @relation = @relation.where(column.table_name => { column.name => value })
+  end
+
   private
 
   def execute_provided_search_block!(query)

data/lib/tabulatr/renderer/column.rb

@@ -180,19 +180,21 @@ class Tabulatr::Renderer::Column
   end
 
   def determine_appropriate_filter!
-    case self.klass.columns_hash[self.name.to_s].try(:type)
-    when :integer, :float, :decimal
+    typ = self.klass.columns_hash[self.name.to_s].try(:type).try(:to_sym)
+    case typ
+    when :integer
       if self.klass.respond_to?(:defined_enums) && self.klass.defined_enums.keys.include?(self.name.to_s)
         self.filter = :enum
       else
-        self.filter = :exact
+        self.filter = :integer
       end
-    when :string, :text
-      self.filter = :like
-    when :date, :time, :datetime, :timestamp
-      self.filter = :date
-    when :boolean
-      self.filter = :checkbox
+    when :enum then self.filter = :enum
+    when :float, :decimal then self.filter = :decimal
+    when :string, :text then self.filter = :like
+    when :date, :time, :datetime, :timestamp then self.filter = :date
+    when :boolean then self.filter = :checkbox
+    when nil then self.filter = :exact
+    else raise "Unknown filter type for #{self.name}: »#{typ}«"
     end
   end
 

data/lib/tabulatr/renderer/renderer.rb

@@ -24,15 +24,15 @@
 class Tabulatr::Renderer
 
   def initialize(klass, view,
-      filter: true,          # false for no filter row at all
-      search: true,          # show fuzzy search field
-      paginate: false,       # true to show paginator
-      pagesize: 20,          # default pagesize
-      sortable: true,        # true to allow sorting (can be specified for every sortable column)
-      batch_actions: false,  # :name => value hash of batch action stuff
-      footer_content: false, # if given, add a <%= content_for <footer_content> %> before the </table>
-      path: '#',             # where to send the AJAX-requests to
-      order_by: nil,         # default order
+      filter: true,                 # false for no filter row at all
+      search: true,                 # show fuzzy search field
+      paginate: Tabulatr.paginate,  # true to show paginator
+      pagesize: 20,                 # default pagesize
+      sortable: true,               # true to allow sorting (can be specified for every sortable column)
+      batch_actions: false,         # :name => value hash of batch action stuff
+      footer_content: false,        # if given, add a <%= content_for <footer_content> %> before the </table>
+      path: '#',                    # where to send the AJAX-requests to
+      order_by: nil,                # default order
       html_class: '',
       pagination_position: :top,
       counter_position: :top,

data/lib/tabulatr/version.rb

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

data/lib/tabulatr.rb

@@ -27,8 +27,10 @@ module Tabulatr
   end
 
   mattr_accessor :spinner
+  mattr_accessor :paginate
 
-  self.spinner = :standard
+  self.spinner  = :standard
+  self.paginate = false
 end
 
 require 'tabulatr/engine'
@@ -64,4 +66,3 @@ end
 Dir[File.join(File.dirname(__FILE__), "tabulatr", "renderer", "*.rb")].each do |file|
   require file
 end
-

data/spec/dummy/config/environments/production.rb

@@ -20,7 +20,7 @@ Dummy::Application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/spec/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.

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

@@ -21,6 +21,7 @@ en:
       'no': No
     enum_filter:
       none: ''
+    batch_confirm_text: This action will be applied to all rows within the current filter
 de:
   tabulatr:
     rows_per_page: 'Ergebnisse pro Seite'
@@ -44,3 +45,4 @@ de:
       'no': Nein
     enum_filter:
       none: ''
+    batch_confirm_text: Diese Aktion wird auf allen Datensätzen im aktuallen Filter ausgeführt

data/spec/features/tabulatrs_spec.rb

@@ -294,6 +294,18 @@ feature "Tabulatr" do
       end
       expect(page).to have_css(".tabulatr_table tbody tr", count: 1)
     end
+
+    scenario 'executes the action for all items if nothing selected' do
+      product1 = Product.create!(:title => names[0], :active => true, :price => 10.0)
+      product2 = Product.create!(:title => names[1], :active => true, :price => 10.0)
+      product3 = Product.create!(:title => names[2], :active => false, :price => 10.0)
+      visit with_batch_actions_products_path
+      find('.tabulatr-batch-actions-menu-wrapper a').click
+      within('.dropdown.open') do
+        click_link 'Delete'
+      end
+      expect(page).to have_css('.tabulatr_table tbody tr', count: 0)
+    end
   end
 
   feature "Column options", js: true do

data/spec/lib/tabulatr/data/data_spec.rb

@@ -33,6 +33,20 @@ describe Tabulatr::Data do
       expect(r[:products][:title]).to eql titles[ix]
     end
   end
+
+  it 'invokes the batch actions invoker with all ids if no row is selected' do
+    Product.create([{title: 'foo', price: 5, active: true}, {title: 'bar', price: 10, active: false}, {title: 'fuzz', price: 7, active: true}])
+
+    td = Tabulatr::Data.new(Product.where(active: true))
+    td.instance_variable_set(:@batch_actions, ->(batch_actions){
+      batch_actions.delete do |ids|
+        Product.where(id: ids).destroy_all
+      end
+    })
+    td.data_for_table(HashWithIndifferentAccess.new(example_params.merge(product_batch: 'delete', 'tabulatr_checked' => {'checked_ids' => ''})))
+    expect(Product.where(active: true).count).to be 0
+    expect(Product.count).to be 1
+  end
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.9.17
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -267,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A tight DSL to build tables of ActiveRecord models with sorting, pagination,