tabulatr2 0.9.19 → 0.9.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3b655c03dcf50a82e78181d23282b2c0c8d31fe
-  data.tar.gz: 1daac9cd6c31ed0d526179e20780916fbc1709be
+  metadata.gz: 8628bfd7be6d2d9e801984acaeef9057dd98aa24
+  data.tar.gz: 07d356b31c00175e286fdb09d84681ec71a41492
 SHA512:
-  metadata.gz: 07c7126020999c9f651d2175dd5ec39551eec36b512171179b16cd4df4a0acfa3ea92bbb4ab34cd9cab4bd408802a2fca572044b49bf1653c1a396ff491e7a26
-  data.tar.gz: 09f281504e5977518598b273656f022ba624e4556801c2261862bc16b031b204734f27db727bc8e2855f396ddedb39808e08fd91350d459e4b1ed5908a28b49f
+  metadata.gz: 7c313558231faee3dbbe107378401c04e517aba77caafd879b03f2104ef77dcdc7df50516fe01e078f801f3ad158185f8a8603bde668cb41f308b926de5b9d04
+  data.tar.gz: e4835fbbb8ed8be42acf6ffde94deb2d3b8e8ba0e4e2948c4ef15002a0fa2534a9f560570c3f753a822def719e35b2b82bcaddd8a3eeb7d1160369bc0d24a49e

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.9.20
+  * Add `filter` to DSL to define custom filters
+
+    Example:
+    ```
+    filter :product_price_range do |relation, value|
+      relation = relation.joins(:products)
+      if value == 'low'
+        relation.group("vendors.id").having('AVG(products.price) <= 100')
+      elsif value == 'high'
+        relation.group("vendors.id").having('AVG(products.price) > 100')
+      end
+    end
+    ```
+ * Add `current_user` local to Tabulatr::Data by default if available
+   and not already present
+
 ## 0.9.17
  * If a batch action is executed without checking any rows it
    will be applied to all rows in the current filter

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 gem 'jquery-rails'
 
-group :development do
+group :development, :test do
   gem 'better_errors'
   gem 'binding_of_caller', platforms: :ruby
 end

data/README.md

@@ -184,6 +184,44 @@ class UserTabulatrData < Tabulatr::Data
 end
 ```
 
+### Custom filters
+
+You're also able to create custom filters with the `filter` method to create more advanced
+filters which are independent of the displayed columns.
+
+```ruby
+class UserTabulatrData < Tabulatr::Data
+  filter :age_range do |relation, value|
+    if value == 'upto_18'
+      relation.where("birthday > ?", Date.today-18.years)
+    elsif value == 'over_18'
+      relation.where("birthday <= ?", Date.today-18.years)
+    end
+  end
+end
+```
+
+This code will look for a partial to render in `tabulatr/filter/_age_range.*`.
+You can override this path by specifying the `partial` argument of the `filter` method.
+It will call it's block with the ActiveRecord::Relation and the submitted value after
+the user submits the filter form.
+
+```erb
+# tabulatr/filter/_age_range.html.erb
+
+<div class='form-group'>
+  <label class='control-label' for="<%= input_id %>">Age range</label>
+  <select id="<%= input_id %>" name="<%= input_name %>">
+    <option value=''>None</option>
+    <option value='upto_18'>0 - 17</option>
+    <option value='over_18'>18+</option>
+  </select>
+</div>
+```
+
+As you can see there are two locales defined which should be used for your custom form
+field: `input_name` and `input_id`
+
 ### Row formatting
 
 To provide row specific HTML-Attributes call `row`:

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

@@ -19,8 +19,8 @@ $(function(){
         elem = $('[name="'+ objKeys[i] +'"]');
         if(elem.length > 0){
           var val = currentStorage[objKeys[i]];
-          elem.val(val);
-          formParent = elem.parents('.form-group[data-filter-column-name]');
+          elem.val(val).trigger('change');
+          formParent = elem.parents('.tabulatr-filter-row');
           if(formParent.length > 0 && val && val.length > 0){
             $('.tabulatr-outer-wrapper[data-table-id="'+this.id+'"]').addClass('filtered')
           }
@@ -34,7 +34,7 @@ $(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]').find('input[type=text], input[type=hidden], select').val('');
+    $('.tabulatr_filter_form[data-table="'+ this.id +'"]').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/views/tabulatr/_tabulatr_filter_dialog.html.slim

@@ -103,3 +103,8 @@
                           = label_tag "check_box_#{key}", key
                   - else
                     input.tabulatr_filter.form-control type="text" data-tabulatr-attribute="#{name}" name="#{iname}[like]"
+        - filter.each do |f|
+          .row.tabulatr-filter-row
+            .col-xs-12
+              = render f.to_partial_path, {input_name: "#{formatted_name}_filter[#{f.name}]",
+                                            input_id: "#{formatted_name}_#{f.name}"}

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

@@ -21,7 +21,7 @@
 
 - opts = { columns: columns, table_options: table_options, \
     klass: klass, classname: classname, table_id: table_id,
-    formatted_name: formatted_name }
+    formatted_name: formatted_name, filter: filter }
 
 .row.tabulatr-outer-wrapper data-table-id=table_id
   .tabulatr-filter-col data-table-id=table_id

data/lib/tabulatr/data/data.rb

@@ -95,6 +95,10 @@ class Tabulatr::Data
     self.class.instance_variable_get("@table_columns")
   end
 
+  def filters
+    self.class.instance_variable_get('@filters')
+  end
+
   def search?
     self.class.instance_variable_get('@search')
   end

data/lib/tabulatr/data/dsl.rb

@@ -157,6 +157,11 @@ module Tabulatr::Data::DSL
     @row = block
   end
 
+  def filter(name, partial: nil, &block)
+    @filters ||= []
+    @filters << Tabulatr::Renderer::Filter.new(name, partial: partial, &block)
+  end
+
 end
 
 Tabulatr::Data.send :extend, Tabulatr::Data::DSL

data/lib/tabulatr/data/filtering.rb

@@ -45,12 +45,13 @@ module Tabulatr::Data::Filtering
     return unless filter_params
     assoc_filters = filter_params.delete :__association
     apply_association_filters(assoc_filters) if assoc_filters.present?
-    filter_params.each do |filter|
-      name, value = filter
+    filter_params.each do |param|
+      name, value = param
       next unless value.present?
 
       table_name, method_name = name.split(':').map(&:to_sym)
       column = table_columns.find{|c| c.table_name == table_name && c.name == method_name}
+      column = filters.find{|f| f.name.to_sym == name.to_sym} if column.nil?
       apply_condition(column, value)
     end
   end
@@ -78,6 +79,7 @@ module Tabulatr::Data::Filtering
     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)
+    when :custom   then apply_custom_filter(n, v)
     else raise "Wrong filter type for #{n.name}: #{n.filter}"
     end
   end
@@ -134,6 +136,11 @@ module Tabulatr::Data::Filtering
     @relation = @relation.where(column.table_name => { column.name => value })
   end
 
+  def apply_custom_filter(filter, value)
+    filter_result = filter.block.(@relation, value)
+    handle_search_result(filter_result)
+  end
+
   private
 
   def execute_provided_search_block!(query)

data/lib/tabulatr/data/pagination.rb

@@ -28,7 +28,7 @@ module Tabulatr::Data::Pagination
   end
 
   def compute_pagination(page, pagesize)
-    count = @relation.count
+    count = @relation.to_a.size
     page ||= 1
     pagesize, page = pagesize.to_i, page.to_i
 

data/lib/tabulatr/rails/action_controller.rb

@@ -30,6 +30,7 @@ class ActionController::Base
     klass = relation.respond_to?(:klass) ? relation.klass : relation
     respond_to do |format|
       format.json {
+        locals[:current_user] ||= current_user if respond_to?(:current_user)
         records = klass.tabulatr(relation, tabulatr_data_class).data_for_table(params, locals: locals, controller: self, &block)
         render json: records.to_tabulatr_json(serializer)
         records

data/lib/tabulatr/rails/action_view.rb

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

data/lib/tabulatr/renderer/columns_from_block.rb

@@ -23,12 +23,13 @@
 
 class Tabulatr::Renderer
   class ColumnsFromBlock
-    attr_accessor :columns, :klass, :table_data
+    attr_accessor :columns, :klass, :table_data, :filters
 
     def initialize(klass, table_data_object)
       @klass = klass
       @table_data = table_data_object
       @columns ||= []
+      @filters ||= []
     end
 
     def column(name, opts={}, &block)
@@ -65,11 +66,19 @@ class Tabulatr::Renderer
       @columns << Buttons.from(opts.merge(klass: klass, filter: false, sortable: false, output: output), &block)
     end
 
+    def filter(name, partial: nil, &block)
+      if table_data
+        found_filter = fetch_filter_from_table_data(name)
+        @filters << found_filter if found_filter.present?
+      else
+        @filters << Tabulatr::Renderer::Filter.new(name, partial: partial, &block)
+      end
+    end
+
     def self.process(klass, table_data_object = nil, &block)
       i = self.new(klass, table_data_object)
       yield(i)
-      c = i.columns
-      c
+      i
     end
 
     private
@@ -78,5 +87,9 @@ class Tabulatr::Renderer
       column = table_data.table_columns.find{|tc| tc.table_name == table_name && tc.name == name}
       column.update_options(opts, &block)
     end
+
+    def fetch_filter_from_table_data name
+      table_data.filters.find{|f| f.name.to_sym == name.to_sym}
+    end
   end
 end

data/lib/tabulatr/renderer/filter.rb

@@ -0,0 +1,22 @@
+class Tabulatr::Renderer::Filter
+
+  attr_accessor :name, :partial, :block
+
+  def initialize(name, partial: nil, &block)
+    @name = name
+    @block = block
+    @partial = partial
+  end
+
+  def filter
+    :custom
+  end
+
+  def to_partial_path
+    if partial.present?
+      partial
+    else
+      "tabulatr/filter/#{name.to_s.downcase.underscore}"
+    end
+  end
+end

data/lib/tabulatr/renderer/renderer.rb

@@ -57,16 +57,17 @@ class Tabulatr::Renderer
     @classname = @klass.name.underscore
   end
 
-  def build_table(columns, tabulatr_data_class, &block)
+  def build_table(columns, filters, tabulatr_data_class, &block)
     if tabulatr_data_class.present?
       tdc = tabulatr_data_class.constantize.new(@klass)
     else
       tdc = "#{@klass.name}TabulatrData".constantize.new(@klass)
     end
     if block_given?
-      @columns = ColumnsFromBlock.process @klass, tdc, &block
-    elsif columns.any?
+      @columns = ColumnsFromBlock.process(@klass, tdc, &block).columns
+    elsif columns.any? || filters.any?
       @columns = get_requested_columns(tdc.table_columns, columns)
+      @filters = get_requested_filters(tdc.filters, filters)
     else
       @columns = tdc.table_columns
     end
@@ -77,12 +78,13 @@ class Tabulatr::Renderer
       classname: @classname,
       tabulatr_data: tdc,
       table_id: generate_id,
-      formatted_name: Tabulatr::Utility.formatted_name(@klass.name)
+      formatted_name: Tabulatr::Utility.formatted_name(@klass.name),
+      filter: tdc.filters || []
     })
   end
 
   def build_static_table(records, &block)
-    @columns = ColumnsFromBlock.process @klass, &block
+    @columns = ColumnsFromBlock.process(@klass, &block).columns
 
     @view.render(partial: '/tabulatr/tabulatr_static_table', locals: {
       columns: @columns,
@@ -103,8 +105,8 @@ class Tabulatr::Renderer
     new(klass, view, toptions).build_static_table(records, &block)
   end
 
-  def self.build_table(klass, view, toptions={}, columns, tabulatr_data_class, &block)
-    new(klass, view, toptions).build_table(columns, tabulatr_data_class, &block)
+  def self.build_table(klass, view, toptions={}, columns, filters, tabulatr_data_class, &block)
+    new(klass, view, toptions).build_table(columns, filters, tabulatr_data_class, &block)
   end
 
   private
@@ -121,6 +123,13 @@ class Tabulatr::Renderer
     end.flatten
   end
 
+  def get_requested_filters(available_filters, requested_filters)
+    requested_filters.collect do |f|
+      result = available_filters.find{|filter| filter.name.to_sym == f.to_sym }
+      result or raise "Can't find filter '#{f}'"
+    end.flatten
+  end
+
 end
 
 require_relative './column'
@@ -129,3 +138,4 @@ require_relative './action'
 require_relative './buttons'
 require_relative './checkbox'
 require_relative './columns_from_block'
+require_relative './filter'

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.9.19"
+  VERSION = "0.9.20"
 end

data/spec/controller/application_controller_spec.rb

@@ -0,0 +1,34 @@
+require 'rails_helper'
+
+# RSpec.configure do |c|
+#   c.infer_base_class_for_anonymous_controllers = false
+# end
+
+describe ApplicationController, type: :controller do
+  controller do
+    def index
+      tabulatr_for Product
+    end
+
+    def current_user
+      "Han Solo"
+    end
+  end
+
+  describe "passing locales to Tabulatr::Data" do
+    it "implicitly creates a current_user local if not already present" do
+      request.accept = "application/json"
+      Product.create!(:title => 'bar', :active => true, :price => 10.0)
+      fake_response = double({foo: 'bar'})
+
+      expect_any_instance_of(Tabulatr::Data).to receive(:data_for_table).with(
+        {"pagesize"=>"20", "arguments"=>"products:title", "controller"=>"anonymous", "action"=>"index"},
+        {:locals=>{current_user: "Han Solo"}, controller: controller}
+      ).and_return(fake_response)
+      expect(fake_response).to receive(:to_tabulatr_json).and_return({})
+
+      get :index, pagesize: 20, arguments: 'products:title'
+      expect(response.code).to eq '200'
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+class VendorTabulatrData < Tabulatr::Data
+
+  column :name
+  column :url
+  column :active
+
+  filter :product_price_range do |relation, value|
+    relation = relation.joins(:products)
+    if value == 'low'
+      relation.group("vendors.id").having('AVG(products.price) <= 100')
+    elsif value == 'high'
+      relation.group("vendors.id").having('AVG(products.price) > 100')
+    end
+  end
+end

data/spec/dummy/app/views/tabulatr/filter/_product_price_range.html.slim

@@ -0,0 +1,9 @@
+.form-group.control-group
+  label.control-label for=input_id Price range (avg.)
+
+  select.form-control.no-chosen id=input_id name=input_name
+    option= I18n.t("tabulatr.date_filter.none")
+    option value="low"
+      | <= 100 Euro
+    option value="high"
+      | > 100 Euro

data/spec/dummy/app/views/vendors/index.html.slim

@@ -0,0 +1 @@
+= table_for Vendor, paginate: true

data/spec/features/tabulatrs_spec.rb

@@ -215,6 +215,24 @@ feature "Tabulatr" do
       expect(page).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')
     end
+
+    scenario 'custom filters', js: true do
+      Product.create!([{title: 'foo', price: 7.5, vendor: @vendor1}, {title: 'bar', price: 90, vendor: @vendor1}])
+      Product.create!([{title: 'baz', price: 125, vendor: @vendor2}, {title: 'fubar', price: 133.3, vendor: @vendor2}, {title: 'fiz', price: 97, vendor: @vendor2}])
+      visit vendors_path
+      expect(page).to have_css(".tabulatr_table tbody tr", count: 2)
+      click_link 'Filter'
+      within(".tabulatr_filter_form") do
+        select("> 100 Euro", from: "vendor_filter[product_price_range]")
+      end
+      expect(page).to have_css(".tabulatr_table tbody tr", count: 1)
+      expect(page).to have_css('.tabulatr_table tbody td', text: @vendor2.name)
+      within(".tabulatr_filter_form") do
+        select("<= 100 Euro", from: "vendor_filter[product_price_range]")
+      end
+      expect(page).to have_css(".tabulatr_table tbody tr", count: 1)
+      expect(page).to have_css('.tabulatr_table tbody td', text: @vendor1.name)
+    end
   end
 
   feature "Sorting" do

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

@@ -7,11 +7,12 @@ describe Tabulatr::Data::DSL do
 
   before(:each) do
     DummyDSLClass.instance_variable_set('@table_columns', [])
+    DummyDSLClass.instance_variable_set('@filters', [])
+    allow(DummyDSLClass).to receive(:main_class).and_return(Product)
   end
 
   describe '#column' do
     it 'escapes table and column names' do
-      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\"/)
@@ -21,11 +22,28 @@ describe Tabulatr::Data::DSL do
 
   describe '#association' do
     it 'escapes table and column names' do
-      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
   end
-end
+
+  describe '#filter' do
+    it 'adds filters' do
+      DummyDSLClass.filter(:price_range)
+      expect(DummyDSLClass.instance_variable_get('@filters').map(&:name)).to match_array([:price_range])
+    end
+
+    it 'can hold multiple filters' do
+      DummyDSLClass.filter(:price_range)
+      DummyDSLClass.filter(:category_select)
+      expect(DummyDSLClass.instance_variable_get('@filters').map(&:name)).to match_array([:price_range, :category_select])
+    end
+
+    it 'accepts a partial attribute' do
+      DummyDSLClass.filter(:simple_filter, partial: 'my_custom_filter')
+      expect(DummyDSLClass.instance_variable_get('@filters').first.partial).to eq 'my_custom_filter'
+    end
+  end
+end

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

@@ -3,23 +3,28 @@ require 'rails_helper'
 describe Tabulatr::Data::Filtering do
   class DummyFilteringClass
     include Tabulatr::Data::Filtering
-  end
 
-  before(:each) do
-    @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))
-    @week_one = Product.create!(publish_at: DateTime.new(2013, 12, 30, 0, 0))
-    @week_two = Product.create!(publish_at: DateTime.new(2014, 1, 5, 8, 0))
-    @last_seven_days = Product.create!(publish_at: DateTime.new(2013, 12, 26, 0, 0))
-    @last_thirty_days = Product.create!(publish_at: DateTime.new(2013, 12, 3, 0, 0))
-    @outside_last_thirty_days = Product.create!(publish_at: DateTime.new(2013, 12, 2, 23, 59))
-    @this_month = Product.create!(publish_at: DateTime.new(2014, 1, 15, 0, 0))
-    @next_year = Product.create!(publish_at: DateTime.new(2015, 1, 1, 12, 0))
-    allow(Date).to receive(:today).and_return(Date.new(2014,1,1))
+    def table_columns; []; end
+    def filters; []; end
   end
+
   describe '.apply_date_condition' do
+    before(:each) do
+      @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))
+      @week_one = Product.create!(publish_at: DateTime.new(2013, 12, 30, 0, 0))
+      @week_two = Product.create!(publish_at: DateTime.new(2014, 1, 5, 8, 0))
+      @last_seven_days = Product.create!(publish_at: DateTime.new(2013, 12, 26, 0, 0))
+      @last_thirty_days = Product.create!(publish_at: DateTime.new(2013, 12, 3, 0, 0))
+      @outside_last_thirty_days = Product.create!(publish_at: DateTime.new(2013, 12, 2, 23, 59))
+      @this_month = Product.create!(publish_at: DateTime.new(2014, 1, 15, 0, 0))
+      @next_year = Product.create!(publish_at: DateTime.new(2015, 1, 1, 12, 0))
+      allow(Date).to receive(:today).and_return(Date.new(2014,1,1))
+    end
+
+
     it "filters for 'today'" do
       fake_obj = double(filter_sql: 'publish_at')
       @dummy.apply_date_condition(fake_obj, {simple: 'today'})
@@ -78,6 +83,12 @@ describe Tabulatr::Data::Filtering do
   end
 
   describe '.apply_search' do
+
+    before(:each) do
+      @dummy = DummyFilteringClass.new
+      @dummy.instance_variable_set('@relation', Product.all)
+    end
+
     it 'allows to alter the ActiveRecord::Relation' do
       @dummy.instance_variable_set('@search',
         ->(query, relation){ relation.joins(:vendor).where(%{vendors.name LIKE '%#{query}%'})})
@@ -110,4 +121,29 @@ describe Tabulatr::Data::Filtering do
       expect{@dummy.apply_search('test')}.to raise_error
     end
   end
+
+  describe '.apply_filters' do
+    before(:each) do
+      @dummy = DummyFilteringClass.new
+      @dummy.instance_variable_set('@relation', Product.all)
+    end
+
+    it 'applies given filters to the relation' do
+      bl = ->(relation, value){ relation.where(price: value) }
+      allow(@dummy).to receive(:filters).and_return([Tabulatr::Renderer::Filter.new(:custom_filter, &bl)])
+      matched_product = Product.create(price: 10)
+      unmatched_product = Product.create(price: 11)
+      expect{@dummy.apply_filters({'custom_filter' => '10'})}.to_not raise_error
+      result = @dummy.instance_variable_get('@relation')
+      expect(result).to match_array([matched_product])
+    end
+
+    it 'only searches for a filter if there is no column with that name' do
+      fake_column = double(table_name: :custom, name: nil)
+      allow(@dummy).to receive(:table_columns).and_return([fake_column])
+      allow(@dummy).to receive(:filters).and_return([Tabulatr::Renderer::Filter.new(:custom)])
+      expect(@dummy).to receive(:apply_condition).with(fake_column, '10')
+      @dummy.apply_filters({'custom' => '10'})
+    end
+  end
 end

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

@@ -10,7 +10,7 @@ describe Tabulatr::Data::Pagination do
   end
   describe '.compute_pagination' do
     it "computes an offset" do
-      count = double(count: 20)
+      count = (1..20).to_a
       @dummy.instance_variable_set('@relation', count)
       pagination = @dummy.compute_pagination(1, 10)
       expect(pagination[:offset]).to be 0

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

@@ -0,0 +1,21 @@
+require 'rails_helper'
+
+describe Tabulatr::Renderer::ColumnsFromBlock do
+
+  class TabulatrFakeData < Tabulatr::Data
+    filter :foo_and_bar
+    filter :not_requested_filter
+  end
+
+  describe '#filter' do
+    it 'finds filters if tabulatr_data is given' do
+      allow_any_instance_of(TabulatrFakeData).to receive(:table_columns).and_return([])
+      td = TabulatrFakeData.new(Product)
+      cfb = Tabulatr::Renderer::ColumnsFromBlock.process(Product, td) do |c|
+        c.filter :foo_and_bar
+        c.filter :not_available_filter
+      end
+      expect(cfb.filters.map(&:name)).to match_array([:foo_and_bar])
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+describe Tabulatr::Renderer::Filter do
+  describe '#to_partial_path' do
+    it 'guesses the partial_path by name if no partial is given' do
+      filter = Tabulatr::Renderer::Filter.new('dynamic_select')
+      expect(filter.to_partial_path).to eq 'tabulatr/filter/dynamic_select'
+    end
+
+    it 'uses the given partial name if given' do
+      filter = Tabulatr::Renderer::Filter.new('some_filter', partial: 'my_filters/simple_filter')
+      expect(filter.to_partial_path).to eq 'my_filters/simple_filter'
+    end
+  end
+end

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

@@ -2,6 +2,10 @@ require 'rails_helper'
 
 describe Tabulatr::Renderer do
 
+  class FakeRendererSpecTabulatrData < Tabulatr::Data
+    filter :simple_filter
+  end
+
   def double_view
     view = double(controller: double(controller_name: 'products', action_name: 'index'), render: '')
     view.instance_variable_set('@_tabulatr_table_index', 0)
@@ -28,10 +32,18 @@ describe Tabulatr::Renderer do
   describe '#build_table' do
     it 'gets columns by their names' do
       renderer = Tabulatr::Renderer.new(Product, double_view)
-      renderer.build_table(['_buttons'], 'ProductTabulatrData')
+      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
+
+    it 'gets filters by their names' do
+      allow_any_instance_of(Tabulatr::Data).to receive(:table_columns).and_return([])
+      renderer = Tabulatr::Renderer.new(Product, double_view)
+      renderer.build_table([], [:simple_filter], 'FakeRendererSpecTabulatrData')
+      filters = renderer.instance_variable_get('@filters')
+      expect(filters.map(&:name)).to match_array([:simple_filter])
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.19
+  version: 0.9.20
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -165,12 +165,14 @@ files:
 - lib/tabulatr/renderer/checkbox.rb
 - lib/tabulatr/renderer/column.rb
 - lib/tabulatr/renderer/columns_from_block.rb
+- lib/tabulatr/renderer/filter.rb
 - lib/tabulatr/renderer/renderer.rb
 - lib/tabulatr/utility/request_data_not_included_error.rb
 - lib/tabulatr/utility/unexpected_search_result_error.rb
 - lib/tabulatr/utility/utility.rb
 - lib/tabulatr/version.rb
 - lib/tabulatr2.rb
+- spec/controller/application_controller_spec.rb
 - spec/dummy/.gitignore
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
@@ -190,6 +192,7 @@ files:
 - spec/dummy/app/models/tag.rb
 - spec/dummy/app/models/vendor.rb
 - spec/dummy/app/tabulatr_data/product_tabulatr_data.rb
+- spec/dummy/app/tabulatr_data/vendor_tabulatr_data.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/products/count_tags.html.erb
 - spec/dummy/app/views/products/implicit_columns.html.erb
@@ -199,6 +202,8 @@ files:
 - spec/dummy/app/views/products/stupid_array.html.erb
 - spec/dummy/app/views/products/with_batch_actions.html.erb
 - spec/dummy/app/views/products/with_styling.html.erb
+- spec/dummy/app/views/tabulatr/filter/_product_price_range.html.slim
+- spec/dummy/app/views/vendors/index.html.slim
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -241,6 +246,8 @@ files:
 - spec/lib/tabulatr/data/sorting_spec.rb
 - spec/lib/tabulatr/json_builder_spec.rb
 - spec/lib/tabulatr/renderer/checkbox_spec.rb
+- spec/lib/tabulatr/renderer/columns_from_block_spec.rb
+- spec/lib/tabulatr/renderer/filter_spec.rb
 - spec/lib/tabulatr/renderer/renderer_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
@@ -273,6 +280,7 @@ specification_version: 4
 summary: A tight DSL to build tables of ActiveRecord models with sorting, pagination,
   finding/filtering, selecting and batch actions.
 test_files:
+- spec/controller/application_controller_spec.rb
 - spec/dummy/.gitignore
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
@@ -292,6 +300,7 @@ test_files:
 - spec/dummy/app/models/tag.rb
 - spec/dummy/app/models/vendor.rb
 - spec/dummy/app/tabulatr_data/product_tabulatr_data.rb
+- spec/dummy/app/tabulatr_data/vendor_tabulatr_data.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/products/count_tags.html.erb
 - spec/dummy/app/views/products/implicit_columns.html.erb
@@ -301,6 +310,8 @@ test_files:
 - spec/dummy/app/views/products/stupid_array.html.erb
 - spec/dummy/app/views/products/with_batch_actions.html.erb
 - spec/dummy/app/views/products/with_styling.html.erb
+- spec/dummy/app/views/tabulatr/filter/_product_price_range.html.slim
+- spec/dummy/app/views/vendors/index.html.slim
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -343,6 +354,8 @@ test_files:
 - spec/lib/tabulatr/data/sorting_spec.rb
 - spec/lib/tabulatr/json_builder_spec.rb
 - spec/lib/tabulatr/renderer/checkbox_spec.rb
+- spec/lib/tabulatr/renderer/columns_from_block_spec.rb
+- spec/lib/tabulatr/renderer/filter_spec.rb
 - spec/lib/tabulatr/renderer/renderer_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb