rails-tables 0.4.2 → 0.4.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.4.2
+Version: 0.4.3
 
 Please refer to the [RailsTables Wiki][wiki] for:
 

data/app/tables/column.rb

@@ -3,10 +3,10 @@ class Column
   attr_accessor :model, :name, :method, :column_source, :render_with, :sortable, :searchable, :blank_value
   def initialize(model, name, *args)
     self.model = model
-    self.name = name
+    self.name = name.to_s
 
     attributes = args.pop || {}
-    self.method = attributes.fetch(:method, name)
+    self.method = attributes.fetch(:method, name).to_s
     self.column_source = attributes.fetch(:column_source, '').to_s
     self.render_with = attributes.fetch(:render_with, :default_render)
     self.sortable = attributes.fetch(:sortable, true)

data/app/tables/datatable.rb

@@ -71,9 +71,19 @@ attr_accessor :joins
   def joins
     @joins ||= (self.columns.map(&:column_source).reject(&:blank?) + self.class.joins).uniq 
   end
+
+class_attribute :searches
+self.searches = []
+  def self.search_on(column_source, methods)
+    Array(methods).each do |method|
+      join column_source
+      self.searches += [{column_source: column_source.to_s, method: method.to_s}]
+    end
+  end
 attr_accessor :searches
   def searches
-    @searches ||= self.columns.select(&:searchable).select{|c| c.column_source.present?}
+    @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
 
 private
@@ -109,9 +119,9 @@ private
 
   def search(terms)
     terms = terms.split if terms.is_a? String
-    self.searches.map do |column|
+    self.searches.map do |search|
       terms.map do |word|
-        Squeel::Nodes::KeyPath.new(column.column_source.split('.') << Squeel::Nodes::Stub.new(column.method)) =~ "%#{word}%"
+        Squeel::Nodes::KeyPath.new(search[:column_source].split('.') << Squeel::Nodes::Stub.new(search[:method])) =~ "%#{word}%"
       end.compact.inject(&:|)
     end.compact.inject(&:|)
   end

data/lib/rails-tables/version.rb

@@ -1,3 +1,3 @@
 module RailsTables
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-tables
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors: