table_sortable 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c71932ec8cb88cab6d3c896f1a88465f2de37f6
-  data.tar.gz: 59b5b8c69fc4be9a9a610dd99d50d5c7969b8ce4
+  metadata.gz: 58f56319bff9c3d3ab049d249641cc00e51ec909
+  data.tar.gz: f930fc8ef35415aba073a22f324125a19c83258e
 SHA512:
-  metadata.gz: 2ac86b08493279aa0636e34ffe490823438523f1befb9a36d04acee52d088841e86fd6ad54cc9cc6355720a6f66e17d77d3ef5a12642c83e1cee2312534d62f5
-  data.tar.gz: efb115d0bd7582047363bc7d647911378b9ab2cfd0e524356d8f379f966170a40f330546b988647b7bfc2ea9909580c5dcf0a3b1e71495538ad59eb046b0884f
+  metadata.gz: 256f910ad188856f5809326ba5d14ff87e9b8778800098cf616d6eafd80ef0d86e1c98a352af5ddb41183934e0e54f0a4ee6896bfa0f75b7b8f52093972b90b9
+  data.tar.gz: 501252f87cb2f3c750fc56122989ff24fe19e242e8a66f9cd3a02ced8cb90e10d0968e0e0b9470f47e55728d6f745fd1273ee24f109de041469840a972db6cb7

data/README.md

@@ -38,19 +38,19 @@ please see the [jQuery tablesorter plugin for Rails](https://github.com/themilkm
 ## Usage
 
 First, we need to setup our controller. For this example this will be a users controller.  
-Let's `include TableSortable` so that we can use its methods.
+Let's `include TableSortable::Controller` so that we can use its methods.
 
 ```ruby
 #controllers/users_controller.rb
 class UsersController < ApplicationController
-  include TableSortable
+  include TableSortable::Controller
 ```
 
 Next, let's define our columns.
 ```ruby
 #controllers/users_controller.rb
 class UsersController < ApplicationController
-  include TableSortable
+  include TableSortable::Controller
   
   define_colunns :first_name, :last_name, :email, :created_at
 ```
@@ -151,7 +151,7 @@ TableSortable lets you define the columns one by one with many custom attributes
 ```ruby
 #controllers/users_controller.rb
 class UsersController < ApplicationController
-  include TableSortable
+  include TableSortable::Controller
   
   define_column :full_name, 
                  value: -> (user) {"#{user.first_name} #{user.last_name}"}

data/lib/table_sortable/column.rb

@@ -1,14 +1,15 @@
 module TableSortable
   class Column
 
-    attr_reader :name, :label, :filter, :sorter, :template, :placeholder, :content#, :sort_priority
+    attr_reader :name, :label, :filter, :sorter, :template, :placeholder, :content, :translation_key
 
     def initialize(col_name, *options)
 
       options = options.extract_options!
       value = options[:value] || col_name
       content = options[:content] || value
-      label = options[:label] || (options[:label] == false ? '' : col_name.to_s.titleize)
+      translation_key = options[:translation_key]
+      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

data/lib/table_sortable/controller.rb

@@ -13,12 +13,14 @@ module TableSortable
       def define_columns(*args)
         options = args.extract_options!
         column_offset = options[:offset] || 0
+        translation_key = options[:translation_key]
         columns   = args
         before_action(options) do
+          define_translation_key translation_key
+          define_column_offset column_offset
           columns.each do |column|
-            define_column column
+            define_column column, translation_key: translation_key
           end
-          define_column_offset column_offset
         end
       end
 
@@ -39,10 +41,16 @@ module TableSortable
           define_column_offset offset
         end
       end
+
+      def define_translation_key(key)
+        before_action do
+          define_translation_key key
+        end
+      end
     end
 
     def define_column(col_name, *options)
-      options = options.extract_options!
+      options = default_column_options.merge(options.extract_options!)
       @columns.add(col_name, options)
     end
 
@@ -54,12 +62,20 @@ module TableSortable
       @column_offset = offset
     end
 
+    def define_translation_key(key)
+      @translation_key = key
+    end
+
     def columns
       @columns.sort_by(column_order)
     end
 
     private
 
+    def default_column_options
+      {translation_key: @translation_key}
+    end
+
     def filter_and_sort(scope, params = nil)
       populate_params(params)
 
@@ -92,7 +108,7 @@ module TableSortable
 
     public
 
-    attr_reader :column_order, :column_offset
+    attr_reader :column_order, :column_offset, :translation_key
 
   end
 end

data/lib/table_sortable/version.rb

@@ -1,3 +1,3 @@
 module TableSortable
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_sortable
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Oded Davidov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler