table_sortable 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c897aef9c9560c97f4e86d21c4b3c7748146930
-  data.tar.gz: 35bbcc31b6cee05c2bbd2487e9e220105431d3fa
+  metadata.gz: c8def2534bcfe05e1ab749a6853d1edd26a751ad
+  data.tar.gz: 91ad20906e10c0d9d4a49afaa198a88e9cf6e7f7
 SHA512:
-  metadata.gz: f5d17f0dd89132fac1362a5440c0725f95be281f267893e9c63e9bec86cb2b4c990d7f71327d2547998c8098171da5a03034808bb5a98be631b2dba1d23e1f60
-  data.tar.gz: '060482b829d5c3fe9721e9c163f30e405a671db9d75b5de0aff1bd019045ca91500443393b4f146ba985117ee2638da1bc94408069c8dc0bdc58dd85c4c2045b'
+  metadata.gz: 0d0c532401296051648a7ec339a08ab7fcb4d970df8026177210c4e31f0bf1d054dbf129044c917d12a45137c1014822179f4413ca6eade55cef9093820fab08
+  data.tar.gz: 0731c3520684a99a85ad022bc30027f3f7aac04a8d6804856502013114af07f536736364e45c94c43c4bf408a4d9a17813bed72ac5c6917cbd1b9d9b91960596

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, :options, :template_path
+    attr_reader :name, :label, :filter, :sorter, :template, :placeholder, :content, :translation_key, :options, :template_path, :column_partial, :header_partial
 
     def initialize(col_name, *options)
 
@@ -12,21 +12,28 @@ module TableSortable
       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?)
+      controller = options[:controller]
 
       @name = col_name
       @value = value.respond_to?(:call) ? value : -> (record) { record.send(value) }
       @content = content.respond_to?(:call) ? content : -> (record) { record.send(content) }
       @label = label
       @placeholder = placeholder
-      # @sort_priority = sort_priority
       @template = template
       @template_path = template_path
+
+      view_path = @template_path || (defined?(Rails) ? File.join(Rails.root, 'app', 'views', "#{controller.controller_path}/table_sortable/") : '')
+
+      view_filename = "_#{@template}_column.html"
+      view = Dir.glob(File.join(view_path, "#{view_filename}.*"))
+      @column_partial = view.any? ? File.join(view_path, "#{view_filename}") : false
+
+      view_filename = "_#{@template}_header.html"
+      view = Dir.glob(File.join(view_path, "#{view_filename}.*"))
+      @header_partial = view.any? ? File.join(view_path, "#{view_filename}") : false
+
       @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

@@ -65,7 +65,7 @@ module TableSortable
 
     def define_column(col_name, *options)
       options = default_column_options.merge(options.extract_options!)
-      @columns.add(col_name, options)
+      @columns.add(col_name, options.merge(controller: self))
     end
 
     def define_column_order(*order)

data/lib/table_sortable/result.rb

@@ -1,9 +1,10 @@
 module TableSortable
   class Result < Array
 
-    attr_reader :total_count
+    attr_reader :total_count, :unpaginated
 
     def initialize(the_array, page, page_size)
+      @unpaginated = the_array
       @total_count = the_array.length
       super(the_array[(page)*page_size, page_size])
     end

data/lib/table_sortable/version.rb

@@ -1,3 +1,3 @@
 module TableSortable
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

data/lib/table_sortable/view_helpers.rb

@@ -24,31 +24,25 @@ module TableSortable
 
     def table_sortable_headers(html_options = {})
       controller.columns.map.with_index do |col, index|
-        label = col.label
-        placeholder = col.placeholder
-        filter = col.filter
-
         th_options = {}
-        th_options['data-placeholder'] = placeholder if placeholder
+        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 filter.disabled?
+        th_options['data-filter'] = 'false' if col.filter.disabled?
         th_options['data-sorter'] = 'false' if col.sorter.disabled?
-        unless filter.collection.blank?
-          th_options['filter-select'] = true
-          th_options['data-filter-options'] = filter.collection
+        unless col.filter.collection.blank?
+          th_options['data-filter-options'] = col.filter.collection.to_json
         end
-        th_options['data-value'] = filter.default_value if filter.default_value
+        th_options['data-value'] = col.filter.default_value if col.filter.default_value
         th_options.merge!(html_options)
-        view_path = col.template_path || File.join(Rails.root, 'app', 'views', "#{controller_path}/table_sortable/")
-        view_filename = "_#{col.template}_header.html"
-        if Dir.glob(File.join(view_path, "#{view_filename}.*")).any?
-          render file: File.join(view_path, view_filename),
-                 locals: {label: label,
+
+        if col.header_partial
+          render file: col.header_partial,
+                 locals: {label: col.label,
                           column: col,
                           index: index}
         else
           content_tag :th, th_options do
-            label
+            col.label
           end
         end
       end.join.html_safe
@@ -61,10 +55,9 @@ module TableSortable
         td_options = {}
         td_options['data-text'] = value if value != content
         td_options.merge!(html_options)
-        view_path = col.template_path || File.join(Rails.root, 'app', 'views', "#{controller_path}/table_sortable/")
-        view_filename = "_#{col.template}_column.html"
-        if Dir.glob(File.join(view_path, "#{view_filename}.*")).any?
-          render file: File.join(view_path, view_filename),
+
+        if col.column_partial
+          render file: col.column_partial,
                  locals: {content: content,
                           value: value,
                           source: record,
@@ -72,7 +65,7 @@ module TableSortable
                           index: index}
         else
           content_tag :td, td_options do
-            value
+            content
           end
         end
       end.join.html_safe

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_sortable
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Oded Davidov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler