tabulatr2 0.9.11 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a677eed252e25251243c72fcd9273a5fa2a3e4d0
-  data.tar.gz: fe38b3b4eccad2e746772356203cb233e5a76a71
+  metadata.gz: 5a47c45c08c541dbbb460f8aa315f35db38c82c8
+  data.tar.gz: e6fd77a9e25389bcfbbca3e82d8064842b421211
 SHA512:
-  metadata.gz: f9824d54ec64a5c7cbe4aac03861f6aa4e9beee8d5a2a4d849a74c3a8193b4a51a7c4055d566d37627222741d39f64969b8a644b280e37f6e3695faf6be0ff86
-  data.tar.gz: 1a3f528cb8f4198086384f163c65638002cd5348eb46db70c53170be40f488f3470fd3ddec59945660b350b40521c376c86bf9f94d136cc832e04aff776e98a1
+  metadata.gz: fbb8191710b05154d82532ba5b316c4914f95ea415bac16c0cc73bc6426381e3cdd5e11b7091564afd570553167639ea991b2dbcdaefaef439aea1ddc6baf086
+  data.tar.gz: d28ea60364b7841bc1c1125402754d8f9920c17d4dd88af0a7eb775ed4e5c51321998de725598b731ba46731b354bc5e75078683c514b0c655292a927efbd080

data/lib/tabulatr/data/dsl.rb

@@ -44,7 +44,7 @@ module Tabulatr::Data::DSL
     end
   end
 
-  def column(name, sort_sql: nil, filter_sql: nil, sql: nil, table_column_options: {},
+  def column(name, header: nil, 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: {},
@@ -52,19 +52,21 @@ module Tabulatr::Data::DSL
     @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
+      format: format, map: map, cell_style: cell_style, header_style: header_style,
+      header: header
     }.merge(table_column_options)
     table_name = main_class.table_name
     table_column = Tabulatr::Renderer::Column.from(
       table_column_options.merge(name: name,
-        klass: @base, sort_sql: sort_sql || sql || "#{table_name}.#{name}",
+        klass: @base,
+        sort_sql: sort_sql || sql || "#{table_name}.#{name}",
         filter_sql: filter_sql || sql || "#{table_name}.#{name}",
         table_name: table_name.to_sym,
         output: block_given? ? block : ->(record){record.send(name)}))
     @table_columns << table_column
   end
 
-  def association(assoc, name, sort_sql: nil, filter_sql: nil, sql: nil, table_column_options: {},
+  def association(assoc, name, header: nil, 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: {},
@@ -72,7 +74,8 @@ module Tabulatr::Data::DSL
     @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
+      format: format, map: map, cell_style: cell_style, header_style: header_style,
+      header: header
     }.merge(table_column_options)
     assoc_klass = main_class.reflect_on_association(assoc.to_sym)
     t_name = assoc_klass.try(:table_name)

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.9.11"
+  VERSION = "0.9.12"
 end

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

@@ -19,7 +19,7 @@ class ProductTabulatrData < Tabulatr::Data
   column :vendor_product_name,
     sort_sql: "products.title || '' || vendors.name",
     filter_sql: "products.title || '' || vendors.name",
-    table_column_options: {header: 'Product by vendor'} do
+    header: 'Product by vendor' do
     "#{record.title} from #{record.vendor.try(:name)}"
   end
   column :active, sortable: false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails