rails-tables 0.6.2 → 0.6.3

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.2
+Version: 0.6.3
 
 Please refer to the [RailsTables Wiki][wiki] for:
 

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

@@ -5,11 +5,7 @@ $ ->
     $(@).data('unsorted', true)
 
 @rails_tables = {}
-@rails_tables.columns = ->
-  for column, order of $(@).data() when /_ordering/.test(column)
-    asSorting: [ order ], aTargets: [ column.substring(0, column.length - "_ordering".length) ]
-
-@rails_tables.params = (aoData) ->
-  aoData.push
-    name: 'bUseDefaultSort', value: if $(@).data('unsorted') then true else false
-
+@rails_tables.params = (datatable) ->
+  (aoData) ->
+    aoData.push
+      name: 'bUseDefaultSort', value: if $(datatable).data('unsorted') then true else false

data/lib/rails-tables/datatable.rb

@@ -25,11 +25,6 @@ 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
-    end
     options[:unsorted] = 'true'
     options
   end
@@ -53,10 +48,10 @@ class RailsTables::Datatable
   class_attribute :source, :source_factory
   # Set source url for this table
   def self.source_path=(source)
-    self.source_factory = source
+    self.source_factory = source if source.present?
   end
   def self.source
-    @source ||= Rails.application.routes.url_helpers.send(self.source_factory, format: "json")
+    @source ||= Rails.application.routes.url_helpers.send(self.source_factory, format: "json") if self.source_factory.present?
   end
 
   class_attribute :columns, :column_factory

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

@@ -2,18 +2,14 @@ module RailsTables::Sorting
   extend ActiveSupport::Concern
 
   included do
-    class_attribute :initial_orderings
+    class_attribute :initial_order
     extend ClassMethods
   end
 
   module ClassMethods
     # Gotta set these to fight against datatables' default ordering on first column
     def initial_ordering(orderings)
-      self.set_initial_orderings orderings
-    end
-    def set_initial_orderings(orderings)
-      self.initial_orderings = {} if self.initial_orderings.nil?
-      self.initial_orderings.merge! orderings
+      self.initial_order = orderings
     end
 
   end
@@ -22,13 +18,22 @@ module RailsTables::Sorting
 private
   # Check if table is sortable
   def sortable
-    self.columns.map{ |column| column.sortable }[params[:iSortCol_0].to_i] unless params[:bUseDefaultSort] == 'true'
+    if params[:bUseDefaultSort] == 'true'
+      true
+    else
+      self.columns.map(&:sortable)[params[:iSortCol_0].to_i]
+    end
   end
   # Find column to search by and create a Squeel Order
   def sort
-    column = self.columns[params[:iSortCol_0].to_i]
-    if column.sortable
+    if params[:bUseDefaultSort] == 'true' and self.initial_order.present?
+      column = self.columns.select{|c|c.name == self.initial_order.keys.first.to_s}.first
+      direction = self.initial_order.values.first.to_s == "asc" ? 1 : -1
+    else
+      column = self.columns[params[:iSortCol_0].to_i]
       direction = params[:sSortDir_0] == "asc" ? 1 : -1
+    end
+    if column.sortable
       Squeel::Nodes::KeyPath.new(column.column_source.split('.') << Squeel::Nodes::Order.new(Squeel::Nodes::Stub.new(column.method), direction))
     end
   end

data/lib/rails-tables/version.rb

@@ -1,3 +1,3 @@
 module RailsTables
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

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