Add Datatable#global_search_delimiter, add tests

Nicolas Rodriguez · Nicolas Rodriguez · commit 5149b5be74a9 · 2017-07-06T22:55:33.000+02:00
diff --git a/lib/ajax-datatables-rails/orm/active_record.rb b/lib/ajax-datatables-rails/orm/active_record.rb
@@ -2,6 +2,8 @@ module AjaxDatatablesRails
   module ORM
     module ActiveRecord
 
+      GLOBAL_SEARCH_DELIMITER = ' '.freeze
+
       def fetch_records
         get_raw_records
       end
@@ -33,7 +35,6 @@ def build_conditions
       end
 
       def build_conditions_for_datatable
-        search_for = datatable.search.value.split(' ')
         criteria = search_for.inject([]) do |crit, atom|
           search = Datatable::SimpleSearch.new({ value: atom, regex: datatable.search.regexp? })
           crit << searchable_columns.map do |simple_column|
@@ -47,6 +48,14 @@ def build_conditions_for_datatable
       def build_conditions_for_selected_columns
         search_columns.map(&:search_query).compact.reduce(:and)
       end
+
+      def search_for
+        datatable.search.value.split(global_search_delimiter)
+      end
+
+      def global_search_delimiter
+        GLOBAL_SEARCH_DELIMITER
+      end
     end
   end
 end
diff --git a/spec/ajax-datatables-rails/base_spec.rb b/spec/ajax-datatables-rails/base_spec.rb
@@ -86,26 +86,6 @@
           expect(item[2]).to eq 'Name &quot;&gt;&lt;img src=x onerror=alert(&quot;first_name&quot;)&gt;'
           expect(item[3]).to eq 'Name &quot;&gt;&lt;img src=x onerror=alert(&quot;last_name&quot;)&gt;'
         end
-
-        context 'with no searchable columns' do
-          let(:datatable) do
-            ComplexDatatableArray.new(view).tap do |datatable|
-              datatable.instance_variable_set :@searchable_columns, []
-            end
-          end
-
-          context 'when search value is comma-separated string' do
-            let(:view) { double('view', params: sample_params.merge(search: { value: 'one, two' })) }
-
-            it 'should return an array of arrays' do
-              create_list(:user, 5)
-              expect(datatable.data).to be_a(Array)
-              expect(datatable.data.size).to eq 5
-              item = datatable.data.first
-              expect(item).to be_a(Array)
-            end
-          end
-        end
       end
     end
 
diff --git a/spec/ajax-datatables-rails/orm/active_record_filter_records_spec.rb b/spec/ajax-datatables-rails/orm/active_record_filter_records_spec.rb
@@ -55,15 +55,44 @@
     end
 
     context 'with search query' do
-      before(:each) do
-        datatable.params[:search] = { value: "john", regex: "false" }
+      context 'when search value is a string' do
+        before(:each) do
+          datatable.params[:search] = { value: 'john', regex: 'false' }
+        end
+
+        it 'returns a filtering query' do
+          query = datatable.send(:build_conditions_for_datatable)
+          results = records.where(query).map(&:username)
+          expect(results).to include('johndoe')
+          expect(results).not_to include('msmith')
+        end
       end
 
-      it 'returns a filtering query' do
-        query = datatable.send(:build_conditions_for_datatable)
-        results = records.where(query).map(&:username)
-        expect(results).to include('johndoe')
-        expect(results).not_to include('msmith')
+      context 'when search value is space-separated string' do
+        before(:each) do
+          datatable.instance_variable_set :@searchable_columns, []
+          datatable.params[:search] = { value: 'foo bar', regex: 'false' }
+        end
+
+        it 'returns a filtering query' do
+          query = datatable.send(:build_conditions_for_datatable)
+          results = records.where(query).map(&:username)
+          expect(results).to eq ['johndoe', 'msmith']
+        end
+      end
+
+      context 'when search value is comma-separated string' do
+        before(:each) do
+          datatable.instance_variable_set :@searchable_columns, []
+          datatable.params[:search] = { value: 'foo, bar', regex: 'false' }
+          expect(datatable).to receive(:global_search_delimiter).and_return(', ')
+        end
+
+        it 'returns a filtering query' do
+          query = datatable.send(:build_conditions_for_datatable)
+          results = records.where(query).map(&:username)
+          expect(results).to eq ['johndoe', 'msmith']
+        end
       end
     end
   end
