Merge branch 'master' of github.com:jbox-web/ajax-datatables-rails into nulls_last_performance

Author: natebird

.rubocop.yml

@@ -9,7 +9,7 @@ AllCops:
 Documentation:
   Enabled: false
 
-Gemspec/OrderedDependencies:
+Layout/AlignHash:
   Enabled: false
 
 Layout/EmptyLines:
@@ -45,5 +45,8 @@ Metrics/ClassLength:
 Naming/AccessorMethodName:
   Enabled: false
 
-Style/NumericPredicate:
-  Enabled: false
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma

.travis.yml

@@ -2,17 +2,16 @@ language: ruby
 cache: bundler
 sudo: required
 rvm:
-  - 2.6.0
+  - 2.6.1
   - 2.5.3
   - 2.4.5
   - 2.3.8
+  - ruby-head
 gemfile:
   - gemfiles/rails_4.2.11.gemfile
   - gemfiles/rails_5.0.7.gemfile
   - gemfiles/rails_5.1.6.gemfile
   - gemfiles/rails_5.2.2.gemfile
-after_success:
-  - bundle exec codeclimate-test-reporter
 services:
   - postgresql
   - mysql
@@ -25,7 +24,7 @@ addons:
     - mysql-client-5.6
 before_install:
   - gem update --system
-  - gem install bundler --no-document
+  # - gem install bundler --no-document
   - sh -c "if [ '$DB_ADAPTER' = 'mysql2' ]; then mysql -e 'create database ajax_datatables_rails;'; fi"
   - sh -c "if [ '$DB_ADAPTER' = 'postgresql' ]; then psql -c 'create database ajax_datatables_rails;' -U postgres; fi"
   - sh -c "if [ '$DB_ADAPTER' = 'oracle_enhanced' ]; then ./spec/install_oracle.sh; fi"
@@ -43,3 +42,9 @@ env:
 matrix:
   allow_failures:
     - env: DB_ADAPTER=oracle_enhanced
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

Appraisals

@@ -2,20 +2,20 @@
 
 RAILS_VERSIONS = {
   '4.2.11' => {
-    'activerecord-oracle_enhanced-adapter' => '~> 1.6.0'
+    'activerecord-oracle_enhanced-adapter' => '~> 1.6.0',
   },
   '5.0.7' => {
     'activerecord-oracle_enhanced-adapter' => '~> 1.7.0',
-    'ruby-oci8' => ''
+    'ruby-oci8' => '',
   },
   '5.1.6' => {
     'activerecord-oracle_enhanced-adapter' => '~> 1.8.0',
-    'ruby-oci8' => ''
+    'ruby-oci8' => '',
   },
   '5.2.2' => {
     'activerecord-oracle_enhanced-adapter' => '~> 5.2.0',
-    'ruby-oci8' => ''
-  }
+    'ruby-oci8' => '',
+  },
 }.freeze
 
 RAILS_VERSIONS.each do |version, gems|

Gemfile

@@ -3,8 +3,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-# CodeClimate Test Coverage
-group :test do
-  gem 'codeclimate-test-reporter', '~> 1.0.0'
-end

Rakefile

@@ -10,6 +10,7 @@ task :console do
   require 'pry'
   require 'rails'
   require 'ajax-datatables-rails'
+  puts 'Loaded AjaxDatatablesRails'
   ARGV.clear
   Pry.start
 end

ajax-datatables-rails.gemspec

@@ -17,18 +17,18 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'railties', '>= 4.2'
 
-  s.add_development_dependency 'rails', '>= 4.2'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'pg', '< 1.0'
-  s.add_development_dependency 'mysql2'
-  s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'activerecord-oracle_enhanced-adapter'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'generator_spec'
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'appraisal'
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'factory_bot'
   s.add_development_dependency 'faker'
-  s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'generator_spec'
+  s.add_development_dependency 'mysql2'
+  s.add_development_dependency 'pg', '< 1.0'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'rails', '>= 4.2'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'sqlite3', '~> 1.3.0'
 end

gemfiles/rails_4.2.11.gemfile

@@ -7,8 +7,4 @@ gem "mysql2", "0.4.10"
 gem "activerecord-oracle_enhanced-adapter", "~> 1.6.0"
 gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
 
-group :test do
-  gem "codeclimate-test-reporter", "~> 1.0.0"
-end
-
 gemspec path: "../"

gemfiles/rails_5.0.7.gemfile

@@ -6,8 +6,4 @@ gem "rails", "5.0.7"
 gem "activerecord-oracle_enhanced-adapter", "~> 1.7.0"
 gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
 
-group :test do
-  gem "codeclimate-test-reporter", "~> 1.0.0"
-end
-
 gemspec path: "../"

gemfiles/rails_5.1.6.gemfile

@@ -6,8 +6,4 @@ gem "rails", "5.1.6"
 gem "activerecord-oracle_enhanced-adapter", "~> 1.8.0"
 gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
 
-group :test do
-  gem "codeclimate-test-reporter", "~> 1.0.0"
-end
-
 gemspec path: "../"

gemfiles/rails_5.2.2.gemfile

@@ -6,8 +6,4 @@ gem "rails", "5.2.2"
 gem "activerecord-oracle_enhanced-adapter", "~> 5.2.0"
 gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
 
-group :test do
-  gem "codeclimate-test-reporter", "~> 1.0.0"
-end
-
 gemspec path: "../"