data_table 0.2.1 → 0.2.2

data/lib/data_table/active_record.rb

@@ -31,17 +31,24 @@ module DataTable
       def _where_conditions query, search_fields, join_operator = "OR"
         return if query.blank?
 
-        conditions = []
-        parameters = []
-
-        search_fields.map do |field|
-          clause = _where_condition(query, field)
-          next if clause.empty?
-          conditions << clause.shift
-          parameters += clause
+        all_conditions = []
+        all_parameters = []
+
+        query.split.each do |term|
+          conditions = []
+          parameters = []
+
+          search_fields.each do |field|
+            next if (clause = _where_condition(term, field.dup)).empty?
+            conditions << clause.shift
+            parameters += clause
+          end
+
+          all_conditions << conditions
+          all_parameters << parameters
         end
 
-        ["(" + conditions.join(" #{join_operator} ") + ")", *parameters.flatten]
+        [all_conditions.map {|conditions| "(" + conditions.join(" #{join_operator} ") + ")" }.join(" AND "), *all_parameters.flatten]
       end
 
       def _where_condition query, field

data/lib/data_table/version.rb

@@ -1,3 +1,3 @@
 module DataTable
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/active_record_data_table_spec.rb

@@ -32,7 +32,13 @@ describe DataTable do
       send(:_where_conditions, "query", %w(foo bar)).should == ["(UPPER(foo) LIKE ? OR UPPER(bar) LIKE ?)", "%QUERY%", "%QUERY%"]
     end
 
-    context "complex conditions" do
+    context "with multiple terms" do
+      it "should return an AR array with conditions for all combinations of terms and fields" do
+        send(:_where_conditions, "q1 q2", %w(f1 f2)).should == ["(UPPER(f1) LIKE ? OR UPPER(f2) LIKE ?) AND (UPPER(f1) LIKE ? OR UPPER(f2) LIKE ?)", "%Q1%", "%Q1%", "%Q2%", "%Q2%"]
+      end
+    end
+
+    context "with complex conditions" do
       it "should return an AR array with an entry for each search field" do
         send(:_where_conditions, "query", [%w(foo bar)]).should == ["((UPPER(foo) LIKE ? AND UPPER(bar) LIKE ?))", "%QUERY%", "%QUERY%"]
       end
@@ -52,6 +58,11 @@ describe DataTable do
       it "should ignore a split query if the query isn't the size of the split fields" do
         send(:_where_conditions, "query", ['foz', ['foo', 'bar', {:split => '-'}]]).should == ["(UPPER(foz) LIKE ?)", "%QUERY%"]
       end
+
+      it "should still work with multiple terms" do
+        send(:_where_conditions, "q1 q-2", ['F1', ['P1', 'P2', {:split => '-'}]]).should ==
+          ["(UPPER(F1) LIKE ?) AND (UPPER(F1) LIKE ? OR (UPPER(P1) LIKE ? AND UPPER(P2) LIKE ?))", "%Q1%", "%Q-2%", "%Q%", "%2%"]
+      end
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: data_table
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jason Dew
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-12 00:00:00 -04:00
+date: 2011-09-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency