data_table 0.2.0 → 0.2.1

data/lib/data_table/active_record.rb

@@ -28,10 +28,48 @@ module DataTable
         joins.to_a
       end
 
-      def _where_conditions query, search_fields
+      def _where_conditions query, search_fields, join_operator = "OR"
         return if query.blank?
 
-        [search_fields.map {|field| ["UPPER(#{field}) LIKE ?"] }.join(" OR "), *(["%#{query.upcase}%"] * search_fields.size)]
+        conditions = []
+        parameters = []
+
+        search_fields.map do |field|
+          clause = _where_condition(query, field)
+          next if clause.empty?
+          conditions << clause.shift
+          parameters += clause
+        end
+
+        ["(" + conditions.join(" #{join_operator} ") + ")", *parameters.flatten]
+      end
+
+      def _where_condition query, field
+        return [] if query.blank?
+
+        if field.is_a? Array
+          options = field.extract_options!
+
+          if options[:split]
+            conditions = []
+            parameters = []
+            split_query = query.split(options[:split])
+
+            if split_query.size == field.size
+              field.map do |f|
+                conditions << "UPPER(#{f}) LIKE ?"
+                parameters << "%#{split_query.shift.upcase}%"
+              end
+              ["(" + conditions.join(" AND ") + ")", *parameters]
+            else
+              []
+            end
+          else
+            _where_conditions(query, field, "AND")
+          end
+        else
+          ["UPPER(#{field}) LIKE ?", "%#{query.upcase}%"]
+        end
       end
 
       def _order_fields params, fields

data/lib/data_table/version.rb

@@ -1,3 +1,3 @@
 module DataTable
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/active_record_data_table_spec.rb

@@ -29,9 +29,30 @@ describe DataTable do
     end
 
     it "should return an AR array with an entry for each search field" do
-      send(:_where_conditions, "query", %w(foo bar)).should == ["UPPER(foo) LIKE ? OR UPPER(bar) LIKE ?", "%QUERY%", "%QUERY%"]
+      send(:_where_conditions, "query", %w(foo bar)).should == ["(UPPER(foo) LIKE ? OR UPPER(bar) LIKE ?)", "%QUERY%", "%QUERY%"]
     end
 
+    context "complex conditions" do
+      it "should return an AR array with an entry for each search field" do
+        send(:_where_conditions, "query", [%w(foo bar)]).should == ["((UPPER(foo) LIKE ? AND UPPER(bar) LIKE ?))", "%QUERY%", "%QUERY%"]
+      end
+
+      it "should return an AR array with an entry for each search field with a split query" do
+        send(:_where_conditions, "query-two", [['foo', 'bar', {:split => '-'}]]).should == ["((UPPER(foo) LIKE ? AND UPPER(bar) LIKE ?))", "%QUERY%", "%TWO%"]
+      end
+
+      it "should return an AR array with an entry for each search field with ands and ors" do
+        send(:_where_conditions, "query", ['foz', ['foo', 'bar']]).should == ["(UPPER(foz) LIKE ? OR (UPPER(foo) LIKE ? AND UPPER(bar) LIKE ?))", "%QUERY%", "%QUERY%", "%QUERY%"]
+      end
+
+      it "should return an AR array with an entry for each search field with ands and ors with a split query" do
+        send(:_where_conditions, "query-two", ['foz', ['foo', 'bar', {:split => '-'}]]).should == ["(UPPER(foz) LIKE ? OR (UPPER(foo) LIKE ? AND UPPER(bar) LIKE ?))", "%QUERY-TWO%", "%QUERY%", "%TWO%"]
+      end
+
+      it "should ignore a split query if the query isn't the size of the split fields" do
+        send(:_where_conditions, "query", ['foz', ['foo', 'bar', {:split => '-'}]]).should == ["(UPPER(foz) LIKE ?)", "%QUERY%"]
+      end
+    end
   end
 
   context "#_discover_joins" do

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: data_table
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jason Dew
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 -04:00
+date: 2011-06-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
@@ -42,12 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1923831917
-        segments: 
-        - 3
-        - 0
-        - pre
-        - 2
         version: 3.0.pre2
   type: :runtime
   version_requirements: *id002
@@ -59,11 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
   type: :development
   version_requirements: *id003
@@ -75,11 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 2
-        - 11
-        - 0
         version: 2.11.0
   type: :development
   version_requirements: *id004
@@ -91,11 +65,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id005
@@ -142,23 +111,17 @@ 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.4.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple data preparation from AR/Mongoid to the jQuery DataTables plugin