data_tables 0.1.16 → 0.1.17

data/data_tables.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'data_tables'
-  s.version     = '0.1.16'
+  s.version     = '0.1.17'
   s.date        = Time.now.strftime("%Y-%m-%d")
   s.summary     = "Rails friendly interface into DataTables"
   s.description = "DataTables for Rails"

data/lib/data_tables.rb

@@ -46,6 +46,7 @@ module DataTablesController
       named_scope_args = options[:named_scope_args]
       except = options[:except] || []
       es_block = options[:es_block]
+      order_sort = options[:order_sort]
 
       #
       # ------- Ohm ----------- #
@@ -304,14 +305,20 @@ module DataTablesController
             end
             sort_column = params[:iSortCol_0].to_i
             current_page = (params[:iDisplayStart].to_i/params[:iDisplayLength].to_i rescue 0)+1
+            order = if order_sort.respond_to?(:call)
+                      order_sort.call(columns[sort_column][:name], params[:sSortDir_0])
+                    else
+                      "#{columns[sort_column][:name]} #{params[:sSortDir_0]}"
+                    end
+
             if named_scope
                 objects = modelCls.send(named_scope, *args).paginate(:page => current_page,
-                                            :order => "#{columns[sort_column][:name]} #{params[:sSortDir_0]}",
+                                            :order => order, 
                                             :conditions => conditions.join(" AND "),
                                             :per_page => params[:iDisplayLength])
             else
                 objects = modelCls.paginate(:page => current_page,
-                                            :order => "#{columns[sort_column][:name]} #{params[:sSortDir_0]}",
+                                            :order => order, 
                                             :conditions => conditions.join(" AND "),
                                             :per_page => params[:iDisplayLength])
             end

metadata

@@ -2,7 +2,7 @@
 name: data_tables
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Duane Compton
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :development