data_table 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    data_table (0.2.7)
+    data_table (0.3.0)
       rails (~> 3.0.0)
 
 GEM

data/lib/data_table/mongoid.rb

@@ -16,7 +16,13 @@ module DataTable
         return if (query = raw_query.gsub(/\//, "")).blank?
 
         if search_fields.size == 1
-          {search_fields.first => /#{query}/i}
+          terms = query.strip.split(/\s/)
+
+          if terms.size == 1
+            {search_fields.first => /#{query}/i}
+          else
+            {search_fields.first => {"$all" => terms.map {|term| /#{term}/i }}}
+          end
         else
           {"$or" => search_fields.map {|field| {field => /#{query}/i} }}
         end

data/lib/data_table/version.rb

@@ -1,3 +1,3 @@
 module DataTable
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/mongoid_data_table_spec.rb

@@ -37,6 +37,12 @@ describe DataTable do
       send(:_where_conditions, "q", %w(f)).should == {"f" => /q/i}
     end
 
+    context "given multiple search terms" do
+      it "should require a match for each term when there is a single search field" do
+        send(:_where_conditions, "q1 q2", %w(f)).should == {"f" => {"$all" => [/q1/i, /q2/i]}}
+      end
+    end
+
   end
 
   context "#_order_by_fields" do

metadata

@@ -2,7 +2,7 @@
 name: data_table
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jason Dew