rails-tables 0.5.0 → 0.5.1

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

data/app/tables/datatable.rb

@@ -19,7 +19,7 @@ class Datatable
     end
     unless self.initial_orderings.nil?
       self.class.initial_orderings.each do |column, order|
-        options["#{column}_ordering"] = order.to_s
+        options["#{column}_ordering".to_sym] = order.to_s
       end
     end
     options[:unsorted] = 'true'
@@ -85,17 +85,11 @@ private
       query = query.joins{ join.split('.').inject((join.present? ? self : nil), :__send__).outer }
       query = query.includes{ join.split('.').inject((join.present? ? self : nil), :__send__).outer }
     end
-    if sortable
-      sort_expression = sort
-      query = query.reorder{ my{sort_expression} }
-    end
     self.scopes.each do |scope|
       query = scope.call(query)
     end
-    if params[:sSearch].present?
-      search_expression = search(params[:sSearch])
-      query = query.where{ my{search_expression} }
-    end
+    query = query.reorder{ my{sort} } if sortable
+    query = query.where{ my{search(params[:sSearch])} } if searchable
     query = query.paginate(page: page, per_page: per_page)
   end
 

data/app/tables/datatable/searching.rb

@@ -5,7 +5,6 @@ module Datatable::Searching
     class_attribute :searches
     self.searches = []
     extend ClassMethods
-    include InstanceMethods
   end
 
   module ClassMethods
@@ -18,21 +17,27 @@ module Datatable::Searching
     end
   end
 
-  module InstanceMethods
-  private
-    # Introspect available searches as well as user defined ones
-    def searches
-      @searches ||= (self.columns.select(&:searchable).select{|c| c.column_source.present?}.map{|c| {column_source: c.column_source, method: c.method} } + self.class.searches).uniq
-    end
-    # Build Squeel Stubs for search
-    def search(terms)
-      terms = terms.split if terms.is_a? String
-      self.searches.map do |search|
-        terms.map do |word|
-          Squeel::Nodes::KeyPath.new(search[:column_source].split('.') << Squeel::Nodes::Stub.new(search[:method])) =~ "%#{word}%"
-        end.compact.inject(&:|)
+    attr_accessor :searches
+private
+  def searchable
+    params[:sSearch].present?
+  end
+  # Introspect available searches as well as user defined ones
+  def searchables
+    searches = self.columns.
+      select(&:searchable).
+      map{ |c| {column_source: c.column_source, method: c.method} }
+    searches += self.class.searches
+    @searches ||= searches.uniq
+  end
+  # Build Squeel Stubs for search
+  def search(terms)
+    terms = terms.split if terms.is_a? String
+    searchables.map do |search|
+      terms.map do |word|
+        Squeel::Nodes::KeyPath.new(search[:column_source].split('.') << Squeel::Nodes::Stub.new(search[:method])) =~ "%#{word}%"
       end.compact.inject(&:|)
-    end
+    end.compact.inject(&:|)
   end
 
 end

data/app/tables/datatable/sorting.rb

@@ -4,7 +4,6 @@ module Datatable::Sorting
   included do
     class_attribute :initial_orderings
     extend ClassMethods
-    include InstanceMethods
   end
 
   module ClassMethods
@@ -19,19 +18,17 @@ module Datatable::Sorting
 
   end
 
-  module InstanceMethods
-  private
-    # Check if table is sortable
-    def sortable
-      self.columns.map{ |column| column.sortable }[params[:iSortCol_0].to_i] unless params[:bUseDefaultSort] == 'true'
-    end
-    # Find column to search by and create a Squeel Order
-    def sort
-      column = self.columns[params[:iSortCol_0].to_i]
-      if column.sortable
-        direction = params[:sSortDir_0] == "asc" ? 1 : -1
-        Squeel::Nodes::KeyPath.new(column.column_source.split('.') << Squeel::Nodes::Order.new(column.method, direction))
-      end
+private
+  # Check if table is sortable
+  def sortable
+    self.columns.map{ |column| column.sortable }[params[:iSortCol_0].to_i] unless params[:bUseDefaultSort] == 'true'
+  end
+  # Find column to search by and create a Squeel Order
+  def sort
+    column = self.columns[params[:iSortCol_0].to_i]
+    if column.sortable
+      direction = params[:sSortDir_0] == "asc" ? 1 : -1
+      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.5.0"
+  VERSION = "0.5.1"
 end

metadata

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