datatablesnet 1.0 → 1.1

data/lib/datatablesnet/datatable.rb

@@ -1,4 +1,6 @@
 require 'datatablesnet/types'
+require 'datatablesnet/hash_sql'
+require 'uri'
 
 module Datatable
 
@@ -70,16 +72,19 @@ module Datatable
 
     options =
       {
-        :show_actions       => true,
+        :show_actions       => false,
         :per_page           => 25,
         :toolbar_external   => false
       }.merge(options)
 
+    url = URI::split(options[:data_url]);
+
     index = 0
     columns.each do |column|
       column[:label] = field_to_label(column[:field]) unless column[:label].present?
       if options[:data_url].present?
-        options[:data_url] << "?" if column == columns.first
+        options[:data_url] << "?" if column == columns.first and url[7] == nil
+        options[:data_url] << "&" if column == columns.first and url[7] != nil
         options[:data_url] << "column_field_#{index.to_s}=#{column[:field]}"
         if column[:view_link].present?
           options[:data_url] << "&column_view_link_#{index.to_s}=#{column[:view_link]}"
@@ -205,6 +210,24 @@ module Datatable
       end
     end
 
+    search_by = {}
+    params.each do |key, value|
+      if key =~ /query_.*/ and !value.empty?
+        if key =~ /.*_to/
+          field_name = key[6..-4]
+          search_by[field_name] = {} unless search_by[field_name].present?
+          search_by[field_name][:to] = Date.parse(value)
+        elsif key =~ /.*_from/
+          field_name = key[6..-6]
+          search_by[field_name] = {} unless search_by[field_name].present?
+          search_by[field_name][:from] = Date.parse(value)
+        else
+          search_by[key[6..-1]] = value
+        end
+      end
+    end
+
+    grid_options[:search_by] = search_by
     grid_options[:columns] = columns
     grid_options[:order_by] = order_by
     grid_options[:filter_by] = filter_by
@@ -219,8 +242,10 @@ module Datatable
 
 
   def find(klass, params={}, options = {})
+    puts params.to_json
     field_filter_where = {}
     all_filter_where = {}
+    search_filter_where = {}
 
     grid_options = parse_params params
 
@@ -230,12 +255,14 @@ module Datatable
 
     # Build order by
     grid_options[:order_by].each do |column, order|
-      if options[:order].present?
-        options[:order] << ", "
-      else
-        options[:order] = ""
+      if column
+        if options[:order].present?
+          options[:order] << ", "
+        else
+          options[:order] = ""
+        end
+        options[:order] << "#{column} #{order}"
       end
-      options[:order] << "#{column} #{order}"
     end
 
     # Build filter by
@@ -252,8 +279,21 @@ module Datatable
       end
     end
 
-    if !field_filter_where.empty? or !all_filter_where.empty?
-      options[:conditions] = [field_filter_where.sql_like, all_filter_where.sql_or.sql_like].sql_and.sql_where
+    grid_options[:search_by].each do |column, value|
+      if value.instance_of?(Hash)
+        search_filter_where[column] = (value[:from]..value[:to])
+      else
+        search_filter_where[column] = value
+      end
+    end
+
+    if !field_filter_where.empty? or !all_filter_where.empty? or !search_filter_where.empty?
+      sql_where = [field_filter_where.sql_like, all_filter_where.sql_or.sql_like, search_filter_where.sql_and].sql_and.sql_where
+      if options[:conditions].present?
+        options[:conditions] << " and (" << sql_where << ")"
+      else
+        options[:conditions] = sql_where
+      end
     end
 
     puts options[:conditions]

data/lib/datatablesnet/hash_sql.rb

@@ -45,7 +45,11 @@ module HashSql
             where_string << " #{sql_operator ? sql_operator : 'and'} "
           end
 
-          if self.sql_comparator = "like"
+          if value.instance_of?(Range)
+            where_string << "(#{name} BETWEEN ? AND ?)"
+            values << value.min
+            values << value.max
+          elsif self.sql_comparator = "like"
             where_string <<  "#{name} LIKE ?"
             values << '%' + value + '%'
           else

data/lib/datatablesnet/version.rb

@@ -1,3 +1,3 @@
 module Datatablesnet
-  VERSION = "1.0"
+  VERSION = "1.1"
 end

metadata

@@ -1,12 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: datatablesnet
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
-  - 0
-  version: "1.0"
+  - 1
+  version: "1.1"
 platform: ruby
 authors: 
 - Matt Fields
@@ -14,7 +13,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-30 00:00:00 Z
+date: 2011-08-09 00:00:00 +03:00
+default_executable: 
 dependencies: []
 
 description: Component abstraction for datatables.net
@@ -36,6 +36,7 @@ files:
 - lib/datatablesnet/railtie.rb
 - lib/datatablesnet/types.rb
 - lib/datatablesnet/version.rb
+has_rdoc: true
 homepage: https://github.com/IslandPort/datatablesnet
 licenses: []
 
@@ -45,27 +46,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   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: 
-rubygems_version: 1.7.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Datatables.net component for rails