iquest-simple_table 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c98e9638b525b3fcd9d23bedaba939041c8bed44
-  data.tar.gz: e75d59320c151b9fc743f75a37993449093404cd
+  metadata.gz: a22a88ebc15153bfbddfa1b076b799834eef673c
+  data.tar.gz: 14f4ac09b39995cfb23a0336d4b6edffc57280c8
 SHA512:
-  metadata.gz: 2870e8e75996fda74575e0e97b920cdf6b275c3d531ffa04bb8a13737b8caf26c0fa47da18cabc9b8c9fb573fdc0a5a91cba4ab348c9e74fcc3d7665e12308c8
-  data.tar.gz: a8771e6c304757634be19bf1d83a263732174876f271958d3464bcee2b3f83aa977f3aa3aed8f1aa9da20b9129a22cd2a6365bf66dd1e655b33f7a3ff7513a1c
+  metadata.gz: 7356d83577cf0749b74a32d2dd247c89272943297a89365eb4c0362115e23842b26359350ddcc74fe62df5fd7f19dc1e72fb7d1134b9ddef0be0ae730e8e9791
+  data.tar.gz: deffa5e1599cae4b17533e848962ce8b4a0d4a593ea8a1c6f419e41ac0540213c4c16a62a18c28ea487a6d989522d69c8896a3f2f0a025f14c6ec57f86a2bed3

data/lib/iquest/simple_table/table_builder.rb

@@ -25,9 +25,12 @@ module Iquest
           options[:search_url] ||= polymorphic_path(collection_or_search.map {|o| o.is_a?(Ransack::Search) ? o.klass : o})          
         elsif collection_or_search.is_a?(Array) && (collection = collection_or_search.detect {|o| o.is_a?(ActiveRecord::Relation) || o.is_a?(ActiveRecord::AssociationRelation)}) 
           @collection = collection
-          @klass = @collection.klass          
-        else
-          raise TypeError, 'ActiveRecord::Relation, ActiveRecord::AssociationRelation or Ransack::Search expected'
+          @klass = @collection.klass
+        elsif collection_or_search.is_a?(Array) && (collection_or_search.any? || options[:class])
+          @collection = collection_or_search
+          @klass = options[:class] || collection_or_search.first.class
+        else  
+          raise TypeError, 'ActiveRecord::Relation, ActiveRecord::AssociationRelation, Ransack::Search or Array of ActiveModel like objects expected'
         end
         apply_pagination
         #draper
@@ -46,11 +49,7 @@ module Iquest
         options = args.extract_options!
         search = options.delete(:search)                
         @columns[attr] = options
-        if @search
-          @columns[attr][:label] ||= Ransack::Translate.attribute(attr.to_s.tr('.','_'), context: @search.context)
-        else
-          @columns[attr][:label] ||= @klass.human_attribute_name(attr)
-        end        
+        @columns[attr][:label] ||= column_label(attr)
         #iniciaizce search options
         if search.is_a?(Symbol) || search.is_a?(String)
           @columns[attr][:search] = {search.to_sym => {}}
@@ -61,6 +60,7 @@ module Iquest
         end
         @columns[attr][:formatter] ||= block if block_given?
         @columns[attr][:sort] ||= attr.to_s.tr('.','_') unless @columns[attr][:sort] == false #sort link attr
+        @columns[attr][:html] ||= {}
       end
 
       def action(*args, &block)
@@ -213,12 +213,21 @@ module Iquest
       end
 
       def render_label(column)
-        attr = column
+        attr = column        
         options = @columns[attr]
         label = options[:label] || attr.to_s
-        sort = options[:sort]
+        sort = options[:sort]        
         if @search && sort
-          sort_link(@search, sort, label, method: search_action)
+          sort_attr = attr
+          sort_options = {}          
+          if sort.is_a?(Hash)
+            sort_attr = sort.keys.first
+            sort_options = sort[sort_attr]
+          elsif sort.is_a?(Symbol) || sort.is_a?(String)
+            sort_attr = sort
+          end
+          sort_options.reverse_merge!(method: search_action)
+          sort_link(@search, sort_attr, label, sort_options)
         else
           label
         end
@@ -234,9 +243,9 @@ module Iquest
         cell_value = render_value(obj, value, &formatter)
         cell_classes = []
         cell_classes << "rowlink-skip" if include_link?(cell_value)
-        cell_classes << "#{options[:class]}"
-        content_tag :td, class: cell_classes.join(' ') do
-          cell_value
+        cell_classes << "#{options[:html][:class]}"
+        content_tag :td, class: cell_classes do
+          "#{cell_value}".html_safe
         end
       end
 
@@ -324,6 +333,20 @@ module Iquest
         col.to_s.split('.').inject(obj, :try)
       end
 
+      def column_label(attr)        
+        if attr_class(attr).respond_to?(:human_attribute_name)
+          attr_class(attr).try(:human_attribute_name, attr)
+        elsif @search
+           Ransack::Translate.attribute(attr.to_s.tr('.','_'), context: @search.context)                  
+        else
+          attr.to_s.humanize
+        end  
+      end  
+
+      def attr_class(attr)
+        attr.to_s.split('.')[0..-2].inject(@klass) {|klass, assoc| klass.try(:reflect_on_association, assoc).try(:klass)}        
+      end  
+
       def column_count
         @columns.count
       end

data/lib/iquest/simple_table/version.rb

@@ -1,5 +1,5 @@
 module Iquest
   module SimpleTable
-    VERSION = '0.3.4'
+    VERSION = '0.3.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iquest-simple_table
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Pavel Dusanek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack_simple_form