data_table 0.3.3 → 0.3.4

data/lib/data_table/mongoid.rb

@@ -13,10 +13,12 @@ module DataTable
       end
 
       def _where_conditions raw_query, search_fields
-        return if (query = raw_query.gsub(/\//, "")).blank?
+        query = _sanitize raw_query
+        ::Rails.logger.info "#{raw_query.inspect} => #{query.inspect}"
+        return if (query = _sanitize raw_query).blank?
 
         if search_fields.size == 1
-          terms = query.strip.split(/\s+/)
+          terms = query.split(/\s+/)
 
           if terms.size == 1
             {search_fields.first => /#{terms.first}/i}
@@ -31,6 +33,10 @@ module DataTable
       def _order_by_fields params, fields
         [fields[params[:iSortCol_0].to_i], params[:sSortDir_0]]
       end
+
+      def _sanitize string
+        string.strip.gsub(/([\/\.\+\*\[\]\(\)])/) { "\\#{$1}" }
+      end
     end
   end
 end

data/lib/data_table/version.rb

@@ -1,3 +1,3 @@
 module DataTable
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/mongoid_data_table_spec.rb

@@ -25,10 +25,6 @@ describe DataTable do
       send(:_where_conditions, "", %w(foo bar baz)).should == nil
     end
 
-    it "should strip out slashes" do
-      send(:_where_conditions, "//", %w(foo bar baz)).should == nil
-    end
-
     it "should return a mongoid $or hash with an entry for each search field" do
       send(:_where_conditions, "q", %w(foo bar)).should == {"$or" => [{"foo" => /q/i}, {"bar" => /q/i}]}
     end
@@ -58,4 +54,13 @@ describe DataTable do
     end
 
   end
+
+  context "#_sanitize" do
+
+    it "should escape characters for the regex" do
+      send(:_sanitize, "  /.+*[]()  ").should == "\\/\\.\\+\\*\\[\\]\\(\\)"
+    end
+
+  end
+
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: data_table
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.3
+  hash: 27
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Jason Dew
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-05 00:00:00 -04:00
+date: 2011-09-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
@@ -32,6 +42,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
   type: :development
   version_requirements: *id002
@@ -43,6 +58,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 2
+        - 11
+        - 0
         version: 2.11.0
   type: :development
   version_requirements: *id003
@@ -54,6 +74,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id004
@@ -100,17 +125,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: data_table
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple data preparation from AR/Mongoid to the jQuery DataTables plugin