Skip to content

Commit c017f4f

Browse files
author
Nicolas Rodriguez
committed
Test with Rails 4.0.13
1 parent c343732 commit c017f4f

File tree

9 files changed

+23
-9
lines changed

9 files changed

+23
-9
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ rvm:
66
- 2.2.7
77
- 2.3.4
88
gemfile:
9+
- gemfiles/rails_4.0.13.gemfile
910
- gemfiles/rails_4.1.15.gemfile
1011
- gemfiles/rails_4.2.8.gemfile
1112
- gemfiles/rails_5.0.2.gemfile

Appraisals

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
RAILS_VERSIONS = %w(
2+
4.0.13
23
4.1.15
34
4.2.8
45
5.0.2
@@ -8,6 +9,6 @@ RAILS_VERSIONS = %w(
89
RAILS_VERSIONS.each do |version|
910
appraise "rails_#{version}" do
1011
gem 'rails', version
11-
gem 'mysql2', '~> 0.3.18' if version == '4.1.15'
12+
gem 'mysql2', '~> 0.3.18' if version == '4.1.15' || version == '4.0.13'
1213
end
1314
end

ajax-datatables-rails.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
1313
s.description = %q{A wrapper around datatable's ajax methods that allow synchronization with server-side pagination in a rails app}
1414
s.license = 'MIT'
1515

16-
s.add_dependency 'railties', '>= 4.1'
16+
s.add_dependency 'railties', '>= 4.0'
1717

18-
s.add_development_dependency 'rails', '>= 4.1'
18+
s.add_development_dependency 'rails', '>= 4.0'
1919
s.add_development_dependency 'rake'
2020
s.add_development_dependency 'pg'
2121
s.add_development_dependency 'mysql2'

gemfiles/rails_4.0.13.gemfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", "4.0.13"
6+
gem "mysql2", "~> 0.3.18"
7+
8+
group :test do
9+
gem "codeclimate-test-reporter", "~> 1.0.0"
10+
end
11+
12+
gemspec path: "../"

lib/ajax-datatables-rails.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module AjaxDatatablesRails
55
require 'ajax-datatables-rails/datatable/datatable'
66
require 'ajax-datatables-rails/datatable/simple_search'
77
require 'ajax-datatables-rails/datatable/simple_order'
8-
require 'ajax-datatables-rails/datatable/column_date_filter' unless AjaxDatatablesRails.rails_41?
8+
require 'ajax-datatables-rails/datatable/column_date_filter' unless AjaxDatatablesRails.old_rails?
99
require 'ajax-datatables-rails/datatable/column'
1010
require 'ajax-datatables-rails/orm/active_record'
1111
end

lib/ajax-datatables-rails/config.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ def self.config
1515
@config ||= AjaxDatatablesRails::Configuration.new
1616
end
1717

18-
def self.rails_41?
19-
Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR == 1
18+
def self.old_rails?
19+
Rails::VERSION::MAJOR == 4 && (Rails::VERSION::MINOR == 1 || Rails::VERSION::MINOR == 0)
2020
end
2121

2222
class Configuration

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module Datatable
55
class Column
66
attr_reader :datatable, :index, :options
77

8-
unless AjaxDatatablesRails.rails_41?
8+
unless AjaxDatatablesRails.old_rails?
99
prepend ColumnDateFilter
1010
end
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def per_page
6868
end
6969

7070
def get_param(param)
71-
if AjaxDatatablesRails.rails_41?
71+
if AjaxDatatablesRails.old_rails?
7272
options[param]
7373
else
7474
options[param].to_unsafe_h.with_indifferent_access

spec/ajax-datatables-rails/orm/active_record_filter_records_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
describe 'filter conditions' do
173173
let(:datatable) { ReallyComplexDatatable.new(view) }
174174

175-
unless AjaxDatatablesRails.rails_41?
175+
unless AjaxDatatablesRails.old_rails?
176176
describe 'it can filter records with condition :date_range' do
177177
before(:each) do
178178
create(:user, username: 'johndoe', email: '[email protected]', last_name: 'Doe', created_at: '01/01/2000')

0 commit comments

Comments
 (0)