Test with Rails 4.1.15

Nicolas Rodriguez · Nicolas Rodriguez · commit bc4ef01613dc · 2017-05-13T03:41:15.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 # Ignore Gemfile.lock
 /Gemfile.lock
 /gemfiles/*.lock
+/gemfiles/.bundle
 
 # Ignore test files
 /coverage
diff --git a/.travis.yml b/.travis.yml
@@ -3,13 +3,21 @@ language: ruby
 sudo: required
 cache: bundler
 rvm:
-  - 2.4.1
-  - 2.3.4
   - 2.2.7
+  - 2.3.4
 gemfile:
+  - gemfiles/rails_4.1.15.gemfile
   - gemfiles/rails_4.2.8.gemfile
   - gemfiles/rails_5.0.2.gemfile
   - gemfiles/rails_5.1.0.gemfile
+matrix:
+  include:
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails_4.2.8.gemfile
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails_5.0.2.gemfile
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails_5.1.0.gemfile
 after_success:
   - bundle exec codeclimate-test-reporter
 services:
diff --git a/Appraisals b/Appraisals
@@ -1,4 +1,5 @@
 RAILS_VERSIONS = %w(
+  4.1.15
   4.2.8
   5.0.2
   5.1.0
diff --git a/ajax-datatables-rails.gemspec b/ajax-datatables-rails.gemspec
@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
   s.description = %q{A wrapper around datatable's ajax methods that allow synchronization with server-side pagination in a rails app}
   s.license     = 'MIT'
 
-  s.add_dependency 'railties', '>= 4.2'
+  s.add_dependency 'railties', '>= 4.1'
 
-  s.add_development_dependency 'rails', '>= 4.2'
+  s.add_development_dependency 'rails', '>= 4.1'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'pg'
   s.add_development_dependency 'mysql2'
diff --git a/gemfiles/rails_4.1.15.gemfile b/gemfiles/rails_4.1.15.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "4.1.15"
+
+group :test do
+  gem "codeclimate-test-reporter", "~> 1.0.0"
+end
+
+gemspec path: "../"
diff --git a/lib/ajax-datatables-rails.rb b/lib/ajax-datatables-rails.rb
@@ -5,6 +5,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.rails_41?
   require 'ajax-datatables-rails/datatable/column'
   require 'ajax-datatables-rails/orm/active_record'
 end
diff --git a/lib/ajax-datatables-rails/config.rb b/lib/ajax-datatables-rails/config.rb
@@ -15,6 +15,10 @@ def self.config
     @config ||= AjaxDatatablesRails::Configuration.new
   end
 
+  def self.rails_41?
+    Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR == 1
+  end
+
   class Configuration
     include ActiveSupport::Configurable
 
diff --git a/lib/ajax-datatables-rails/datatable/column.rb b/lib/ajax-datatables-rails/datatable/column.rb
@@ -5,6 +5,10 @@ module Datatable
     class Column
       attr_reader :datatable, :index, :options
 
+      unless AjaxDatatablesRails.rails_41?
+        prepend ColumnDateFilter
+      end
+
       def initialize(datatable, index, options)
         @datatable, @index, @options = datatable, index, options
         @view_column = datatable.view_columns[options["data"].to_sym]
@@ -113,8 +117,6 @@ def non_regex_search
           filter(formated_value)
         when :eq, :not_eq, :lt, :gt, :lteq, :gteq, :in
           numeric_search
-        when :date_range
-          date_range_search
         when :null_value
           null_value_search
         when :start_with
@@ -141,30 +143,6 @@ def casted_column
         ::Arel::Nodes::NamedFunction.new('CAST', [table[field].as(typecast)])
       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?
-        new_start = range_start.blank? ? DateTime.parse('01/01/1970') : DateTime.parse(range_start)
-        new_end   = range_end.blank?   ? DateTime.current : DateTime.parse("#{range_end} 23:59:59")
-        table[field].between(OpenStruct.new(begin: new_start, end: new_end))
-      end
-
       def null_value_search
         if formated_value == '!NULL'
           table[field].not_eq(nil)
diff --git a/lib/ajax-datatables-rails/datatable/column_date_filter.rb b/lib/ajax-datatables-rails/datatable/column_date_filter.rb
@@ -0,0 +1,41 @@
+module AjaxDatatablesRails
+  module Datatable
+    module ColumnDateFilter
+
+      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?
+        new_start = range_start.blank? ? DateTime.parse('01/01/1970') : DateTime.parse(range_start)
+        new_end   = range_end.blank?   ? DateTime.current : DateTime.parse("#{range_end} 23:59:59")
+        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
diff --git a/lib/ajax-datatables-rails/datatable/datatable.rb b/lib/ajax-datatables-rails/datatable/datatable.rb
@@ -18,7 +18,7 @@ def orderable?
       end
 
       def orders
-        @orders ||= options[:order].to_unsafe_h.with_indifferent_access.map do |_, order_options|
+        @orders ||= get_param(:order).map do |_, order_options|
           SimpleOrder.new(self, order_options)
         end
       end
@@ -40,7 +40,7 @@ def search
       # ----------------- COLUMN METHODS --------------------
 
       def columns
-        @columns ||= options[:columns].to_unsafe_h.with_indifferent_access.map do |index, column_options|
+        @columns ||= get_param(:columns).map do |index, column_options|
           Column.new(datatable, index, column_options)
         end
       end
@@ -66,6 +66,14 @@ def page
       def per_page
         options.fetch(:length, 10).to_i
       end
+
+      def get_param(param)
+        if AjaxDatatablesRails.rails_41?
+          options[param]
+        else
+          options[param].to_unsafe_h.with_indifferent_access
+        end
+      end
     end
   end
 end
diff --git a/spec/ajax-datatables-rails/orm/active_record_filter_records_spec.rb b/spec/ajax-datatables-rails/orm/active_record_filter_records_spec.rb
@@ -172,80 +172,82 @@
   describe 'filter conditions' do
     let(:datatable) { ReallyComplexDatatable.new(view) }
 
-    describe 'it can filter records with condition :range' do
-      before(:each) do
-        create(:user, username: 'johndoe', email: 'johndoe@example.com', last_name: 'Doe', created_at: '01/01/2000')
-        create(:user, username: 'msmith', email: 'mary.smith@example.com', last_name: 'Smith', created_at: '01/02/2000')
-      end
-
-      context 'when range is empty' do
-        it 'should not filter records' do
-          datatable.params[:columns]['5'][:search][:value] = '-'
-          expect(datatable.data.size).to eq 2
-          item = datatable.data.first
-          expect(item[:last_name]).to eq 'Doe'
+    unless AjaxDatatablesRails.rails_41?
+      describe 'it can filter records with condition :date_range' do
+        before(:each) do
+          create(:user, username: 'johndoe', email: 'johndoe@example.com', last_name: 'Doe', created_at: '01/01/2000')
+          create(:user, username: 'msmith', email: 'mary.smith@example.com', last_name: 'Smith', created_at: '01/02/2000')
         end
-      end
 
-      context 'when start date is filled' do
-        it 'should filter records created after this date' do
-          datatable.params[:columns]['5'][:search][:value] = '31/12/1999-'
-          expect(datatable.data.size).to eq 2
-        end
-      end
-
-      context 'when end date is filled' do
-        it 'should filter records created before this date' do
-          datatable.params[:columns]['5'][:search][:value] = '-31/12/1999'
-          expect(datatable.data.size).to eq 0
-        end
-      end
-
-      context 'when both date are filled' do
-        it 'should filter records created between the range' do
-          datatable.params[:columns]['5'][:search][:value] = '01/12/1999-15/01/2000'
-          expect(datatable.data.size).to eq 1
-        end
-      end
-
-      context 'when another filter is active' do
         context 'when range is empty' do
-          it 'should filter records' do
-            datatable.params[:columns]['0'][:search][:value] = 'doe'
+          it 'should not filter records' do
             datatable.params[:columns]['5'][:search][:value] = '-'
-            expect(datatable.data.size).to eq 1
+            expect(datatable.data.size).to eq 2
             item = datatable.data.first
             expect(item[:last_name]).to eq 'Doe'
           end
         end
 
         context 'when start date is filled' do
-          it 'should filter records' do
-            datatable.params[:columns]['0'][:search][:value] = 'doe'
-            datatable.params[:columns]['5'][:search][:value] = '01/12/1999-'
-            expect(datatable.data.size).to eq 1
-            item = datatable.data.first
-            expect(item[:last_name]).to eq 'Doe'
+          it 'should filter records created after this date' do
+            datatable.params[:columns]['5'][:search][:value] = '31/12/1999-'
+            expect(datatable.data.size).to eq 2
           end
         end
 
         context 'when end date is filled' do
-          it 'should filter records' do
-            datatable.params[:columns]['0'][:search][:value] = 'doe'
-            datatable.params[:columns]['5'][:search][:value] = '-15/01/2000'
-            expect(datatable.data.size).to eq 1
-            item = datatable.data.first
-            expect(item[:last_name]).to eq 'Doe'
+          it 'should filter records created before this date' do
+            datatable.params[:columns]['5'][:search][:value] = '-31/12/1999'
+            expect(datatable.data.size).to eq 0
           end
         end
 
         context 'when both date are filled' do
-          it 'should filter records' do
-            datatable.params[:columns]['0'][:search][:value] = 'doe'
+          it 'should filter records created between the range' do
             datatable.params[:columns]['5'][:search][:value] = '01/12/1999-15/01/2000'
             expect(datatable.data.size).to eq 1
-            item = datatable.data.first
-            expect(item[:last_name]).to eq 'Doe'
+          end
+        end
+
+        context 'when another filter is active' do
+          context 'when range is empty' do
+            it 'should filter records' do
+              datatable.params[:columns]['0'][:search][:value] = 'doe'
+              datatable.params[:columns]['5'][:search][:value] = '-'
+              expect(datatable.data.size).to eq 1
+              item = datatable.data.first
+              expect(item[:last_name]).to eq 'Doe'
+            end
+          end
+
+          context 'when start date is filled' do
+            it 'should filter records' do
+              datatable.params[:columns]['0'][:search][:value] = 'doe'
+              datatable.params[:columns]['5'][:search][:value] = '01/12/1999-'
+              expect(datatable.data.size).to eq 1
+              item = datatable.data.first
+              expect(item[:last_name]).to eq 'Doe'
+            end
+          end
+
+          context 'when end date is filled' do
+            it 'should filter records' do
+              datatable.params[:columns]['0'][:search][:value] = 'doe'
+              datatable.params[:columns]['5'][:search][:value] = '-15/01/2000'
+              expect(datatable.data.size).to eq 1
+              item = datatable.data.first
+              expect(item[:last_name]).to eq 'Doe'
+            end
+          end
+
+          context 'when both date are filled' do
+            it 'should filter records' do
+              datatable.params[:columns]['0'][:search][:value] = 'doe'
+              datatable.params[:columns]['5'][:search][:value] = '01/12/1999-15/01/2000'
+              expect(datatable.data.size).to eq 1
+              item = datatable.data.first
+              expect(item[:last_name]).to eq 'Doe'
+            end
           end
         end
       end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`RAILS_VERSIONS = %w(`
	`2`	`+ 4.1.15`
`2`	`3`	`4.2.8`
`3`	`4`	`5.0.2`
`4`	`5`	`5.1.0`