tabulatr2 0.9.7 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69941415afe2bc08bd378cb68c1a67490f5082a2
-  data.tar.gz: dc92b82263d3621383ba74c9cfaae51e291c392a
+  metadata.gz: 457d8adce27f3f902cc4df5215a32cc4672ebe6f
+  data.tar.gz: b8f3703af996ac13ba561401e113e34bf1b165fc
 SHA512:
-  metadata.gz: 224bb32431f1fc7974742de1ee1bd735480568b81bff5af2463e4169983a1b28274dce41dda48d4a8fabdb4997a360d5e8699ad723732d38c1bc488e7e206319
-  data.tar.gz: 74b7411b8933ba1fb6171ab5ae695fcf6fa66782cfad0b200126d72929846fc2e1c8fde54eb723fb9c83ec99503ad0fc5fbc74798e41170a076b2546045e7ecd
+  metadata.gz: c81f75442ed064dfb4918af18cc310e3185e06c8f500ce327117427e2e7cb42a6b64ed43c88be3317418f5d8a783def68e8a1c47ab44f18eedae4d211dd09f69
+  data.tar.gz: f6817a83f7bfe03822dde8e343148cea2337721ce6a2efa2f382e8d3bf4f7fa0188c91f156392ed7750d8c317131a30c9f1ac473497680e31b194e1728962290

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010-2011 by Provideal GmbH, Peter Horn
+Copyright (c) 2010-2014 by tickettoaster GmbH, Peter Horn & Florian Thomas
 http://www.provideal.net, peter.horn@provideal.net
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

data/README.md

@@ -134,6 +134,36 @@ class UserTabulatrData < Tabulatr::Data
 end
 ```
 
+### Actions
+
+To provide a column that's not sortable and filterable but renders something nice:
+
+```ruby
+class UserTabulatrData < Tabulatr::Data
+  action do |r|
+    link_to "edit", edit_product_path(r)
+  end
+end
+```
+
+### Buttons
+
+To render a fancy button group:
+
+```ruby
+class UserTabulatrData < Tabulatr::Data
+  buttons do |b,r|
+    b.button :eye, product_path(r), class: 'btn-success'
+    b.button :pencil, edit_product_path(r), class: 'btn-warning'
+    b.submenu do |s|
+      s.button :star, star_product_path(r), label: 'Dolle Sache'
+      s.divider
+      s.button :'trash-o', product_path(r), label: 'Löschen', confirmation: 'echt?', class: 'btn-danger', method: :delete
+    end
+  end
+end
+```
+
 ### Search
 
 The DSL provides you with a `search` method to define a custom fuzzy search method which is not bound

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

@@ -1,4 +1,4 @@
-//  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+//  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 //
 //  Permission is hereby granted, free of charge, to any person obtaining
 //  a copy of this software and associated documentation files (the

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

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@
       tr
        - columns.each do |column|
          - classes = column.sortable ? ['tabulatr-sortable'] : []
-         - classes = [classes, column.classes].flatten.compact.join(' ')
+         - classes = [classes, "tabulatr-column-#{column.coltype}", column.classes].flatten.compact.join(' ')
          th data-tabulatr-column-name=column.full_name style=column.html_header_style class=classes
            = column.human_name
     tbody
@@ -34,7 +34,7 @@
       tr.empty_row
         - columns.each do |column|
           - classes = column.sortable ? ['tabulatr-sortable'] : []
-          - classes = [classes, column.classes].flatten.compact.join(' ')
+          - classes = [classes, "tabulatr-column-#{column.coltype}", column.classes].flatten.compact.join(' ')
           td data-tabulatr-column-name=column.full_name data-tabulatr-type=column.coltype style=column.html_cell_style class=classes
   .tabulatr-spinner-box data-table=table_id
     = image_tag "#{Tabulatr.spinner}-loader.gif"

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

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the
@@ -24,7 +24,7 @@
   .dropdown
     a.btn.btn-default data-toggle="dropdown" href="#"
       i.icon-cog.glyphicon.glyphicon-cog.fa.fa-cog'
-      i.icon-caret-down.glyphicon.glyphicon-caret-down.fa.fa-caret-down
+      i.icon-caret-down.glyphicon.glyphicon-chevron-down.fa.fa-caret-down
     ul.dropdown-menu role="menu" aria-labelledby="dLabel"
       - table_options[:batch_actions].each do |key, label|
         li

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

@@ -0,0 +1,19 @@
+//{:buttons=>[{:icon=>:"eye-open", :path=>"/products/1", :options=>{:class=>"btn-success"}}, {:icon=>:pencil, :path=>"/products/1/edit", :options=>{:class=>"btn-warning"}}], :submenu=>[{:icon=>:star, :path=>"/products/1", :label=>"Dolle Sache"}, :divider, {:icon=>:"trash-o", :path=>"/products/1", :label=>"Löschen", :options=>{:confirm=>"echt?", :class=>"btn-danger", :method=>:delete}}]}
+.btn-group
+  - buttons[:buttons].each do |button|
+    - o = (button[:options] || {}).merge(class: "btn btn-sm btn-default #{button[:options].try(:[], :class)}")
+    = link_to fa_icon(button[:icon]), button[:path], o
+  - if buttons[:submenu].present?
+    button.btn.btn-default.btn-sm.dropdown-toggle data-toggle='dropdown'
+      span.caret
+    ul.dropdown-menu role='menu'
+      - buttons[:submenu].each do |button|
+        - if button == :divider
+          li.divider role="presentation"
+        - else
+          li= link_to button[:path], button[:options] do
+            - if button[:icon].present?
+              => fa_icon(button[:icon])
+            - if button[:label].present?
+              = button[:label]
+

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

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the

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

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the
@@ -23,7 +23,7 @@
   .dropdown
     a.btn.btn-default data-toggle="dropdown" href="#"
       i.icon-filter.glyphicon.glyphicon-filter.fa.fa-filter'
-      i.icon-caret-down.glyphicon.glyphicon-caret-down.fa.fa-caret-down
+      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

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

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the

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

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the

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

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the

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

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the
@@ -23,11 +23,11 @@ table class="#{table_options[:html_class]} tabulatr_static_table"
   thead
     tr
      - columns.each do |column|
-       th data-tabulatr-column-name=column.full_name style=column.html_header_style
+       th data-tabulatr-column-name=column.full_name style=column.html_header_style class=["tabulatr-column-#{column.coltype}", column.classes].flatten.compact.join(' ')
          = column.human_name
   tbody
     - records.each do |record|
       tr data-id=record.try(:id)
         - columns.each do |column|
-          td data-tabulatr-column-name=column.full_name data-tabulatr-type=column.coltype style=column.html_cell_style
+          td data-tabulatr-column-name=column.full_name data-tabulatr-type=column.coltype style=column.html_cell_style class=["tabulatr-column-#{column.coltype}", column.classes].flatten.compact.join(' ')
             = column.value_for(record, self)

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

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the

data/lib/tabulatr.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/data/button_builder.rb

@@ -0,0 +1,71 @@
+#--
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+# buttons do |b,r|
+#   b.button :'eye-open', foo_path(r), class: 'btn-success'
+#   b.button :'pencil', edit_foo_path(r), class: 'btn-warning'
+#   b.submenu do |s|
+#     s.button :star, star_foor_path(r), label: 'Dolle Sache'
+#     s.divider
+#     s.button :'trash-o', foo_path(r), label: 'Löschen', confirm: 'echt?', class: 'btn-danger', method: :delete
+#   end
+# end
+
+
+class Tabulatr::Data::ButtonBuilder
+
+  def initialize
+    @mode = :buttons
+    @buttons = []
+    @submenu = []
+    val
+  end
+
+  def val
+    {buttons: @buttons, submenu: @submenu}
+  end
+
+  def button(icon, path, options={})
+    label = options.dup.delete(:label)
+    if @mode == :buttons
+      @buttons << {icon: icon, path: path, options: options}
+    else
+      @submenu << {icon: icon, label: label, path: path, options: options}
+    end
+    val
+  end
+
+  def submenu(&block)
+    raise "No submenus in submenus, sorry" if @mode == :submenu
+    @mode = :submenu
+    yield(self)
+    @mode = :buttons
+    val
+  end
+
+  def divider
+    raise "use dividers only in submenu" unless @mode == :submenu
+    @submenu << :divider
+    val
+  end
+end

data/lib/tabulatr/data/data.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -38,7 +38,7 @@ class Tabulatr::Data
     end
   end
 
-  def data_for_table(params, locals: {}, &block)
+  def data_for_table(params, locals: {}, controller: nil, &block)
 
     @batch_actions = block if block_given?
 
@@ -59,7 +59,7 @@ class Tabulatr::Data
     # TODO: batch actions and checked ids
 
     # get the records
-    found = apply_formats(locals: locals)
+    found = apply_formats(locals: locals, controller: controller)
 
     append = params[:append].present? ? Tabulatr::Utility.string_to_boolean(params[:append]) : false
 
@@ -139,3 +139,4 @@ require_relative './pagination'
 require_relative './formatting'
 require_relative './row'
 require_relative './proxy'
+require_relative './button_builder'

data/lib/tabulatr/data/dsl.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -44,8 +44,16 @@ module Tabulatr::Data::DSL
     end
   end
 
-  def column(name, sort_sql: nil, filter_sql: nil, sql: nil, table_column_options: {}, &block)
+  def column(name, 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: {},
+    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,
+      format: format, map: map, cell_style: cell_style, header_style: header_style
+    }.merge(table_column_options)
     table_name = main_class.table_name
     table_column = Tabulatr::Renderer::Column.from(
       table_column_options.merge(name: name,
@@ -56,8 +64,16 @@ module Tabulatr::Data::DSL
     @table_columns << table_column
   end
 
-  def association(assoc, name, sort_sql: nil, filter_sql: nil, sql: nil, table_column_options: {}, &block)
+  def association(assoc, name, 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: {},
+    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,
+      format: format, map: map, cell_style: cell_style, header_style: header_style
+    }.merge(table_column_options)
     assoc_klass = main_class.reflect_on_association(assoc.to_sym)
     t_name = assoc_klass.try(:table_name)
     table_column = Tabulatr::Renderer::Association.from(
@@ -69,17 +85,70 @@ module Tabulatr::Data::DSL
     @table_columns << table_column
   end
 
-  def search(*args, &block)
-    raise "either column or block" if args.present? && block_given?
-    @search = args.presence || block
+  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: {},
+    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,
+      format: format, map: map, cell_style: cell_style, header_style: header_style
+    }.merge(table_column_options)
+    table_column = Tabulatr::Renderer::Action.from(
+      table_column_options.merge(
+        name: (name || '_actions'), table_name: main_class.table_name.to_sym,
+        klass: @base, header: header || '',
+        filter: false, sortable: false,
+        output: block))
+    @table_columns << table_column
+  end
+
+  def buttons(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: {},
+    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,
+      format: format, map: map, cell_style: cell_style, header_style: header_style
+    }.merge(table_column_options)
+    output = ->(r) {
+      tdbb = Tabulatr::Data::ButtonBuilder.new
+      self.instance_exec tdbb, r, &block
+      bb = tdbb.val
+      self.controller.render_to_string partial: '/tabulatr/tabulatr_buttons', locals: {buttons: bb}, formats: [:html]
+    }
+    table_column = Tabulatr::Renderer::Buttons.from(
+      table_column_options = table_column_options.merge(
+        name: (name || '_buttons'), table_name: main_class.table_name.to_sym,
+        klass: @base, header: header || '',
+        filter: false, sortable: false,
+        output: output))
+    @table_columns << table_column
   end
 
-  def checkbox(table_column_options: {})
+  def checkbox(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: {},
+    header_style: {})
     @table_columns ||= []
-    box = Tabulatr::Renderer::Checkbox.from(table_column_options.merge(klass: @base, filter: false, sortable: false))
+    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,
+      format: format, map: map, cell_style: cell_style, header_style: header_style
+    }.merge(table_column_options)
+    box = Tabulatr::Renderer::Checkbox.from(table_column_options = table_column_options.merge(klass: @base, filter: false, sortable: false))
     @table_columns << box
   end
 
+  def search(*args, &block)
+    raise "either column or block" if args.present? && block_given?
+    @search = args.presence || block
+  end
+
   def row &block
     raise 'Please pass a block to row if you want to use it.' unless block_given?
     @row = block

data/lib/tabulatr/data/filtering.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/data/formatting.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,14 +23,14 @@
 
 module Tabulatr::Data::Formatting
 
-  def apply_formats(locals: {})
-    view = Data::Proxy.new(locals: locals)
+  def apply_formats(locals: {}, controller: nil)
+    view = Data::Proxy.new(locals: locals, controller: controller)
     return @relation.map do |record|
       view.record = record
       h = HashWithIndifferentAccess.new
       table_columns.each do |tc|
         h[tc.table_name] ||= HashWithIndifferentAccess.new
-        h[tc.table_name][tc.name] = format_column(record, tc.output, view)
+        h[tc.table_name][tc.name] = tc.value_for(record, view)
       end
       h[:_row_config] = format_row(view, @row)
       h[:id] = record.id
@@ -38,10 +38,6 @@ module Tabulatr::Data::Formatting
     end # @relation map
   end # apply_formats
 
-  def format_column(record, output, view)
-      view.instance_exec(record, &output) if output.present?
-  end
-
   def format_row(view, row)
     row_config = Row.new
     view.instance_exec(view.record, row_config.attributes, &row) if row.is_a?(Proc)

data/lib/tabulatr/data/invoker.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/data/pagination.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/data/proxy.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,12 +23,13 @@
 
 class Data::Proxy < ActionView::Base
 
-  attr_accessor :record
+  attr_accessor :record, :controller
 
-  def initialize(record=nil, locals: {})
+  def initialize(record=nil, locals: {}, controller: nil)
     self.class._init
     Rails.application.routes.mounted_helpers.instance_methods.each{|f| self.send(f).instance_variable_set('@scope', self)}
     @record = record
+    @controller = controller
     locals.each do |nam, val|
       raise "cowardly refusing to override `#{nam}'" if respond_to? nam
       define_singleton_method nam do val end

data/lib/tabulatr/data/sorting.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/engine.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/generators/railtie.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/generators/resource_override.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/generators/tabulatr/install_generator.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/generators/tabulatr/table_generator.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/json_builder.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/rails/action_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -30,11 +30,13 @@ class ActionController::Base
     klass = relation.respond_to?(:klass) ? relation.klass : relation
     respond_to do |format|
       format.json {
-        records = klass.tabulatr(relation, tabulatr_data_class).data_for_table(params, locals: locals, &block)
+        records = klass.tabulatr(relation, tabulatr_data_class).data_for_table(params, locals: locals, controller: self, &block)
         render json: records.to_tabulatr_json(serializer)
+        records
       }
       format.html {
         render action: render_action || action_name
+        nil
       }
     end
   end

data/lib/tabulatr/rails/action_view.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/rails/active_record.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/renderer/action.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/renderer/association.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -30,7 +30,8 @@ class Tabulatr::Renderer::Association < Tabulatr::Renderer::Column
   def column?() false end
   def association?() true end
 
-  def principal_value(record)
+  def principal_value(record, view)
+    return super if output
     v = record.send(table_name)
     if v && v.respond_to?(:to_a) && map && name != :count
       v.map(&:"#{name}")

data/lib/tabulatr/renderer/buttons.rb

@@ -0,0 +1,32 @@
+#--
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+class Tabulatr::Renderer::Buttons < Tabulatr::Renderer::Action
+  def human_name
+    header
+  end
+
+  def coltype() 'buttons' end
+  def column?() false end
+  def action?() true end
+end

data/lib/tabulatr/renderer/checkbox.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/renderer/column.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -51,7 +51,6 @@ class Tabulatr::Renderer::Column
     filter_sql: nil,
     output: nil,
     &block)
-    b = block_given? ? block : nil
     self.new(
       name: name,
       table_name: table_name,
@@ -68,7 +67,7 @@ class Tabulatr::Renderer::Column
       format: format,
       map: map,
       klass: klass,
-      block: b,
+      block: block,
       cell_style: cell_style,
       header_style: header_style,
       sort_sql: sort_sql,
@@ -143,12 +142,7 @@ class Tabulatr::Renderer::Column
   end
 
   def value_for(record, view)
-    if block
-      r = view.instance_exec(record, &block)
-      r = r.join(' ').html_safe if r.is_a?(Array)
-      return r
-    end
-    val = principal_value(record) or return ''
+    val = principal_value(record, view)
     if format.present? && val.respond_to?(:to_ary)
       val.map do |v|
         case format
@@ -170,8 +164,16 @@ class Tabulatr::Renderer::Column
     end
   end
 
-  def principal_value(record)
-    record.send name
+  def principal_value(record, view)
+    if output
+      view.instance_exec(record, &output)
+    elsif block
+      view.instance_exec(record, &block)
+    elsif name
+      record.send name
+    else
+      nil
+    end
   end
 
   def determine_appropriate_filter!

data/lib/tabulatr/renderer/columns_from_block.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -57,6 +57,14 @@ class Tabulatr::Renderer
       @columns << Action.from(opts.merge(klass: klass, filter: false, sortable: false), &block)
     end
 
+    def buttons(opts={}, &block)
+      output = ->(r) {
+        bb = self.instance_exec Tabulatr::Data::ButtonBuilder.new, r, &block
+        self.controller.render_to_string partial: '/tabulatr/tabulatr_buttons', locals: {buttons: bb}, formats: [:html]
+      }
+      @columns << Buttons.from(opts.merge(klass: klass, filter: false, sortable: false, output: output), &block)
+    end
+
     def self.process(klass, table_data_object = nil, &block)
       i = self.new(klass, table_data_object)
       yield(i)

data/lib/tabulatr/renderer/renderer.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -114,8 +114,8 @@ class Tabulatr::Renderer
         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
+      result ||= available_columns.find{|column| column.name.to_sym == r.to_sym && column.table_name == main_table_name}
+      result or raise "Can't find column '#{r}'"
     end.flatten
   end
 
@@ -124,5 +124,6 @@ end
 require_relative './column'
 require_relative './association'
 require_relative './action'
+require_relative './buttons'
 require_relative './checkbox'
 require_relative './columns_from_block'

data/lib/tabulatr/utility/request_data_not_included_error.rb

@@ -2,8 +2,7 @@ module Tabulatr
   class RequestDataNotIncludedError < StandardError
 
     def self.raise_error(method, object)
-      raise self, "You requested '#{method}' on '#{object}' but
-          there was no such method included in your TabulatrData"
+      raise self, "You requested '#{method}' on '#{object}' but there was no such method included in your TabulatrData"
     end
   end
-end
+end

data/lib/tabulatr/utility/utility.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/version.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.9.7"
+  VERSION = "0.9.10"
 end

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

@@ -22,7 +22,7 @@ class ProductTabulatrData < Tabulatr::Data
     table_column_options: {header: 'Product by vendor'} do
     "#{record.title} from #{record.vendor.try(:name)}"
   end
-  column :active, table_column_options: {sortable: false}
+  column :active, sortable: false
   column :updated_at, table_column_options: { filter: :date } do "#{record.updated_at.strftime('%H:%M %d.%m.%Y')}" end
   association :vendor, :name, table_column_options: { filter: :exact }
   association :tags, :title do |r|
@@ -30,4 +30,14 @@ class ProductTabulatrData < Tabulatr::Data
   end
   association :tags, :count
 
+  buttons width: '200px' do |b,r|
+    b.button :eye, product_path(r), class: 'btn-success'
+    b.button :pencil, edit_product_path(r), class: 'btn-warning'
+    b.submenu do |s|
+      s.button :star, product_path(r), label: 'Dolle Sache'
+      s.divider
+      s.button :'trash-o', product_path(r), label: 'Löschen', confirm: 'echt?', class: 'btn-danger', method: :delete
+    end
+    "haha!"
+  end
 end

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

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

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

@@ -17,4 +17,7 @@
   t.action header: "ACTION!" do |t|
     t.title.upcase
   end
+  t.buttons do |b,r|
+    b.button :eye, product_path(r)
+  end
 end or "empty" %>

data/spec/dummy/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  resources :products, only: [:index, :show] do
+  resources :products, only: [:index, :show, :edit] do
     collection do
       get :simple_index
       get :one_item_per_page_with_pagination

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.10
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -102,6 +102,7 @@ files:
 - app/assets/stylesheets/tabulatr/bootstrap2_fixes.css.scss
 - app/views/tabulatr/_tabulatr_actual_table.html.slim
 - app/views/tabulatr/_tabulatr_batch_actions_menu.html.slim
+- app/views/tabulatr/_tabulatr_buttons.html.slim
 - app/views/tabulatr/_tabulatr_filter_dialog.html.slim
 - app/views/tabulatr/_tabulatr_filter_menu.html.slim
 - app/views/tabulatr/_tabulatr_fuzzy_search_field.html.slim
@@ -111,6 +112,7 @@ files:
 - app/views/tabulatr/_tabulatr_table.html.slim
 - init.rb
 - lib/tabulatr.rb
+- lib/tabulatr/data/button_builder.rb
 - lib/tabulatr/data/data.rb
 - lib/tabulatr/data/dsl.rb
 - lib/tabulatr/data/filtering.rb
@@ -133,6 +135,7 @@ files:
 - lib/tabulatr/rails/active_record.rb
 - lib/tabulatr/renderer/action.rb
 - lib/tabulatr/renderer/association.rb
+- lib/tabulatr/renderer/buttons.rb
 - lib/tabulatr/renderer/checkbox.rb
 - lib/tabulatr/renderer/column.rb
 - lib/tabulatr/renderer/columns_from_block.rb