table_sortable 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ecb8551e2152e42546781c82d866c4c7f4e553f
-  data.tar.gz: f40ad9da19a795eac67d3440348e9e4dd4ed04df
+  metadata.gz: b5653290ccc181f9313a45feae9d71810fd5987a
+  data.tar.gz: bbb838cf7f287f6c9fb8a6d8ed6e9283a2dccab9
 SHA512:
-  metadata.gz: 7e9e9efd48707ffb3462835505136556b70417aeb9fd252b86dff2be63b4034ee976105bffd163f1d929889e6f11650e0bde918280c4e735a61c6e60503d7a13
-  data.tar.gz: 3e21bb44455b931a6945c188fd2556314c295ae856efdbf527a31d3d4bec39bc67a2a8d9639ead45c43f59355f5224c1cf37ab7e36fcc8d82eab54f2241e15e0
+  metadata.gz: 93af7674f241f73b8ca78bd9f41f7548f16930b994ce53cc339687b7e6b7e98ada4570f15d8e3ab98ca76493db11bd565e60e8e0a35126f8cb60a302078abee6
+  data.tar.gz: ce338d84b1087859d81ee6cd827926611e35a1a626eb8c550b7c3a2545336ad17ed120ea32fc4aa6273955993873ebafabb217c9d8b6c17e181d5729d54836b7

data/README.md

@@ -182,7 +182,7 @@ end
                       content: -> (user) {"#{user.last_name}, #{user.first_name}"}
         ```
     - `label: (string)`  
-        <sub>default: 'Titleized' version of the column name</sub>   
+        <sub>default: 'Titleized' version of the column name. Supports I18n internationalization. see [translateion_key](#translation-key).</sub>   
         Allows specifying a string to be used as the column label, displayed at the table header.
     - `placeholder: (string|false)`  
         <sub>default: same as label</sub>  
@@ -331,6 +331,7 @@ Notice that in this case you need to manually specify the different data attribu
 The view will be supplied with two locals:
 - `label`: the column's label
 - `column`: the TableSortable::Column object
+- `index`: the column's index (useful for manually setting the `data-col` attribute)
 
 Here is an example of a full name header partial, which includes a font-awesome icon:
 ```erb
@@ -368,6 +369,7 @@ The view will be supplied with four locals:
 - `content`: the column's content to be displayed
 - `value`: the column's value
 - `column`: the TableSortable::Column object
+- `index`: the column's index (useful for manually setting the `data-col` attribute)
 
 Here is an example of a full name column partial, in which the name links to the edit_user_path:
 ```erb

data/lib/table_sortable/column/filter.rb

@@ -3,11 +3,12 @@ module TableSortable
     class Filter
       include TableSortable::Concerns::Proc
 
-      attr_accessor :query, :default_value
+      attr_accessor :query, :default_value, :collection
 
       def initialize(*args)
         options = args.extract_options!
         @default_value = options[:filter_initial_value]
+        @collection = options[:filter_collection]
         super :filter, options
       end
 

data/lib/table_sortable/column.rb

@@ -1,7 +1,7 @@
 module TableSortable
   class Column
 
-    attr_reader :name, :label, :filter, :sorter, :template, :placeholder, :content, :translation_key
+    attr_reader :name, :label, :filter, :sorter, :template, :placeholder, :content, :translation_key, :options, :template_path
 
     def initialize(col_name, *options)
 
@@ -9,10 +9,12 @@ module TableSortable
       value = options[:value] || col_name
       content = options[:content] || value
       translation_key = options[:translation_key]
+      template_path = options[:template_path]
       label = options[:label] || (options[:label] == false ? '' : I18n.translate("table_sortable.#{"#{translation_key}." if translation_key }#{col_name.to_s}", :default => col_name.to_s).titleize)
       placeholder = options[:placeholder] || (options[:placeholder] == false ? nil : label)
       # priority = options[:priority]
       template = options[:template] || col_name
+      column_options = options[:options] || {}
 
       # filter_defaultAttrib (data-value)
       # data-sorter (=false?)
@@ -24,6 +26,8 @@ module TableSortable
       @placeholder = placeholder
       # @sort_priority = sort_priority
       @template = template
+      @template_path = template_path
+      @options = column_options
       @filter = TableSortable::Column::Filter.new(options.merge(:column => self) )
       @sorter = TableSortable::Column::Sorter.new(options.merge(:column => self) )
 

data/lib/table_sortable/controller.rb

@@ -11,16 +11,9 @@ module TableSortable
 
     module ClassMethods
       def define_columns(*args)
-        options = args.extract_options!
-        column_offset = options[:offset] || 0
-        translation_key = options[:translation_key]
-        columns   = args
+
         before_action(options) do
-          define_translation_key translation_key
-          define_column_offset column_offset
-          columns.each do |column|
-            define_column column, translation_key: translation_key
-          end
+          define_columns(args)
         end
       end
 
@@ -47,6 +40,26 @@ module TableSortable
           define_translation_key key
         end
       end
+
+      def define_template_path(path)
+        before_action do
+          define_template_path path
+        end
+      end
+    end
+
+    def define_columns(*args)
+      options = args.extract_options!
+      column_offset = options[:offset] || 0
+      translation_key = options[:translation_key]
+      template_path = options[:template_path]
+      columns   = args
+      define_translation_key translation_key
+      define_template_path template_path
+      define_column_offset column_offset
+      columns.each do |column|
+        define_column column, translation_key: translation_key
+      end
     end
 
     def define_column(col_name, *options)
@@ -66,6 +79,10 @@ module TableSortable
       @translation_key = key
     end
 
+    def define_template_path(path)
+      @template_path = path.blank? ? nil : File.join(path, "")
+    end
+
     def columns
       @columns.sort_by(column_order)
     end
@@ -73,7 +90,7 @@ module TableSortable
     private
 
     def default_column_options
-      {translation_key: @translation_key}
+      {translation_key: @translation_key, template_path: @template_path}
     end
 
     def filter_and_sort(scope, params = nil)
@@ -108,7 +125,7 @@ module TableSortable
 
     public
 
-    attr_reader :column_order, :column_offset, :translation_key
+    attr_reader :column_order, :column_offset, :translation_key, :template_path
 
   end
 end

data/lib/table_sortable/version.rb

@@ -1,3 +1,3 @@
 module TableSortable
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/table_sortable/view_helpers.rb

@@ -23,19 +23,24 @@ module TableSortable
     end
 
     def table_sortable_headers(html_options = {})
-      controller.columns.map do |col|
+      controller.columns.map.with_index do |col, index|
         th_options = {}
         th_options['data-placeholder'] = col.placeholder if col.placeholder
         # th_options['data-priority'] = col.sort_priority if col.sort_priority
         th_options['data-filter'] = 'false' if col.filter.disabled?
         th_options['data-sorter'] = 'false' if col.sorter.disabled?
+        unless col.filter.collection.blank?
+          th_options['filter-select'] = true
+          th_options['data-filter-options'] = col.filter.collection
+        end
         th_options['data-value'] = col.filter.default_value if col.filter.default_value
         th_options.merge!(html_options)
 
         begin
-          render partial: "#{controller_path}/table_sortable/#{col.template}_header.html",
+          render partial: "#{col.template_path || controller_path}/table_sortable/#{col.template}_header.html",
                  locals: {label: col.label,
-                          column: col}
+                          column: col,
+                          index: index}
         rescue ActionView::MissingTemplate
           content_tag :th, th_options do
             col.label
@@ -45,17 +50,18 @@ module TableSortable
     end
 
     def table_sortable_columns(record, html_options = {})
-      controller.columns.map do |col|
+      controller.columns.map.with_index do |col, index|
         td_options = {}
         td_options['data-text'] = col.value(record) if col.value(record) != col.content(record)
         td_options.merge!(html_options)
 
         begin
-          render partial: "#{controller_path}/table_sortable/#{col.template}_column.html",
+          render partial: "#{col.template_path || controller_path}/table_sortable/#{col.template}_column.html",
                  locals: {content: col.content(record),
                           value: col.value(record),
                           source: record,
-                          column: col}
+                          column: col,
+                          index: index}
         rescue ActionView::MissingTemplate
           content_tag :td, td_options do
             col.value(record)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_sortable
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Oded Davidov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-25 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler