table_sortable 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9f41a38a9c6e8e3dd84971893d87b4bd6c08598
-  data.tar.gz: 0550a5e7bf7d84b9de93023ab5fb190f91cf38e6
+  metadata.gz: 5279a6fe61465b9302bd136458b22910ff165fcf
+  data.tar.gz: 2435e4f604291e32bd9fadf74d1320d151b975a2
 SHA512:
-  metadata.gz: c38f714a9562509915a9b1f09f0b532f0bd1ae81295c41a77b9417eb92315d706065e6dd484c879850aa9fa61b7a5d457b24e45f753abca92b98e11edd1df5a2
-  data.tar.gz: 5a7fa03f35248a87c2c67fc1f5eac760978c0c91a83e3eab51762a3ef51f23febc61eb2c5ecaf8a662aadd33e9a4237f1fd6e698079af14627d9bb3303d8ce67
+  metadata.gz: fe0393056ab45eb0de56d5c23d28592b1cb16c691dd55cf9124212b0953d423f146766e38214c2e33780299f8ac18e5ae189ff41e63f846300bc4815223cb501
+  data.tar.gz: d5b042e11f44d186a80ff4a5bdce8f9de6a15259f262b6c1db6d07a0da123b44209d7a8ec582b78332717547c30e37bf35478b9b43ee9be1e9465503001ee353

data/lib/table_sortable/version.rb

@@ -1,3 +1,3 @@
 module TableSortable
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/lib/table_sortable/view_helpers.rb

@@ -24,26 +24,31 @@ 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'] = col.placeholder if col.placeholder
+        th_options['data-placeholder'] = placeholder if placeholder
         # th_options['data-priority'] = col.sort_priority if col.sort_priority
-        th_options['data-filter'] = 'false' if col.filter.disabled?
+        th_options['data-filter'] = 'false' if filter.disabled?
         th_options['data-sorter'] = 'false' if col.sorter.disabled?
-        unless col.filter.collection.blank?
+        unless filter.collection.blank?
           th_options['filter-select'] = true
-          th_options['data-filter-options'] = col.filter.collection
+          th_options['data-filter-options'] = filter.collection
         end
-        th_options['data-value'] = col.filter.default_value if col.filter.default_value
+        th_options['data-value'] = filter.default_value if filter.default_value
         th_options.merge!(html_options)
-
-        begin
-          render partial: "#{col.template_path || controller_path}/table_sortable/#{col.template}_header.html",
-                 locals: {label: col.label,
+        view_path = "#{col.template_path || controller_path}/table_sortable/"
+        view_filename = "#{col.template}_header.html"
+        if Dir.glob(File.join(Rails.root, 'app', 'views', view_path, "_#{view_filename}.*")).any?
+          render partial: File.join(view_path, view_filename),
+                 locals: {label: label,
                           column: col,
                           index: index}
-        rescue ActionView::MissingTemplate
+        else
           content_tag :th, th_options do
-            col.label
+            label
           end
         end
       end.join.html_safe
@@ -51,20 +56,23 @@ module TableSortable
 
     def table_sortable_columns(record, html_options = {})
       controller.columns.map.with_index do |col, index|
+        value = col.value(record)
+        content = col.content(record)
         td_options = {}
-        td_options['data-text'] = col.value(record) if col.value(record) != col.content(record)
+        td_options['data-text'] = value if value != content
         td_options.merge!(html_options)
-
-        begin
-          render partial: "#{col.template_path || controller_path}/table_sortable/#{col.template}_column.html",
-                 locals: {content: col.content(record),
-                          value: col.value(record),
+        view_path = "#{col.template_path || controller_path}/table_sortable/"
+        view_filename = "#{col.template}_column.html"
+        if Dir.glob(File.join(Rails.root, 'app', 'views', view_path, "_#{view_filename}.*")).any?
+          render partial: File.join(view_path, view_filename),
+                 locals: {content: content,
+                          value: value,
                           source: record,
                           column: col,
                           index: index}
-        rescue ActionView::MissingTemplate
+        else
           content_tag :td, td_options do
-            col.value(record)
+            value
           end
         end
       end.join.html_safe

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_sortable
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Oded Davidov