data_tables 0.1.0 → 0.1.1

data/lib/data_tables/data_tables_helper.rb

@@ -29,11 +29,14 @@ module DataTablesHelper
     columns = datatable[:attrs].keys.collect { |a| "<th>#{a}</th>" }.join
 
     index = 0
+    first_searchable_column_index = nil
     targets = datatable[:attrs].inject([]) do |memo, (column, searchable)|
+      first_searchable_column_index ||= index if searchable
       memo << index unless searchable
       index += 1
       memo
     end
+    options[:aaSorting] = [[first_searchable_column_index, 'asc']]
     options[:aoColumnDefs] ||= []
     options[:aoColumnDefs].unshift({
                                      :aTargets => targets,

data/lib/data_tables.rb

@@ -1,4 +1,3 @@
-require 'data_tables/data_tables_helper'
 module DataTablesController
   def self.included(cls)
     cls.extend(ClassMethods)
@@ -160,7 +159,9 @@ module DataTablesController
         if column.kind_of? Symbol # a column from the database, we don't need to do anything
           columns << {:name => column, :attribute => column}
         elsif column.kind_of? Hash
-          columns << {:name => column[:name], :special => column}
+	  col_hash = { :name => column[:name], :special => column }
+          col_hash[:attribute] = column[:attribute] if column[:attribute]
+          columns << col_hash
         end
       end
       columns
@@ -187,11 +188,7 @@ module DataTablesController
 
   # gets the value for a column and row
   def datatables_instance_get_value(instance, column)
-    if column[:attribute]
-      val = instance.send(column[:attribute].to_sym)
-      return I18n.t(val.to_s.to_sym, :default => val.to_s) if not val.blank?
-      return ''
-    elsif column[:special]
+    if column[:special]
       special = column[:special]
 
       if special[:method]
@@ -200,6 +197,10 @@ module DataTablesController
         proc = lambda { obj = instance; binding }
         return Kernel.eval(special[:eval], proc.call)
       end
+    elsif column[:attribute]
+      val = instance.send(column[:attribute].to_sym)
+      return I18n.t(val.to_s.to_sym, :default => val.to_s) if not val.blank?
+      return ''
     end
     return "value not found"
   end

metadata

@@ -1,10 +1,15 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: data_tables
-version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 25
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
-authors:
+authors: 
 - Duane Compton
 - Calvin Bascom
 - Yi Su
@@ -12,38 +17,55 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+
+date: 2012-10-10 00:00:00 -04:00
+default_executable: 
 dependencies: []
+
 description: Originally a plugin
 email: Duane.Compton@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/data_tables.rb
 - lib/data_tables/data_tables_helper.rb
+has_rdoc: true
 homepage: http://rubygems.org/gems/data_tables
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rails friendly interface into DataTables
 test_files: []
+