iquest-simple_table 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a22a88ebc15153bfbddfa1b076b799834eef673c
-  data.tar.gz: 14f4ac09b39995cfb23a0336d4b6edffc57280c8
+  metadata.gz: 9605388d187db1edcbc45d873ce710cbe8ae4c0b
+  data.tar.gz: 739f74b35c801f11e41f95ad1083f37fea20f360
 SHA512:
-  metadata.gz: 7356d83577cf0749b74a32d2dd247c89272943297a89365eb4c0362115e23842b26359350ddcc74fe62df5fd7f19dc1e72fb7d1134b9ddef0be0ae730e8e9791
-  data.tar.gz: deffa5e1599cae4b17533e848962ce8b4a0d4a593ea8a1c6f419e41ac0540213c4c16a62a18c28ea487a6d989522d69c8896a3f2f0a025f14c6ec57f86a2bed3
+  metadata.gz: 1d61e21c206fbfab19317fad3d67c681dc284813815615db37cf8e0635cd99c5e4701a0b90b39499d33c047c4900ee6c092dfef17961ea749a5be4d35a2bcd7c
+  data.tar.gz: 8fa682beeef5041e90fb3e73e787833f0bb79108f0dacf048aba5528ef1a303fc4aae5830e63691fd8649167254b6bc60a023d76e93ccdc2dd97471ed5c403ac

data/lib/iquest/simple_table/attribute_description.rb

@@ -0,0 +1,30 @@
+module Iquest
+  module SimpleTable
+    module AttributeDescription
+
+      def human_attribute_description(attribute, options = {})
+        parts     = attribute.to_s.split(".")
+        attribute = parts.pop
+        namespace = parts.join("/") unless parts.empty?
+        attributes_scope = "#{self.i18n_scope}.descriptions"
+
+        if namespace
+          defaults = lookup_ancestors.map do |klass|
+            :"#{attributes_scope}.#{klass.model_name.i18n_key}/#{namespace}.#{attribute}"
+          end
+          defaults << :"#{attributes_scope}.#{namespace}.#{attribute}"
+        else
+          defaults = lookup_ancestors.map do |klass|
+            :"#{attributes_scope}.#{klass.model_name.i18n_key}.#{attribute}"
+          end
+        end
+
+        defaults << options.delete(:default) if options[:default]
+
+        options[:default] = ''
+        I18n.translate(defaults.shift, options)
+      end
+
+    end
+  end
+end

data/lib/iquest/simple_table/table_builder.rb

@@ -227,9 +227,10 @@ module Iquest
             sort_attr = sort
           end
           sort_options.reverse_merge!(method: search_action)
-          sort_link(@search, sort_attr, label, sort_options)
+          sort_link(@search, sort_attr, label, sort_options) << description(attr)
         else
-          label
+          label << description(attr)
+          label.html_safe
         end
       end
 
@@ -337,12 +338,23 @@ module Iquest
         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)                  
+          Ransack::Translate.attribute(attr.to_s.tr('.','_'), context: @search.context)                  
         else
           attr.to_s.humanize
-        end  
+        end
       end  
 
+      def description(attr)
+        if attr_class(attr).respond_to?(:human_attribute_description)
+          description = attr_class(attr).try(:human_attribute_description, attr)
+        end
+        if description.present?
+          "<div class=\"description\">#{description}</div>".html_safe
+        else
+          "".html_safe
+        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  

data/lib/iquest/simple_table/version.rb

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

data/lib/iquest/simple_table.rb

@@ -1,6 +1,7 @@
 require "iquest/simple_table/version"
 require "iquest/simple_table/table_builder"
 require "iquest/simple_table/table_helper"
+require "iquest/simple_table/attribute_description"
 
 module Iquest
   module SimpleTable
@@ -9,4 +10,4 @@ module Iquest
 end
 
 ActionController::Base.helper Iquest::SimpleTable::TableHelper
-
+ActiveRecord::Base.extend Iquest::SimpleTable::AttributeDescription

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iquest-simple_table
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Pavel Dusanek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack_simple_form
@@ -68,6 +68,7 @@ files:
 - config/locale/en.yml
 - iquest-simple_table.gemspec
 - lib/iquest/simple_table.rb
+- lib/iquest/simple_table/attribute_description.rb
 - lib/iquest/simple_table/table_builder.rb
 - lib/iquest/simple_table/table_helper.rb
 - lib/iquest/simple_table/version.rb