tabulatr2 0.9.4 → 0.9.6

data/lib/tabulatr/renderer/columns_from_block.rb

@@ -23,19 +23,30 @@
 
 class Tabulatr::Renderer
   class ColumnsFromBlock
-    attr_accessor :columns, :klass
+    attr_accessor :columns, :klass, :table_data
 
-    def initialize(klass)
+    def initialize(klass, table_data_object)
       @klass = klass
+      @table_data = table_data_object
       @columns ||= []
     end
 
     def column(name, opts={}, &block)
-      @columns << Column.from(opts.merge(klass: klass, name: name), &block)
+      if table_data
+        @columns << fetch_column_from_table_data(klass.table_name.to_sym, name, opts, &block)
+      else
+        @columns << Column.from(opts.merge(klass: klass, table_name: klass.table_name.to_sym, name: name), &block)
+      end
     end
 
     def association(table_name, name, opts={}, &block)
-      @columns << Association.from(opts.merge(klass: klass, name: name, table_name: table_name), &block)
+      if table_data
+        @columns << fetch_column_from_table_data(table_name, name, opts, &block)
+      else
+        assoc_klass = klass.reflect_on_association(table_name.to_sym)
+        @columns << Association.from(opts.merge(klass: assoc_klass.try(:klass),
+          name: name, table_name: table_name), &block)
+      end
     end
 
     def checkbox(opts={})
@@ -46,11 +57,18 @@ class Tabulatr::Renderer
       @columns << Action.from(opts.merge(klass: klass, filter: false, sortable: false), &block)
     end
 
-    def self.process(klass, &block)
-      i = self.new(klass)
+    def self.process(klass, table_data_object = nil, &block)
+      i = self.new(klass, table_data_object)
       yield(i)
       c = i.columns
       c
     end
+
+    private
+
+    def fetch_column_from_table_data table_name, name, opts={}, &block
+      column = table_data.table_columns.find{|tc| tc.table_name == table_name && tc.name == name}
+      column.update_options(opts, &block)
+    end
   end
 end

data/lib/tabulatr/renderer/renderer.rb

@@ -32,7 +32,10 @@ class Tabulatr::Renderer
       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
+      order_by: nil,         # default order
+      html_class: '',
+      pagination_position: :top,
+      persistent: true)
     @klass = klass
     @view = view
     @table_options = {
@@ -44,21 +47,27 @@ class Tabulatr::Renderer
       batch_actions: batch_actions,
       footer_content: footer_content,
       path: path,
-      order_by: order_by
+      order_by: order_by,
+      html_class: 'table tabulatr_table '.concat(html_class),
+      pagination_position: pagination_position,
+      persistent: paginate ? persistent : false
     }
     @classname = @klass.name.underscore
   end
 
-  def build_table(columns, &block)
-    tdc = "#{@klass.name}TabulatrData".constantize.new(@klass)
+  def build_table(columns, 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, &block
+      @columns = ColumnsFromBlock.process @klass, tdc, &block
     elsif columns.any?
       @columns = get_requested_columns(tdc.table_columns, columns)
     else
       @columns = tdc.table_columns
     end
-
     @view.render(partial: '/tabulatr/tabulatr_table', locals: {
       columns: @columns,
       table_options: @table_options,
@@ -66,7 +75,7 @@ class Tabulatr::Renderer
       classname: @classname,
       tabulatr_data: tdc,
       table_id: generate_id,
-      formatted_name: formatted_name
+      formatted_name: Tabulatr::Utility.formatted_name(@klass.name)
     })
   end
 
@@ -83,11 +92,7 @@ class Tabulatr::Renderer
   end
 
   def generate_id
-    "#{formatted_name}_table_#{SecureRandom.uuid}"
-  end
-
-  def formatted_name
-    "#{@klass.to_s.gsub(/::/, '--').downcase}"
+    "#{Tabulatr::Utility.formatted_name(@klass.name)}_table_#{@view.controller.controller_name}_#{@view.controller.action_name}_#{@view.instance_variable_get(:@_tabulatr_table_index)}"
   end
 
   def self.build_static_table(records, view, toptions={}, &block)
@@ -96,16 +101,21 @@ class Tabulatr::Renderer
     new(klass, view, toptions).build_static_table(records, &block)
   end
 
-  def self.build_table(klass, view, toptions={}, columns, &block)
-    new(klass, view, toptions).build_table(columns, &block)
+  def self.build_table(klass, view, toptions={}, columns, tabulatr_data_class, &block)
+    new(klass, view, toptions).build_table(columns, tabulatr_data_class, &block)
   end
 
   private
 
   def get_requested_columns(available_columns, requested_columns)
+    main_table_name = @klass.table_name.to_sym
     requested_columns.collect do |r|
-      r = "#{r.keys.first}:#{r.values.first}" if r.is_a?(Hash) && r.count == 1
-      available_columns.select{|column| column.full_name.to_sym == r.to_sym }
+      if r.is_a?(Hash) && r.count == 1
+        r = "#{r.keys.first}:#{r.values.first}"
+      end
+      result = available_columns.find{|column| column.full_name.to_sym == r.to_sym }
+      result = available_columns.find{|column| column.name.to_sym == r.to_sym && column.table_name == main_table_name} if result.nil?
+      result
     end.flatten
   end
 
@@ -116,4 +126,3 @@ require_relative './association'
 require_relative './action'
 require_relative './checkbox'
 require_relative './columns_from_block'
-

data/lib/tabulatr/utility/unexpected_search_result_error.rb

@@ -0,0 +1,9 @@
+module Tabulatr
+  class UnexpectedSearchResultError < StandardError
+
+    def self.raise_error(klass)
+      raise self, "Your search block returned a '#{klass}'.\n
+        You need to return a String, a Hash, an Array or an ActiveRecord::Relation instead."
+    end
+  end
+end

data/lib/tabulatr/utility/utility.rb

@@ -43,4 +43,8 @@ module Tabulatr::Utility
       false
     end
   end
+
+  def self.formatted_name class_name
+    "#{class_name.gsub(/::/, '--').downcase}"
+  end
 end

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.9.4"
+  VERSION = "0.9.6"
 end

data/spec/dummy/app/controllers/products_controller.rb

@@ -49,4 +49,13 @@ class ProductsController < ApplicationController
   def implicit_columns
     tabulatr_for Product
   end
+
+  def local_storage
+    begin
+      tabulatr_for Product
+    rescue Exception => e
+      puts e.backtrace
+      raise e
+    end
+  end
 end

data/spec/dummy/app/views/products/local_storage.html.slim

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

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

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

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

@@ -7,7 +7,7 @@
   t.column :active
   t.column :updated_at
   t.column :updated_at do |r|
-    r.updated_at.strftime('%d.%M.%Y')
+    r.updated_at.strftime('%d.%m.%Y')
   end
   t.association :vendor, :name
   t.association :tags, :title

data/spec/dummy/config/application.rb

@@ -1,6 +1,7 @@
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
+require 'font-awesome-rails'
 
 Bundler.require(*Rails.groups)
 
@@ -20,4 +21,3 @@ module Dummy
     # config.i18n.default_locale = :de
   end
 end
-

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

@@ -5,7 +5,7 @@ en:
     batch_actions: 'Batch actions'
     count: 'Showing: %{current} of total %{total}. %{per_page} items per page.'
     apply_filters: 'Apply'
-    search: 'Search'
+    search: 'Search...'
     date_filter:
       none: ''
       today: "Today"
@@ -27,7 +27,7 @@ de:
     batch_actions: 'Batch-Aktionen'
     count: 'Zeige %{current} von insgesamt %{total}. %{per_page} pro Seite.'
     apply_filters: 'Anwenden'
-    search: 'Suche'
+    search: 'Suche...'
     date_filter:
       none: ''
       today: "Heute"

data/spec/dummy/config/routes.rb

@@ -9,6 +9,7 @@ Rails.application.routes.draw do
       get :with_batch_actions
       get :implicit_columns
       get :with_styling
+      get :local_storage
     end
   end
 

data/spec/features/tabulatrs_spec.rb

@@ -100,7 +100,7 @@ describe "Tabulatr" do
           Product.create!(:title => "test #{i}")
         end
         visit one_item_per_page_with_pagination_products_path
-        page.all('.pagination li a').count.should eq 5
+        page.all('.pagination li a[data-page]').count.should eq 5
       end
 
       it 'shows some pages when there are 20', js: true do
@@ -108,7 +108,7 @@ describe "Tabulatr" do
           Product.create!
         end
         visit one_item_per_page_with_pagination_products_path
-        pages = page.all('.pagination li a').map{|a| a['data-page'].to_i}
+        pages = page.all('.pagination li a[data-page]').map{|a| a['data-page'].to_i}
         pages.should eq [1,2,3,10,20]
       end
     end
@@ -136,21 +136,21 @@ describe "Tabulatr" do
       expect(find('.dropdown-menu').visible?)
       find(".tabulatr-filter-menu-wrapper a.btn").trigger('click')
       within(".tabulatr_filter_form") do
-        fill_in("product_filter[title][like]", with: "ore")
+        fill_in("product_filter[products:title][like]", with: "ore")
         expect{find('#title_like').visible?}.to be_true
         find_button("Apply").trigger('click')
       end
-      expect(page).to have_selector('td[data-tabulatr-column-name="title"]', text: 'lorem')
-      expect(page).to have_selector('td[data-tabulatr-column-name="title"]', text: 'labore')
-      expect(page).to have_selector('td[data-tabulatr-column-name="title"]', text: 'dolore')
+      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[title][like]", :with => "loreem")
+        fill_in("product_filter[products:title][like]", :with => "loreem")
         find_button("Apply").trigger('click')
       end
-      expect(page).not_to have_selector('td[data-tabulatr-column-name="title"]', text: 'lorem')
-      expect(page).not_to have_selector('td[data-tabulatr-column-name="title"]', text: 'labore')
-      expect(page).not_to have_selector('td[data-tabulatr-column-name="title"]', text: 'dolore')
+      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')
+      expect(page).not_to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'dolore')
     end
 
     it "filters", js: true do
@@ -178,15 +178,15 @@ describe "Tabulatr" do
       end
       find(".tabulatr-filter-menu-wrapper a.btn").trigger('click')
       within('.tabulatr_filter_form') do
-        fill_in("product_filter[price][from]", :with => 4)
-        fill_in("product_filter[price][to]", :with => 10)
+        fill_in("product_filter[products:price][from]", :with => 4)
+        fill_in("product_filter[products:price][to]", :with => 10)
         find_button("Apply").trigger('click')
       end
       page.find(".tabulatr_table tbody tr[data-id='#{Product.first.id}']").should have_content('foo')
       page.has_no_css?(".tabulatr_table tbody tr[data-id='#{Product.last.id}']")
       within('.tabulatr_filter_form') do
-        fill_in("product_filter[price][from]", :with => 12)
-        fill_in("product_filter[price][to]", :with => 19)
+        fill_in("product_filter[products:price][from]", :with => 12)
+        fill_in("product_filter[products:price][to]", :with => 19)
         find_button("Apply").trigger('click')
       end
       page.should have_selector(".tabulatr_table tbody tr[data-id='#{Product.last.id}']")
@@ -203,19 +203,19 @@ describe "Tabulatr" do
       expect(find('.dropdown-menu').visible?)
       find(".tabulatr-filter-menu-wrapper a.btn").trigger('click')
       within(".tabulatr_filter_form") do
-        fill_in("product_filter[title][like]", with: "foo")
-        expect(find('#title_like').visible?)
+        fill_in("product_filter[products:title][like]", with: "foo")
+        # expect(find('#products--title_like').visible?)
         find_button("Apply").trigger('click')
       end
       # expect(page).to have_content('foo')
       # expect(page).to have_no_content('bar')
-      expect(page).not_to have_selector('td[data-tabulatr-column-name="title"]', text: 'bar')
-      expect(page).to have_selector('td[data-tabulatr-column-name="title"]', text: 'foo')
-      find("a[data-hide-table-filter='title']").trigger('click')
+      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')
+      find("a[data-hide-table-filter='products:title']").trigger('click')
       # expect(page).to have_content('foo')
       # expect(page).to have_content('bar')
-      expect(page).to have_selector('td[data-tabulatr-column-name="title"]', text: 'bar')
-      expect(page).to have_selector('td[data-tabulatr-column-name="title"]', text: 'foo')
+      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
   end
 
@@ -231,14 +231,14 @@ describe "Tabulatr" do
         page.should have_content names[l-i]
       end
       within('.tabulatr_table thead') do
-        find('th[data-tabulatr-column-name=title]').click
+        find('th[data-tabulatr-column-name="products:title"]').click
       end
       snames = names.sort
       (1..10).each do |i|
         page.should have_content snames[i-1]
       end
       within('.tabulatr_table thead') do
-        find('th[data-tabulatr-column-name=title]').click
+        find('th[data-tabulatr-column-name="products:title"]').click
       end
       (1..10).each do |i|
         page.should have_content snames[-i]
@@ -303,10 +303,10 @@ describe "Tabulatr" do
     it 'applys the given style' do
       p = Product.create!(:title => names[0], :active => true, :price => 10.0)
       visit with_styling_products_path
-      cell   = find(".tabulatr_table tbody td[data-tabulatr-column-name='title']")
-      header = find(".tabulatr_table thead th[data-tabulatr-column-name='title']")
-      cell_without_style   = find(".tabulatr_table tbody td[data-tabulatr-column-name='price']")
-      header_without_style = find(".tabulatr_table thead th[data-tabulatr-column-name='price']")
+      cell   = find(".tabulatr_table tbody td[data-tabulatr-column-name='products:title']")
+      header = find(".tabulatr_table thead th[data-tabulatr-column-name='products:title']")
+      cell_without_style   = find(".tabulatr_table tbody td[data-tabulatr-column-name='products:price']")
+      header_without_style = find(".tabulatr_table thead th[data-tabulatr-column-name='products:price']")
       expect(cell[:style]).to eql 'text-align:left;width:60px;vertical-align:top;white-space:nowrap;background-color:green'
       expect(header[:style]).to eql 'text-align:left;width:60px;vertical-align:top;white-space:nowrap;color:orange'
       expect(cell_without_style[:style]).to be_empty

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

@@ -3,8 +3,15 @@ require 'spec_helper'
 describe Tabulatr::Data do
 
   before do
-    Tabulatr::Data.any_instance.stub_chain(:table_columns, :klass=).and_return(Product)
-    Tabulatr::Data.any_instance.stub_chain(:table_columns, :map).as_null_object
+    column = Tabulatr::Renderer::Column.from(
+        name: :title,
+        klass: Product,
+        table_name: :products,
+        sort_sql: "products.title",
+        filter_sql: "products.title",
+        output: ->(record){record.send(:title)}
+    )
+    Tabulatr::Data.any_instance.stub(:table_columns).and_return([column])
   end
 
   it 'prefilters the result' do
@@ -17,24 +24,13 @@ describe Tabulatr::Data do
   it 'uses default order' do
     Product.create([{title: 'foo', price: 5}, {title: 'bar', price: 10}, {title: 'fuzz', price: 7}])
 
-    cols = {
-      title: {
-        name: 'title',
-        sort_sql: nil,
-        filter_sql: nil,
-        output: nil,
-        table_column: Tabulatr::Renderer::Column.from(name: 'title', klass: Product)
-      }
-    }
-    Tabulatr::Data.instance_variable_set('@columns', cols)
     td = Tabulatr::Data.new(Product)
-    # mod_params = example_params.merge(product_sort: 'products.title DESC')
-    # raise mod_params.inspect
-    records = td.data_for_table(HashWithIndifferentAccess.new(example_params.merge(product_sort: 'products.title DESC')))
+    records = td.data_for_table(HashWithIndifferentAccess.new(example_params.merge(product_sort: 'title DESC')))
     expect(records.count).to eql 3
     titles = ['fuzz', 'foo', 'bar']
+    # raise records.inspect
     records.each_with_index do |r, ix|
-      expect(r[:title]).to eql titles[ix]
+      expect(r[:products][:title]).to eql titles[ix]
     end
   end
 end

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

@@ -21,40 +21,46 @@ describe Tabulatr::Data::Filtering do
   end
   describe '.apply_date_condition' do
     it "filters for 'today'" do
-      @dummy.apply_date_condition('publish_at', {simple: 'today'})
+      fake_obj = double(filter_sql: 'publish_at')
+      @dummy.apply_date_condition(fake_obj, {simple: 'today'})
       result = @dummy.instance_variable_get('@relation')
       expect(result.count).to be 1
       expect(result[0].id).to be @today.id
     end
 
     it "filters for 'yesterday'" do
-      @dummy.apply_date_condition('publish_at', {simple: 'yesterday'})
+      fake_obj = double(filter_sql: 'publish_at')
+      @dummy.apply_date_condition(fake_obj, {simple: 'yesterday'})
       result = @dummy.instance_variable_get('@relation')
       expect(result.count).to be 1
       expect(result[0].id).to be @yesterday.id
     end
 
     it "filters for 'this week'" do
-      @dummy.apply_date_condition('publish_at', {simple: 'this_week'})
+      fake_obj = double(filter_sql: 'publish_at')
+      @dummy.apply_date_condition(fake_obj, {simple: 'this_week'})
       result = @dummy.instance_variable_get('@relation')
       expect(result.count).to be 4
       expect(result.map(&:id).sort).to eq [@yesterday.id, @today.id, @week_one.id, @week_two.id].sort
     end
 
     it "filters for 'last 7 days'" do
-      @dummy.apply_date_condition('publish_at', {simple: 'last_7_days'})
+      fake_obj = double(filter_sql: 'publish_at')
+      @dummy.apply_date_condition(fake_obj, {simple: 'last_7_days'})
       result = @dummy.instance_variable_get('@relation')
       expect(result.map(&:id).sort).to eq ([@last_seven_days.id, @yesterday.id, @today.id, @week_one.id].sort)
     end
 
     it "filters for 'this month'" do
-      @dummy.apply_date_condition('publish_at', {simple: 'this_month'})
+      fake_obj = double(filter_sql: 'publish_at')
+      @dummy.apply_date_condition(fake_obj, {simple: 'this_month'})
       result = @dummy.instance_variable_get('@relation')
       expect(result.map(&:id).sort).to eq ([@today.id, @week_two.id, @this_month.id])
     end
 
     it "filters for 'last 30 days'" do
-      @dummy.apply_date_condition('publish_at', {simple: 'last_30_days'})
+      fake_obj = double(filter_sql: 'publish_at')
+      @dummy.apply_date_condition(fake_obj, {simple: 'last_30_days'})
       result = @dummy.instance_variable_get('@relation')
       expect(result.map(&:id).sort).to eq ([
         @last_thirty_days.id, @yesterday.id, @last_seven_days.id, @today.id,
@@ -62,11 +68,46 @@ describe Tabulatr::Data::Filtering do
     end
 
     it "filters from 'start_date' to 'end_date'" do
-      @dummy.apply_date_condition('publish_at', {
+      fake_obj = double(filter_sql: 'publish_at')
+      @dummy.apply_date_condition(fake_obj, {
         simple: 'from_to', from: '31.12.2013 15:00',
         to: '15.01.2014 00:00'})
       result = @dummy.instance_variable_get('@relation')
       expect(result.map(&:id)).to eq ([@yesterday.id, @today.id, @week_two.id].sort)
     end
   end
+
+  describe '.apply_search' do
+    it 'allows to alter the ActiveRecord::Relation' do
+      @dummy.instance_variable_set('@search',
+        ->(query, relation){ relation.joins(:vendor).where(%{vendors.name LIKE '%#{query}%'})})
+      expect{@dummy.apply_search('awesome vendor')}.to_not raise_error
+      sql =  @dummy.instance_variable_get('@relation').to_sql
+      expect(sql).to match(/INNER JOIN \"vendors\" ON \"vendors\".\"id\" = \"products\".\"vendor_id\"/)
+    end
+
+    it 'allows to provide only one argument' do
+      @dummy.instance_variable_set('@search', ->(query){ nil })
+      expect{@dummy.apply_search('awesome product')}.to_not raise_error
+    end
+
+    it 'allows to return a Hash' do
+      @dummy.instance_variable_set('@search', ->(query){ {title: query} })
+      expect{@dummy.apply_search('awesome product')}.to_not raise_error
+      sql =  @dummy.instance_variable_get('@relation').to_sql
+      expect(sql).to match(/WHERE \"products\".\"title\"/)
+    end
+
+    it 'allows to return an Array' do
+      @dummy.instance_variable_set('@search', ->(query){["title = ?", query]})
+      expect{@dummy.apply_search('awesome product')}.to_not raise_error
+      sql =  @dummy.instance_variable_get('@relation').to_sql
+      expect(sql).to match(/WHERE \(title = 'awesome product'\)/)
+    end
+
+    it 'can not be called without a block variable' do
+      @dummy.instance_variable_set('@search', ->{'hi'})
+      expect{@dummy.apply_search('test')}.to raise_error
+    end
+  end
 end

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

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Tabulatr::Data::Formatting do
+  class DummySpecClass
+    include Tabulatr::Data::Formatting
+  end
+
+  before(:each) do
+    @dummy = DummySpecClass.new
+    @dummy.instance_variable_set('@relation', Product.all)
+    column = Tabulatr::Renderer::Column.from(
+        name: :title,
+        klass: Product,
+        table_name: :products,
+        sort_sql: "products.title",
+        filter_sql: "products.title"
+    )
+    allow(@dummy).to receive(:table_columns).and_return([column])
+  end
+
+  describe '#apply_formats' do
+    it 'applies given formatting block to a column' do
+      allow(@dummy).to receive(:format_row).and_return(nil)
+      p = Product.create!(title: 'title of product')
+      @dummy.table_columns.first.output = ->(record){record.title.upcase}
+      result = @dummy.apply_formats
+      expect(result.count).to be 1
+      expect(result.first[:products][:title]).to eql 'TITLE OF PRODUCT'
+    end
+  end
+
+end

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

@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+describe Tabulatr::Data::Sorting do
+  class DummySpecClass
+    include Tabulatr::Data::Sorting
+  end
+
+  before(:each) do
+    @dummy = DummySpecClass.new
+    @dummy.instance_variable_set('@relation', Product.all)
+    @dummy.instance_variable_set('@table_name', 'products')
+    @dummy.instance_variable_set('@base', Product)
+    column = Tabulatr::Renderer::Column.from(
+        name: :title,
+        klass: Product,
+        sort_sql: "products.title",
+        filter_sql: "products.title",
+        table_name: :products
+    )
+    allow(@dummy).to receive(:table_columns).and_return([column])
+  end
+
+  describe '.apply_sorting' do
+
+    context 'no sortparam' do
+
+      context 'with no default order given' do
+        it 'sorts by primary_key descending' do
+          @dummy.apply_sorting(nil)
+          expect(@dummy.instance_variable_get('@relation').to_sql)
+            .to match /ORDER BY products.id desc/
+        end
+      end
+    end
+
+    context 'sortparam given' do
+      context 'sort by column of main table' do
+        context 'sort by "title"' do
+          it 'uses the given sortparam' do
+            @dummy.apply_sorting('products.title desc')
+            expect(@dummy.instance_variable_get('@relation').to_sql)
+              .to match /ORDER BY products.title desc/
+          end
+        end
+      end
+
+      context 'sort by association column' do
+        it 'sorts by vendor.name' do
+          @dummy.instance_variable_set('@includes', [])
+          assoc = Tabulatr::Renderer::Association.from(
+              name: :name,
+              table_name: :vendor,
+              klass: Product,
+              sort_sql: "vendors.name",
+              filter_sql: "vendors.name"
+          )
+          allow(@dummy).to receive(:table_columns).and_return([assoc])
+          @dummy.apply_sorting('vendor:name desc')
+          expect(@dummy.instance_variable_get('@relation').to_sql)
+            .to match /ORDER BY vendors.name desc/
+        end
+      end
+
+      context 'sort by custom sql' do
+        it "sorts by products.title || '' || vendors.name" do
+          @dummy.instance_variable_set('@includes', [])
+          column = Tabulatr::Renderer::Column.from(
+              name: :custom_column,
+              klass: Product,
+              sort_sql: "products.title || '' || vendors.name",
+              filter_sql: "products.title"
+          )
+          allow(@dummy).to receive(:table_columns).and_return([column])
+          @dummy.apply_sorting('custom_column asc')
+          expect(@dummy.instance_variable_get('@relation').to_sql)
+            .to match /ORDER BY products.title \|\| '' \|\| vendors.name asc/
+        end
+      end
+    end
+  end
+end