rails-tables 0.6.4 → 0.6.5

data/README.md

@@ -12,7 +12,7 @@ A clean jQuery datatables DSL
 [jqd-railscast]: http://railscasts.com/episodes/340-datatables (Episode #340: Datatables)
 [squeel]: https://github.com/ernie/squeel (Squeel: ActiveRecord 3, improved)
 
-Version: 0.6.4
+Version: 0.6.5
 
 Please refer to the [RailsTables Wiki][wiki] for:
 

data/app/assets/javascripts/rails-tables.js.coffee

@@ -6,8 +6,8 @@ $ ->
 
 @rails_tables = {}
 @rails_tables.columns = (datatable)->
-  for column, order of $(datatable).data() when /_ordering/.test(column)
-    {asSorting: [ order ], aTargets: [ column.substring(0, column.length - "_ordering".length) ]}
+  console.log $(datatable).data().order_column, $(datatable).data().order_direction
+  asSorting: [ $(datatable).data().order_direction ], aTargets: [ $(datatable).data().order_column ]
 @rails_tables.params = (datatable) ->
   (aoData) ->
     aoData.push

data/lib/rails-tables/datatable.rb

@@ -25,10 +25,9 @@ class RailsTables::Datatable
     if self.class.source?
       options[:source] = self.class.source
     end
-    unless self.initial_orderings.nil?
-      self.class.initial_orderings.each do |column, order|
-        options["#{column}_ordering".to_sym] = order.to_s
-      end
+    if self.initial_order.present?
+      options[:order_column] = self.columns.select{|c|c.name==self.class.initial_order.first[0].to_s}.first.order
+      options[:order_direction] = self.class.initial_order.first[1]
     end
     options[:unsorted] = 'true'
     options
@@ -68,7 +67,7 @@ class RailsTables::Datatable
   end
   # Lazily instanciates and caches columns
   def columns
-    @columns ||= self.column_factory.map{ |new_column| RailsTables::Column.new(self.class.name, self.model, new_column[:name], new_column[:args]) }
+    @columns ||= self.column_factory.map.with_index{ |new_column, index| RailsTables::Column.new(self.class.name, self.model, new_column[:name], index, new_column[:args]) }
   end
 
   class_attribute :joins

data/lib/rails-tables/datatable/column.rb

@@ -1,11 +1,12 @@
 class RailsTables::Column
 
-  attr_accessor :table_name, :model, :name, :method, :column_source, :render_with, :blank_value, :virtual, :sortable, :searchable
+  attr_accessor :table_name, :model, :name, :order, :method, :column_source, :render_with, :blank_value, :virtual, :sortable, :searchable
 
-  def initialize(table_name, model, name, *args)
+  def initialize(table_name, model, name, order, *args)
     self.table_name = table_name
     self.model = model
     self.name = name
+    self.order = order
 
     attributes = args.pop || {}
     self.method = attributes.fetch(:method, name).to_s

data/lib/rails-tables/version.rb

@@ -1,3 +1,3 @@
 module RailsTables
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-tables
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails