data_table 0.2.3 → 0.2.4

data/lib/data_table/mongoid.rb

@@ -10,7 +10,11 @@ module DataTable
       def _where_conditions raw_query, search_fields
         return if (query = raw_query.gsub(/\//, "")).blank?
 
-        {"$or" => search_fields.map {|field| {field => /#{query}/i} }}
+        if search_fields.size == 1
+          {search_fields.first => /#{query}/i}
+        else
+          {"$or" => search_fields.map {|field| {field => /#{query}/i} }}
+        end
       end
 
       def _order_by_fields params, fields

data/lib/data_table/version.rb

@@ -1,3 +1,3 @@
 module DataTable
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/mongoid_data_table_spec.rb

@@ -33,6 +33,10 @@ describe DataTable do
       send(:_where_conditions, "q", %w(foo bar)).should == {"$or" => [{"foo" => /q/i}, {"bar" => /q/i}]}
     end
 
+    it "should not use $or if there is only one search field" do
+      send(:_where_conditions, "q", %w(f)).should == {"f" => /q/i}
+    end
+
   end
 
   context "#_order_by_fields" do

metadata

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