data_table 0.4.2 → 0.4.3

data/.gitignore

@@ -2,3 +2,4 @@ pkg/*
 *.gem
 .bundle
 *.swp
+bin

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.2-p290@data_table
+rvm use 1.9.3@data_table

data/Gemfile.lock

@@ -1,76 +1,76 @@
 PATH
   remote: .
   specs:
-    data_table (0.4.1)
+    data_table (0.4.3)
       rails (~> 3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.3)
-      actionpack (= 3.2.3)
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
       mail (~> 2.4.4)
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    builder (3.0.0)
+    builder (3.0.4)
     diff-lcs (1.1.2)
     erubis (2.7.0)
     hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.6.6)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
-    multi_json (1.2.0)
+    mime-types (1.19)
+    multi_json (1.3.6)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.3)
-      actionmailer (= 3.2.3)
-      actionpack (= 3.2.3)
-      activerecord (= 3.2.3)
-      activeresource (= 3.2.3)
-      activesupport (= 3.2.3)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
       bundler (~> 1.0)
-      railties (= 3.2.3)
-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -86,16 +86,16 @@ GEM
       rspec-core (~> 2.0.1)
       rspec-expectations (~> 2.0.1)
     shoulda (2.11.3)
-    sprockets (2.1.2)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
+    thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
+    tzinfo (0.3.34)
 
 PLATFORMS
   ruby

data/lib/data_table/mongoid.rb

@@ -25,7 +25,12 @@ module DataTable
             {search_fields.first => {"$all" => terms.map {|term| /#{term}/i }}}
           end
         else
-          {"$or" => search_fields.map {|field| {field => /#{query}/i} }}
+          terms = query.split(/\s+/)
+          terms_and_fields = terms.map do |term|
+            {"$or" => search_fields.map {|field| {field => /#{term}/i} }}
+          end
+
+          {"$and" => terms_and_fields}
         end
       end
 

data/lib/data_table/version.rb

@@ -1,3 +1,3 @@
 module DataTable
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,67 +1,87 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: data_table
-version: !ruby/object:Gem::Version
-  version: 0.4.2
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 3
+  version: 0.4.3
 platform: ruby
-authors:
+authors: 
 - Jason Dew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &70103816205680 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+
+date: 2012-10-31 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  name: rails
+  requirement: *id001
   prerelease: false
-  version_requirements: *70103816205680
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70103816204540 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-  type: :development
+  name: rspec
+  requirement: *id002
   prerelease: false
-  version_requirements: *70103816204540
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &70103816203880 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 11
+        - 0
         version: 2.11.0
-  type: :development
+  name: shoulda
+  requirement: *id003
   prerelease: false
-  version_requirements: *70103816203880
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: &70103816203420 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-  type: :development
+  name: rr
+  requirement: *id004
   prerelease: false
-  version_requirements: *70103816203420
 description: Simple data preparation from AR/Mongoid to the jQuery DataTables plugin
-email:
+email: 
 - jason.dew@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -82,31 +102,37 @@ files:
 - spec/data_table_spec.rb
 - spec/mongoid_data_table_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://rubygems.org/gems/data_table
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: data_table
-rubygems_version: 1.8.10
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple data preparation from AR/Mongoid to the jQuery DataTables plugin
-test_files:
+test_files: 
 - spec/active_record_data_table_spec.rb
 - spec/data_table_spec.rb
 - spec/mongoid_data_table_spec.rb