rails-tables 0.4.0 → 0.4.1

data/app/tables/column.rb

@@ -7,7 +7,7 @@ class Column
 
     attributes = args.pop || {}
     self.method = attributes.fetch(:method, name)
-    self.column_source = attributes.fetch(:column_source, '')
+    self.column_source = attributes.fetch(:column_source, '').to_s
     self.render_with = attributes.fetch(:render_with, :default_render)
     self.sortable = attributes.fetch(:sortable, true)
     self.searchable = attributes.fetch(:searchable, true)
@@ -39,7 +39,7 @@ class Column
     view.link_to property, property if not property.nil?
   end
   def related_link_list(view, objects)
-    objects.map{ |object| related_link(view, object) }.reject(&:nil?).join(', ') if not objects.nil?
+    objects.map{ |object| related_link(view, object).strip }.reject(&:blank?).join(', ') if not objects.nil?
   end
   def time(view, object)
     property = object.try(:send, self.method)

data/app/tables/datatable.rb

@@ -62,15 +62,9 @@ class_attribute :columns, :column_factory
     @columns ||= self.column_factory.map{ |new_column| Column.new(self.model, new_column[:name], new_column[:args]) }
   end
 
-class_attribute :match_any
-  self.match_any = true
-  def self.match_all_columns
-    self.match_any = false
-  end
-
 attr_accessor :joins
   def joins
-    @joins ||= self.columns.map(&:column_source).uniq.reject(&:blank?)
+    @joins ||= self.columns.map(&:column_source).reject(&:blank?).uniq
   end
 attr_accessor :searches
   def searches
@@ -80,13 +74,13 @@ attr_accessor :searches
 private
 
   def objects
-    query = self.model
+    query = self.model.uniq
     self.joins.each do |join|
-      query = query.uniq.includes{ join.split('.').inject((strs.present? ? self : nil), :__send__).outer }
+      query = query.joins{ join.split('.').inject(self, :__send__).outer }.includes{ join.split('.').inject(self, :__send__).outer }
     end
     if sortable
       sort_expression = sort
-      query = query.reorder{ my{sort_expression} }#("#{sort_column} #{sort_direction}")
+      query = query.reorder{ my{sort_expression} }
     end
     self.scopes.each do |scope|
       query = scope.call(query)

data/lib/rails-tables/version.rb

@@ -1,3 +1,3 @@
 module RailsTables
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

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