table_sortable 1.0.0.pre.alpha.1 → 1.0.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16a4f40f3be133c7ec573c4b44ed7a0e09d4ff32
-  data.tar.gz: 8c5b23bb0ca2f978ac6e521a8c3ff6ec0b5f19c0
+  metadata.gz: ef99429a8e38ac1b35cca7c1132ac37dd1010e90
+  data.tar.gz: 990f9be300de2361525306f8441b9403295df3ad
 SHA512:
-  metadata.gz: cded6091b5b1f9ca2fc93dcb89dda9282b1793a1e5ba3c6930bb5a58e1ef98a1058f0139eb4a80bb3491758c5d051d4be047744b67f6382fed5dc12d3bba14f2
-  data.tar.gz: b2b5058c8231d4150bcb39b118b5645bab6d26416e3f2b70c227a6b5d8762d39798b4ca47775df077124f33d8f2f430cb3fedbec7b0bda945af03fc6089d8628
+  metadata.gz: 4476c99e0fcb47487687ae2b423e31e7b4eb13279853cd08525c77bbde688905d6a20ebb94f1c6e18c6715a11046f56f3be66f6569d4efee4187f9ae35bb58b5
+  data.tar.gz: ff9103a5e53aeaa7b3c14db4d3b30b1096072d06a044b995837e0bc894579d8c3735c2ab61d186ca8d8bf294a0d6da95c44af536fb367467671df6d8777ba28e

data/README.md

@@ -365,11 +365,8 @@ you may create a partial inside a `table_sortable` folder nested inside the cont
 Notice that in this case you need to manually specify the different data attributes that correspond to the behaviour you wish this column to have.
 
 The view will be supplied with four locals:
-- `source`: the source ActiveRecord object
-- `content`: the column's content to be displayed
-- `value`: the column's value
+- `record`: the source ActiveRecord object
 - `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.rb

@@ -1,7 +1,7 @@
 module TableSortable
   class Column
 
-    attr_reader :name, :label, :filter, :sorter, :template, :placeholder, :content, :translation_key, :options, :template_path, :column_partial, :header_partial
+    attr_reader :name, :label, :filter, :sorter, :template, :placeholder, :content, :translation_key, :options, :template_path
 
     def initialize(col_name, *options)
 
@@ -14,7 +14,6 @@ module TableSortable
       placeholder = options[:placeholder] || (options[:placeholder] == false ? nil : label)
       template = options[:template] || col_name
       column_options = options[:options] || {}
-      controller = options[:controller]
 
       @name = col_name
       @value = value.respond_to?(:call) ? value : -> (record) { record.send(value) }
@@ -23,14 +22,7 @@ module TableSortable
       @placeholder = placeholder
       @template = template
       @template_path = template_path
-
-      view_path = @template_path || (defined?(Rails) ? File.join("#{controller.controller_path}/table_sortable/") : '')
-
-      view_filename = "#{@template}_column.html"
-      @column_partial = controller.lookup_context.find_all(File.join(view_path, "_#{view_filename}")).any? ? File.join(view_path, "#{view_filename}") : false
-
-      view_filename = "#{@template}_header.html"
-      @header_partial = controller.lookup_context.find_all(File.join(view_path, "_#{view_filename}")).any? ? File.join(view_path, "#{view_filename}") : false
+      @translation_key = translation_key
 
       @options = column_options
       @filter = TableSortable::Column::Filter.new(options.merge(:column => self) )

data/lib/table_sortable/version.rb

@@ -1,3 +1,3 @@
 module TableSortable
-  VERSION = "1.0.0-alpha.1"
+  VERSION = "1.0.0-alpha.2"
 end

data/lib/table_sortable/view_helpers.rb

@@ -35,8 +35,11 @@ module TableSortable
         th_options['data-value'] = col.filter.default_value if col.filter.default_value
         th_options.merge!(html_options)
 
-        if col.header_partial
-          render partial: col.header_partial,
+        view_path = col.template_path || (defined?(Rails) ? File.join("#{controller.controller_path}/table_sortable/") : '')
+        view_filename = "#{col.template}_header.html"
+        if controller.lookup_context.find_all(File.join(view_path, "_#{view_filename}")).any?
+
+          render partial: File.join(view_path, "#{view_filename}"),
                  locals: {label: col.label,
                           column: col,
                           index: index}
@@ -48,7 +51,7 @@ module TableSortable
       end.join.html_safe
     end
 
-    def table_sortable_columns(record, row_number, html_options = {})
+    def table_sortable_columns(record, row_number = nil, html_options = {})
       controller.columns.map.with_index do |col, index|
         value = col.value(record)
         content = col.content(record)
@@ -56,8 +59,10 @@ module TableSortable
         td_options['data-text'] = value if value != content
         td_options.merge!(html_options)
 
-        if col.column_partial
+        if row_number && @column_html[col.name]
           @column_html[col.name][row_number]
+        elsif row_number.nil? && (col_partial = partial_for(col))
+          render partial: col_partial, locals: {column: col, record: record}
         else
           content_tag :td, td_options do
             content
@@ -68,11 +73,22 @@ module TableSortable
 
     def table_sortable_rows(layout, collection, html_options = {})
       @column_html = {}
-      controller.columns.select{|col| col.column_partial}.each do |col|
-        @column_html[col.name] = []
-        render partial: col.column_partial, collection: collection, as: :record, layout: '/table_sortable/capture_column.html.erb', locals: {column: col}
+      controller.columns.each do |col|
+        col_partial = partial_for(col)
+        if col_partial
+          @column_html[col.name] = []
+          render partial: col_partial, collection: collection, as: :record, layout: '/table_sortable/capture_column.html.erb', locals: {column: col}
+        end
       end
       render partial: '/table_sortable/row.html.erb', layout: layout, collection: collection, as: :record, locals: {html_options: html_options}
     end
+
+    private
+
+    def partial_for(col)
+      view_path = col.template_path || (defined?(Rails) ? File.join("#{controller.controller_path}/table_sortable/") : '')
+      view_filename = "#{col.template}_column.html"
+      File.join(view_path, "#{view_filename}") if controller.lookup_context.find_all(File.join(view_path, "_#{view_filename}")).any?
+    end
   end
 end

metadata

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