Move ColumnDateFilter module under Column namespace

Author: n-rodriguez

lib/ajax-datatables-rails/datatable/column.rb

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
-require 'ostruct'
-
 module AjaxDatatablesRails
   module Datatable
     class Column
       attr_reader :datatable, :index, :options
       attr_writer :search
 
       unless AjaxDatatablesRails.old_rails?
-        prepend ColumnDateFilter
+        prepend DateFilter
       end
 
       def initialize(datatable, index, options)
@@ -67,11 +65,6 @@ def use_regex?
         @view_column.fetch(:use_regex, true)
       end
 
-      # Add delimiter option to handle range search
-      def delimiter
-        @view_column[:delimiter] || '-'
-      end
-
       def table
         model = source.split('.').first.constantize
         model.arel_table rescue model

lib/ajax-datatables-rails/datatable/column/date_filter.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'ostruct'
+
+module AjaxDatatablesRails
+  module Datatable
+    class Column
+      module DateFilter
+
+        # Add delimiter option to handle range search
+        def delimiter
+          @view_column[:delimiter] || '-'
+        end
+
+        def empty_range_search?
+          (formated_value == delimiter) || (range_start.blank? && range_end.blank?)
+        end
+
+        # A range value is in form '<range_start><delimiter><range_end>'
+        # This returns <range_start>
+        def range_start
+          @range_start ||= formated_value.split(delimiter)[0]
+        end
+
+        # A range value is in form '<range_start><delimiter><range_end>'
+        # This returns <range_end>
+        def range_end
+          @range_end ||= formated_value.split(delimiter)[1]
+        end
+
+        # Do a range search
+        def date_range_search
+          return nil if empty_range_search?
+
+          if Time.zone
+            new_start = range_start.blank? ? Time.zone.parse('01/01/1970') : Time.zone.parse(range_start)
+            new_end = range_end.blank? ? Time.current : Time.zone.parse("#{range_end} 23:59:59")
+          else
+            new_start = range_start.blank? ? Time.parse('01/01/1970') : Time.parse(range_start)
+            new_end = range_end.blank? ? Time.current : Time.parse("#{range_end} 23:59:59")
+          end
+
+          table[field].between(OpenStruct.new(begin: new_start, end: new_end))
+        end
+
+        private
+
+        def non_regex_search
+          if cond == :date_range
+            date_range_search
+          else
+            super
+          end
+        end
+
+      end
+    end
+  end
+end

lib/ajax-datatables-rails/datatable/column_date_filter.rb

@@ -7,7 +7,7 @@ module AjaxDatatablesRails
   require 'ajax-datatables-rails/datatable/datatable'
   require 'ajax-datatables-rails/datatable/simple_search'
   require 'ajax-datatables-rails/datatable/simple_order'
-  require 'ajax-datatables-rails/datatable/column_date_filter' unless AjaxDatatablesRails.old_rails?
+  require 'ajax-datatables-rails/datatable/column/date_filter' unless AjaxDatatablesRails.old_rails?
   require 'ajax-datatables-rails/datatable/column'
   require 'ajax-datatables-rails/orm/active_record'
 end