data_table 0.2.2 → 0.2.3

data/README.rdoc

@@ -47,8 +47,20 @@ in your view (assuming HAML):
 
     %tbody
 
-Patches welcome, enjoy!
+== Advanced Features
+
+=== Date fields
+
+In order to handle date fields properly, enclose the field name in an array along with a hash like so:
+
+  Provider.for_data_table(self, %w(name fein opened_on), ["name", "fein", ["opened_on", {:date => true}]]) { ... }
+
+=== Split fields
+
+To handle split fields, that is to handle searching for "x-y", add a hash with a split key:
+
+  Provider.for_data_table(self, %w(name fein suffix), ["name", ["fein", "suffix", {:split => "-"}]]) { ... }
 
 == Copyright
 
-Copyright (c) 2010 Jason Dew. See LICENSE for details.
+Copyright (c) 2010-2011 Jason Dew. See LICENSE for details.

data/lib/data_table/active_record.rb

@@ -58,19 +58,9 @@ module DataTable
           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
+            _split_where_condition query, field, options[:split]
+          elsif options[:date]
+            _date_where_condition query, field.first
           else
             _where_conditions(query, field, "AND")
           end
@@ -79,6 +69,31 @@ module DataTable
         end
       end
 
+      def _date_where_condition query, field
+        begin
+          ["#{field} = ?", Date.parse(query)]
+        rescue ArgumentError
+          []
+        end
+      end
+
+      def _split_where_condition query, fields, splitter
+        conditions = []
+        parameters = []
+        split_query = query.split splitter
+
+        if split_query.size == fields.size
+          fields.map do |f|
+            conditions << "UPPER(#{f}) LIKE ?"
+            parameters << "%#{split_query.shift.upcase}%"
+          end
+
+          ["(" + conditions.join(" AND ") + ")", *parameters]
+        else
+          []
+        end
+      end
+
       def _order_fields params, fields
         direction = params[:sSortDir_0] == "asc" ? "ASC" : "DESC"
         %{#{fields[params[:iSortCol_0].to_i]} #{direction}}

data/lib/data_table/version.rb

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

data/spec/active_record_data_table_spec.rb

@@ -38,6 +38,16 @@ describe DataTable do
       end
     end
 
+    context "with a date field" do
+      it "should return an AR array using equality and converting to a date" do
+        send(:_where_conditions, "2011/09/03", [["f1", {:date => true}]]).should == ["(f1 = ?)", Date.new(2011, 9, 3)]
+      end
+
+      it "should return an AR array properly not search date fields with non-dates" do
+        send(:_where_conditions, "foo", ["f1", ["f2", {:date => true}]]).should == ["(UPPER(f1) LIKE ?)", "%FOO%"]
+      end
+    end
+
     context "with 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%"]

metadata

@@ -2,7 +2,7 @@
 name: data_table
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jason Dew