fix the problem with multi-word model

Makoto NAKAYA · Makoto NAKAYA · commit e502fdaa52ac · 2014-06-12T13:50:52.000+09:00
diff --git a/lib/ajax-datatables-rails/base.rb b/lib/ajax-datatables-rails/base.rb
@@ -92,7 +92,7 @@ def build_conditions_for(query)
 
     def search_condition(column, value)
       model, column = column.split('.')
-      model = model.singularize.titleize.constantize
+      model = model.singularize.titleize.gsub( / /, '' ).constantize
       model.arel_table[column.to_sym].matches("%#{value}%")
     end
 
@@ -125,4 +125,4 @@ def sort_direction
       options.include?(params[:sSortDir_0]) ? params[:sSortDir_0].upcase : 'ASC'
     end
   end
-end
+end
diff --git a/spec/ajax-datatables-rails/ajax_datatables_rails_spec.rb b/spec/ajax-datatables-rails/ajax_datatables_rails_spec.rb
@@ -13,6 +13,12 @@ def self.arel_table
     end
   end
 
+  class UserData
+    def self.arel_table
+      { :bar => Column.new }
+    end
+  end
+
   params = {
     :sEcho => '0', :sSortDir_0 => 'asc',
     :iSortCol_0 => '1', :iDisplayStart => '11'
@@ -137,6 +143,19 @@ def self.arel_table
         datatable.send(:filter_records, records)
       end
     end
+
+    describe '#filter_records with multi word model' do
+      let(:records) { double('UserData', :where => []) }
+      let(:search_view) { double('view', :params => { :sSearch => 'bar' }) }
+
+      it 'applies search like functionality on a collection' do
+        datatable = AjaxDatatablesRails::Base.new(search_view)
+        datatable.stub(:searchable_columns) { ['user_datas.bar'] }
+
+        records.should_receive(:where)
+        datatable.send(:filter_records, records)
+      end
+    end
   end
 
   describe 'hook methods' do
