Rename filter option of table_for to filters

This needs to be done to not conceal the `table_option` also named `filter`.

fixes #44

CHANGELOG.md

@@ -1,3 +1,7 @@
+## UNRELEASED
+  * Rename `filter` option of `table_for` to `filters` to not conceal the
+    `table_option` also named `filter`.
+
 ## 0.9.20
   * Add `filter` to DSL to define custom filters
 

lib/tabulatr/rails/action_view.rb

@@ -23,9 +23,9 @@
 
 class ActionView::Base
   # render the table in a view
-  def table_for(klass, columns: [], filter: [], tabulatr_data_class: nil, **opts, &block)
+  def table_for(klass, columns: [], filters: [], tabulatr_data_class: nil, **opts, &block)
     @_tabulatr_table_index += 1
-    Tabulatr::Renderer.build_table(klass, self, opts, columns, filter, tabulatr_data_class, &block)
+    Tabulatr::Renderer.build_table(klass, self, opts, columns, filters, tabulatr_data_class, &block)
   end
 
   def static_table_for(records, opts={}, &block)

lib/tabulatr/renderer/renderer.rb

@@ -131,12 +131,14 @@ def get_data_class(name = '')
   def set_columns_and_filters(data_class, columns, filters, &block)
     if block_given?
       @columns = ColumnsFromBlock.process(@klass, data_class, &block).columns
-    elsif columns.any? || filters.any?
+    elsif columns.any?
       @columns = get_requested_columns(data_class.table_columns, columns)
-      @filters = get_requested_filters(data_class.filters, filters)
     else
       @columns = data_class.table_columns
     end
+    if filters && filters.any?
+      @filters = get_requested_filters(data_class.filters, filters)
+    end
   end
 
 end

spec/dummy/app/controllers/products_controller.rb

@@ -53,4 +53,8 @@ def local_storage
       raise e
     end
   end
+
+  def without_filters
+    tabulatr_for Product
+  end
 end

spec/dummy/app/views/products/without_filters.html.erb

@@ -0,0 +1 @@
+<%= table_for Product, filter: false %>

spec/dummy/config/routes.rb

@@ -10,6 +10,7 @@
       get :implicit_columns
       get :with_styling
       get :local_storage
+      get :without_filters
     end
   end
 

spec/features/tabulatrs_spec.rb

@@ -153,6 +153,11 @@
       expect(page).to have_selector('td[data-tabulatr-column-name="vendor:name"]', text: @vendor2.name)
     end
 
+    scenario "without filters", js: true do
+      visit without_filters_products_path
+      expect(page).to have_no_content('Filter')
+    end
+
     scenario "filters with range", js: true do
       n = names.length
       Product.create!([{title: 'foo', price: 5}, {title: 'bar', price: 17}])

spec/lib/tabulatr/renderer/renderer_spec.rb

@@ -45,5 +45,13 @@ def double_view
       filters = renderer.instance_variable_get('@filters')
       expect(filters.map(&:name)).to match_array([:simple_filter])
     end
+
+    it 'renders no custom filters if `filters` option is false' do
+      allow_any_instance_of(Tabulatr::Data).to receive(:table_columns).and_return([])
+      renderer = Tabulatr::Renderer.new(Product, double_view)
+      renderer.build_table([], false, 'FakeRendererSpecTabulatrData')
+      filters = renderer.instance_variable_get('@filters')
+      expect(filters).to be_nil
+    end
   end
 end