mongoid-data_table 1.0.0 → 1.0.1

data/lib/mongoid/data_table/proxy.rb

@@ -40,7 +40,7 @@ module Mongoid
       end
 
       def conditions
-        criteria.order_by(order_by_conditions).where(filter_conditions).where(filter_field_conditions)
+        criteria.clone.order_by(order_by_conditions).where(filter_conditions).where(filter_field_conditions)
       end
 
       def to_hash(&inline_block)
@@ -67,7 +67,7 @@ module Mongoid
       protected
 
       def order_by_conditions
-        order_params = params.select { |k,v| k =~ /(i|s)Sort(Col|Dir)_\d+/ }
+        order_params = params.dup.select { |k,v| k =~ /(i|s)Sort(Col|Dir)_\d+/ }
         return options[:order_by] || [] if order_params.blank?
         order_params.select { |k,v| k =~ /iSortCol_\d+/ }.sort_by(&:first).map do |col,field|
           i = /iSortCol_(\d+)/.match(col)[1]
@@ -78,28 +78,27 @@ module Mongoid
       def filter_conditions
         return unless (query = params[:sSearch]).present?
 
-        {"$or" => klass.data_table_searchable_fields.map { |field| { field => /#{query}/i} } }
+        b_regex = Boolean.set(params["bRegex"])
+
+        {
+          "$or" => klass.data_table_searchable_fields.map { |field|
+            { field => (b_regex === true) ? data_table_regex(query) : query }
+          }
+        }
       end
 
       def filter_field_conditions
-        order_params = params.select { |k,v| k =~ /sSearch_\d+/ }.inject({}) do |h,(k,v)|
+        params.dup.select { |k,v| k =~ /sSearch_\d+/ }.inject({}) do |h,(k,v)|
           i = /sSearch_(\d+)/.match(k)[1]
 
           field_name = fields[i.to_i]
-          field = klass.fields[field_name]
-          field_type = field.respond_to?(:type) ? field.type : String
+          #field = klass.fields.dup[field_name]
+          #field_type = field.respond_to?(:type) ? field.type : Object
 
           query = params["sSearch_#{i}"]
+          b_regex = Boolean.set(params["bRegex_#{i}"])
 
-          h[field_name] = (if [ Array, String, Symbol ].include?(field_type)
-              begin
-                Regexp.new(query)
-              rescue RegexpError
-                Regexp.new(Regexp.escape(query))
-              end
-            else
-              query
-            end) if query.present?
+          h[field_name] = (b_regex === true) ? data_table_regex(query) : query if query.present?
           h
         end
       end
@@ -126,6 +125,12 @@ module Mongoid
         end
       end
 
+      def data_table_regex(query)
+        Regexp.new(query, Regexp::IGNORECASE)
+      rescue RegexpError
+        Regexp.new(Regexp.escape(query), Regexp::IGNORECASE)
+      end
+
       def method_missing(method, *args, &block) #:nodoc:
         collection.send(method, *args, &block)
       end

data/lib/mongoid/data_table/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module DataTable
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: mongoid-data_table
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jason Dew
@@ -15,6 +15,7 @@ date: 2011-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -22,10 +23,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 3.0.0
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: will_paginate
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,10 +34,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 3.0.pre2
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: bson_ext
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,10 +45,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.3.0
   type: :development
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mongoid
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -55,10 +56,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.1
   type: :development
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mocha
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,10 +67,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.12
   type: :development
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,10 +78,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.6.0
   type: :development
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: shoulda
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -88,10 +89,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.11.3
   type: :development
-  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: watchr
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -99,7 +100,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.7"
   type: :development
-  prerelease: false
   version_requirements: *id008
 description: Simple data preparation from Mongoid to the jQuery DataTables plugin
 email: 
@@ -145,18 +145,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1445524431539221366
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1445524431539221366
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
@@ -172,3 +166,4 @@ test_files:
 - spec/unit/mongoid-data_table_spec.rb
 - spec/unit/mongoid/data_table/proxy_spec.rb
 - spec/unit/mongoid/data_table_spec.rb
+has_rdoc: