ajax-datatables-rails 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c458882fe0c2ff86e0b262ccdc9e37af67c348941f902e29bee7a9ec7b1ad9f0
-  data.tar.gz: 9fe38de08324f1f281f5a7c24d3e0c782c71bc741a23ae301952c0ef7bfcbb09
+  metadata.gz: a8603311c92aa4db99c7b94103de8ed606a61ffafaf630724517d479cd478331
+  data.tar.gz: 2baccc608a73493ecb7c28570075a9dda5919c91010db322e98a9c8d7032b4be
 SHA512:
-  metadata.gz: 943655268357523c6594845e708f41fbe515284736b1c96d6150514b6c39478d563719c4051c0c3568942e138c1166ab2193cec5585742c1640242a7adbdd381
-  data.tar.gz: 6507a0827be528e61dfb07f905b4016d0d65543b19b3becf8d557884890fa88dbdefd815441f0b6f4cc4c784b24ebb58924f0b69357576295138af67cdf7ca78
+  metadata.gz: e2097c47d5af467755b87bd09abe9551b1eeb6334476358508bc4615657b66c0ae2b38b7a4416475e3783f3e88f99d35be984c6c9a9e55e6ded40ee382f2ffbe
+  data.tar.gz: 4fbbaf7373f5acb5548ff354e5d191e195598302756e6051bd37a2876fee4e4f8450d3b535c7e98fd5654923740286d6c67b29d4570868d816200e7568cf2ecc

data/.codeclimate.yml

@@ -1,26 +1,8 @@
 ---
-engines:
-  duplication:
-    enabled: true
-    config:
-      languages:
-      - ruby
-      - javascript
-      - python
-      - php
-  fixme:
-    enabled: true
+plugins:
   rubocop:
     enabled: true
-ratings:
-  paths:
-  - "**.inc"
-  - "**.js"
-  - "**.jsx"
-  - "**.module"
-  - "**.php"
-  - "**.py"
-  - "**.rb"
-exclude_paths:
-- spec/
-- lib/generators/rails/templates/
+    channel: rubocop-1-31-0
+exclude_patterns:
+  - spec/
+  - lib/generators/rails/templates/

data/.github/workflows/ci.yml

@@ -2,8 +2,14 @@
 name: CI
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - '**'
+  pull_request:
+    branches:
+      - '**'
+  schedule:
+    - cron: '0 4 1 * *'
 
 jobs:
   rspec:
@@ -46,14 +52,14 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - '3.1'
           - '3.0'
           - '2.7'
-          - '2.6'
-          - '2.5'
         rails:
-          - rails_5.2.4
-          - rails_6.0.3
-          - rails_6.1.0
+          - rails_5.2.8
+          - rails_6.0.6
+          - rails_6.1.7
+          - rails_7.0.4
         adapter:
           - sqlite3
           - postgresql
@@ -61,7 +67,9 @@ jobs:
           - oracle_enhanced
         exclude:
           - ruby: '3.0'
-            rails: rails_5.2.4
+            rails: rails_5.2.8
+          - ruby: '3.1'
+            rails: rails_5.2.8
 
     steps:
       - name: Checkout

data/.gitignore

@@ -10,11 +10,14 @@
 /coverage
 /tmp
 
-# Ignore sqlite db file
-/ajax_datatables_rails
-
 # RVM files
 /.ruby-version
 
 # Gem files
 /*.gem
+
+# Ignore dummy app files
+spec/dummy/db/*.sqlite3
+spec/dummy/db/*.sqlite3-journal
+spec/dummy/log/*.log
+spec/dummy/tmp/

data/.rubocop.yml

@@ -1,7 +1,7 @@
 AllCops:
   NewCops: enable
   SuggestExtensions: false
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
   Exclude:
     - bin/*
     - lib/generators/**/*.rb

data/Appraisals

@@ -1,34 +1,27 @@
 # frozen_string_literal: true
 
-RAILS_VERSIONS = {
-  '5.2.4' => {
-    'activerecord-oracle_enhanced-adapter' => '~> 5.2.0',
-    'sqlite3' => '~> 1.3.0',
-    'mysql2' => '',
-    'ruby-oci8' => '',
-  },
-  '6.0.3' => {
-    'activerecord-oracle_enhanced-adapter' => '~> 6.0.0',
-    'sqlite3' => '~> 1.4.0',
-    'mysql2' => '',
-    'ruby-oci8' => '',
-  },
-  '6.1.0' => {
-    'activerecord-oracle_enhanced-adapter' => '~> 6.1.0',
-    'sqlite3' => '~> 1.4.0',
-    'mysql2' => '',
-    'ruby-oci8' => '',
-  },
-}.freeze
+require 'yaml'
 
-RAILS_VERSIONS.each do |version, gems|
+rails_versions = YAML.load(File.read('appraisal.yml'))
+
+rails_versions.each do |version, gems|
   appraise "rails_#{version}" do
     gem 'rails', version
-    gems.each do |name, gem_version|
-      if gem_version.empty?
-        gem name
+    gems.each do |name, opts|
+      if opts['install_if']
+        install_if opts['install_if'] do
+          if opts['version'].empty?
+            gem name
+          else
+            gem name, opts['version']
+          end
+        end
       else
-        gem name, gem_version
+        if opts['version'].empty?
+          gem name
+        else
+          gem name, opts['version']
+        end
       end
     end
   end

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 1.4.0 (2022-12-18)
+
+* Improve tests
+* Add tests on custom_field feature
+* Drop support of Ruby 2.5
+* Drop support of Ruby 2.6
+* Add support of Ruby 3.1
+* Add support of Rails 7
+* Fix: prevent establishing ActiveRecord connection on startup
+
 ## 1.3.1 (2021-02-09)
 
 * Fix rare case error `uninitialized constant AjaxDatatablesRails::ActiveRecord::Base` (merge: [#379](https://github.com/jbox-web/ajax-datatables-rails/pull/379))

data/Gemfile

@@ -3,3 +3,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'appraisal', git: 'https://github.com/n-rodriguez/appraisal.git', branch: 'wip/combustion'

data/ajax-datatables-rails.gemspec

@@ -19,14 +19,16 @@ Gem::Specification.new do |s|
     'bug_tracker_uri' => 'https://github.com/jbox-web/ajax-datatables-rails/issues',
   }
 
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.7.0'
 
   s.files = `git ls-files`.split("\n")
 
+  s.add_runtime_dependency 'rails', '>= 5.2'
   s.add_runtime_dependency 'zeitwerk'
 
   s.add_development_dependency 'activerecord-oracle_enhanced-adapter'
   s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'combustion', '~> 1.3'
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'factory_bot'
   s.add_development_dependency 'faker'
@@ -34,10 +36,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'pg'
   s.add_development_dependency 'pry'
-  s.add_development_dependency 'rails', '>= 5.2'
+  s.add_development_dependency 'puma'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rspec-retry'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'sqlite3', '~> 1.4.0'
 end

data/appraisal.yml

@@ -0,0 +1,56 @@
+---
+5.2.8:
+  sqlite3:
+    version: ~> 1.3.0
+    install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }'
+  mysql2:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "mysql2" }'
+  activerecord-oracle_enhanced-adapter:
+    version: ~> 5.2.0
+    install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'
+  ruby-oci8:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'
+
+6.0.6:
+  sqlite3:
+    version: ~> 1.4.0
+    install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }'
+  mysql2:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "mysql2" }'
+  activerecord-oracle_enhanced-adapter:
+    version: ~> 6.0.0
+    install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'
+  ruby-oci8:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'
+
+6.1.7:
+  sqlite3:
+    version: ~> 1.4.0
+    install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }'
+  mysql2:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "mysql2" }'
+  activerecord-oracle_enhanced-adapter:
+    version: ~> 6.1.0
+    install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'
+  ruby-oci8:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'
+
+7.0.4:
+  sqlite3:
+    version: ~> 1.4.0
+    install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }'
+  mysql2:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "mysql2" }'
+  activerecord-oracle_enhanced-adapter:
+    version: ~> 7.0.0
+    install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'
+  ruby-oci8:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'

data/bin/rackup

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rackup' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rack", "rackup")

data/config.ru

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Bundler.require :default, :development
+
+Combustion.path = 'spec/dummy'
+Combustion.initialize! :all
+run Combustion::Application

data/gemfiles/rails_5.2.8.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
+gem "rails", "5.2.8"
+
+install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do
+  gem "sqlite3", "~> 1.3.0"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "mysql2" } do
+  gem "mysql2"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "oracle_enhanced" } do
+  gem "activerecord-oracle_enhanced-adapter", "~> 5.2.0"
+  gem "ruby-oci8"
+end
+
+gemspec path: "../"

data/gemfiles/rails_6.0.6.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
+gem "rails", "6.0.6"
+
+install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do
+  gem "sqlite3", "~> 1.4.0"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "mysql2" } do
+  gem "mysql2"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "oracle_enhanced" } do
+  gem "activerecord-oracle_enhanced-adapter", "~> 6.0.0"
+  gem "ruby-oci8"
+end
+
+gemspec path: "../"

data/gemfiles/rails_6.1.7.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
+gem "rails", "6.1.7"
+
+install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do
+  gem "sqlite3", "~> 1.4.0"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "mysql2" } do
+  gem "mysql2"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "oracle_enhanced" } do
+  gem "activerecord-oracle_enhanced-adapter", "~> 6.1.0"
+  gem "ruby-oci8"
+end
+
+gemspec path: "../"

data/gemfiles/rails_7.0.4.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
+gem "rails", "7.0.4"
+
+install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do
+  gem "sqlite3", "~> 1.4.0"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "mysql2" } do
+  gem "mysql2"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "oracle_enhanced" } do
+  gem "activerecord-oracle_enhanced-adapter", "~> 7.0.0"
+  gem "ruby-oci8"
+end
+
+gemspec path: "../"

data/lib/ajax-datatables-rails/base.rb

@@ -3,7 +3,27 @@
 module AjaxDatatablesRails
   class Base
 
-    class_attribute :db_adapter, default: ::ActiveRecord::Base.connection.adapter_name.downcase.to_sym
+    class << self
+      def rails_52?
+        Rails.gem_version >= Gem::Version.new('5.2') && Rails.gem_version <= Gem::Version.new('6.0')
+      end
+
+      def rails_60?
+        Rails.gem_version >= Gem::Version.new('6.0') && Rails.gem_version <= Gem::Version.new('6.1')
+      end
+
+      def default_db_adapter
+        if rails_52?
+          ::ActiveRecord::Base.configurations.dig(Rails.env, 'adapter').downcase.to_sym
+        elsif rails_60?
+          ::ActiveRecord::Base.configurations.configs_for(env_name: Rails.env).first.config['adapter'].downcase.to_sym
+        else
+          ::ActiveRecord::Base.configurations.configs_for(env_name: Rails.env).first.adapter.downcase.to_sym
+        end
+      end
+    end
+
+    class_attribute :db_adapter, default: default_db_adapter
     class_attribute :nulls_last, default: false
 
     attr_reader :params, :options, :datatable

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

@@ -88,15 +88,11 @@ module AjaxDatatablesRails
         end
 
         def raw_search(cond)
-          if custom_field?
-            ::Arel::Nodes::SqlLiteral.new(field).eq(formatted_value)
-          else
-            table[field].send(cond, formatted_value)
-          end
+          table[field].send(cond, formatted_value) unless custom_field?
         end
 
         def text_search(value)
-          casted_column.matches(value)
+          casted_column.matches(value) unless custom_field?
         end
 
         def empty_search

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

@@ -36,11 +36,11 @@ module AjaxDatatablesRails
       end
 
       def model
-        @model ||= source.split('.').first.constantize
+        @model ||= custom_field? ? source : source.split('.').first.constantize
       end
 
       def field
-        @field ||= source.split('.').last.to_sym
+        @field ||= custom_field? ? source : source.split('.').last.to_sym
       end
 
       def custom_field?
@@ -66,13 +66,14 @@ module AjaxDatatablesRails
       TYPE_CAST_SQLSERVER = 'VARCHAR(4000)'
 
       DB_ADAPTER_TYPE_CAST = {
-        mysql:          TYPE_CAST_MYSQL,
-        mysql2:         TYPE_CAST_MYSQL,
-        sqlite:         TYPE_CAST_SQLITE,
-        sqlite3:        TYPE_CAST_SQLITE,
-        oracle:         TYPE_CAST_ORACLE,
-        oracleenhanced: TYPE_CAST_ORACLE,
-        sqlserver:      TYPE_CAST_SQLSERVER,
+        mysql:           TYPE_CAST_MYSQL,
+        mysql2:          TYPE_CAST_MYSQL,
+        sqlite:          TYPE_CAST_SQLITE,
+        sqlite3:         TYPE_CAST_SQLITE,
+        oracle:          TYPE_CAST_ORACLE,
+        oracleenhanced:  TYPE_CAST_ORACLE,
+        oracle_enhanced: TYPE_CAST_ORACLE,
+        sqlserver:       TYPE_CAST_SQLSERVER,
       }.freeze
 
       private_constant :TYPE_CAST_DEFAULT

data/lib/ajax-datatables-rails/version.rb

@@ -8,8 +8,8 @@ module AjaxDatatablesRails
 
   module VERSION
     MAJOR = 1
-    MINOR = 3
-    TINY  = 1
+    MINOR = 4
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/spec/ajax-datatables-rails/datatable/datatable_spec.rb

@@ -40,8 +40,8 @@ RSpec.describe AjaxDatatablesRails::Datatable::Datatable do
   end
 
   shared_examples 'columns methods' do
-    it 'has 4 columns' do
-      expect(datatable.columns.count).to eq(6)
+    it 'has 7 columns' do
+      expect(datatable.columns.count).to eq(7)
     end
 
     it 'child class' do

data/spec/ajax-datatables-rails/datatable/simple_order_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe AjaxDatatablesRails::Datatable::SimpleOrder do
       after  { parent.nulls_last = false }
 
       it 'sql query' do
-        skip('unsupported database adapter') if ENV['DB_ADAPTER'] == 'oracle_enhanced'
+        skip('unsupported database adapter') if RunningSpec.oracle?
 
         expect(simple_order.query('email')).to eq(
           "email DESC #{nulls_last_sql(parent)}"

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

@@ -168,7 +168,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
         expect(result).to be_a(Arel::Nodes::And)
       end
 
-      if ENV['DB_ADAPTER'] == 'postgresql'
+      if RunningSpec.postgresql?
         context 'when db_adapter is postgresql' do
           it 'can call #to_sql on returned object' do
             result = datatable.build_conditions_for_selected_columns
@@ -180,7 +180,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
         end
       end
 
-      if ENV['DB_ADAPTER'] == 'oracle_enhanced'
+      if RunningSpec.oracle?
         context 'when db_adapter is oracle' do
           it 'can call #to_sql on returned object' do
             result = datatable.build_conditions_for_selected_columns
@@ -192,7 +192,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
         end
       end
 
-      if ENV['DB_ADAPTER'] == 'mysql2'
+      if RunningSpec.mysql?
         context 'when db_adapter is mysql2' do
           it 'can call #to_sql on returned object' do
             result = datatable.build_conditions_for_selected_columns
@@ -236,7 +236,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
 
         context 'when range is empty' do
           it 'does not filter records' do
-            datatable.params[:columns]['5'][:search][:value] = '-'
+            datatable.params[:columns]['6'][:search][:value] = '-'
             expect(datatable.data.size).to eq 2
             item = datatable.data.first
             expect(item[:last_name]).to eq 'Doe'
@@ -245,21 +245,21 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
 
         context 'when start date is filled' do
           it 'filters records created after this date' do
-            datatable.params[:columns]['5'][:search][:value] = '31/12/1999-'
+            datatable.params[:columns]['6'][:search][:value] = '31/12/1999-'
             expect(datatable.data.size).to eq 2
           end
         end
 
         context 'when end date is filled' do
           it 'filters records created before this date' do
-            datatable.params[:columns]['5'][:search][:value] = '-31/12/1999'
+            datatable.params[:columns]['6'][:search][:value] = '-31/12/1999'
             expect(datatable.data.size).to eq 0
           end
         end
 
         context 'when both date are filled' do
           it 'filters records created between the range' do
-            datatable.params[:columns]['5'][:search][:value] = '01/12/1999-15/01/2000'
+            datatable.params[:columns]['6'][:search][:value] = '01/12/1999-15/01/2000'
             expect(datatable.data.size).to eq 1
           end
         end
@@ -268,7 +268,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
           context 'when range is empty' do
             it 'filters records' do
               datatable.params[:columns]['0'][:search][:value] = 'doe'
-              datatable.params[:columns]['5'][:search][:value] = '-'
+              datatable.params[:columns]['6'][:search][:value] = '-'
               expect(datatable.data.size).to eq 1
               item = datatable.data.first
               expect(item[:last_name]).to eq 'Doe'
@@ -278,7 +278,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
           context 'when start date is filled' do
             it 'filters records' do
               datatable.params[:columns]['0'][:search][:value] = 'doe'
-              datatable.params[:columns]['5'][:search][:value] = '01/12/1999-'
+              datatable.params[:columns]['6'][:search][:value] = '01/12/1999-'
               expect(datatable.data.size).to eq 1
               item = datatable.data.first
               expect(item[:last_name]).to eq 'Doe'
@@ -288,7 +288,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
           context 'when end date is filled' do
             it 'filters records' do
               datatable.params[:columns]['0'][:search][:value] = 'doe'
-              datatable.params[:columns]['5'][:search][:value] = '-15/01/2000'
+              datatable.params[:columns]['6'][:search][:value] = '-15/01/2000'
               expect(datatable.data.size).to eq 1
               item = datatable.data.first
               expect(item[:last_name]).to eq 'Doe'
@@ -298,7 +298,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
           context 'when both date are filled' do
             it 'filters records' do
               datatable.params[:columns]['0'][:search][:value] = 'doe'
-              datatable.params[:columns]['5'][:search][:value] = '01/12/1999-15/01/2000'
+              datatable.params[:columns]['6'][: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'
@@ -318,7 +318,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
         let(:datatable) { DatatableCondEq.new(sample_params) }
 
         it 'filters records matching' do
-          datatable.params[:columns]['4'][:search][:value] = 1
+          datatable.params[:columns]['5'][:search][:value] = 1
           expect(datatable.data.size).to eq 1
           item = datatable.data.first
           expect(item[:first_name]).to eq 'john'
@@ -329,7 +329,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
         let(:datatable) { DatatableCondNotEq.new(sample_params) }
 
         it 'filters records matching' do
-          datatable.params[:columns]['4'][:search][:value] = 1
+          datatable.params[:columns]['5'][:search][:value] = 1
           expect(datatable.data.size).to eq 1
           item = datatable.data.first
           expect(item[:first_name]).to eq 'mary'
@@ -340,7 +340,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
         let(:datatable) { DatatableCondLt.new(sample_params) }
 
         it 'filters records matching' do
-          datatable.params[:columns]['4'][:search][:value] = 2
+          datatable.params[:columns]['5'][:search][:value] = 2
           expect(datatable.data.size).to eq 1
           item = datatable.data.first
           expect(item[:first_name]).to eq 'john'
@@ -351,7 +351,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
         let(:datatable) { DatatableCondGt.new(sample_params) }
 
         it 'filters records matching' do
-          datatable.params[:columns]['4'][:search][:value] = 1
+          datatable.params[:columns]['5'][:search][:value] = 1
           expect(datatable.data.size).to eq 1
           item = datatable.data.first
           expect(item[:first_name]).to eq 'mary'
@@ -362,7 +362,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
         let(:datatable) { DatatableCondLteq.new(sample_params) }
 
         it 'filters records matching' do
-          datatable.params[:columns]['4'][:search][:value] = 2
+          datatable.params[:columns]['5'][:search][:value] = 2
           expect(datatable.data.size).to eq 2
         end
       end
@@ -371,7 +371,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
         let(:datatable) { DatatableCondGteq.new(sample_params) }
 
         it 'filters records matching' do
-          datatable.params[:columns]['4'][:search][:value] = 1
+          datatable.params[:columns]['5'][:search][:value] = 1
           expect(datatable.data.size).to eq 2
         end
       end
@@ -380,7 +380,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
         let(:datatable) { DatatableCondIn.new(sample_params) }
 
         it 'filters records matching' do
-          datatable.params[:columns]['4'][:search][:value] = [1]
+          datatable.params[:columns]['5'][:search][:value] = [1]
           expect(datatable.data.size).to eq 1
           item = datatable.data.first
           expect(item[:first_name]).to eq 'john'
@@ -391,8 +391,8 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
         let(:datatable) { DatatableCondInWithRegex.new(sample_params) }
 
         it 'filters records matching' do
-          datatable.params[:columns]['4'][:search][:value] = '1|2'
-          datatable.params[:order]['0'] = { column: '4', dir: 'asc' }
+          datatable.params[:columns]['5'][:search][:value] = '1|2'
+          datatable.params[:order]['0'] = { column: '5', dir: 'asc' }
           expect(datatable.data.size).to eq 2
           item = datatable.data.first
           expect(item[:first_name]).to eq 'john'
@@ -410,18 +410,18 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
           create(:user, first_name: 'phil', post_id: largest_postgresql_integer_value)
         end
 
-        it 'Returns an empty result if input value is too large' do
-          datatable.params[:columns]['4'][:search][:value] = largest_postgresql_integer_value + 1
+        it 'returns an empty result if input value is too large' do
+          datatable.params[:columns]['5'][:search][:value] = largest_postgresql_integer_value + 1
           expect(datatable.data.size).to eq 0
         end
 
-        it 'Returns an empty result if input value is too small' do
-          datatable.params[:columns]['4'][:search][:value] = smallest_postgresql_integer_value - 1
+        it 'returns an empty result if input value is too small' do
+          datatable.params[:columns]['5'][:search][:value] = smallest_postgresql_integer_value - 1
           expect(datatable.data.size).to eq 0
         end
 
         it 'returns the matching user' do
-          datatable.params[:columns]['4'][:search][:value] = largest_postgresql_integer_value
+          datatable.params[:columns]['5'][:search][:value] = largest_postgresql_integer_value
           expect(datatable.data.size).to eq 1
         end
       end
@@ -471,7 +471,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
           create(:user, last_name: 'MARY')
         end
 
-        if ENV['DB_ADAPTER'] == 'oracle_enhanced'
+        if RunningSpec.oracle?
           context 'when db_adapter is oracleenhanced' do
             it 'filters records matching' do
               datatable.params[:columns]['3'][:search][:value] = 'RY'
@@ -597,6 +597,28 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
         }.to raise_error(AjaxDatatablesRails::Error::InvalidSearchCondition).with_message('foo')
       end
     end
+
+    context 'custom column' do
+      describe 'it can filter records with custom column' do
+        let(:datatable) { DatatableCustomColumn.new(sample_params) }
+
+        before do
+          create(:user, username: 'msmith',  email: 'mary.smith@example.com', first_name: 'Mary', last_name: 'Smith')
+          create(:user, username: 'jsmith',  email: 'john.smith@example.com', first_name: 'John', last_name: 'Smith')
+          create(:user, username: 'johndoe', email: 'johndoe@example.com',    first_name: 'John', last_name: 'Doe')
+        end
+
+        it 'filters records' do
+          skip('unsupported database adapter') if RunningSpec.oracle? || RunningSpec.sqlite?
+
+          datatable.params[:columns]['4'][:search][:value] = 'John'
+          datatable.params[:order]['0'][:column] = '4'
+          expect(datatable.data.size).to eq 2
+          item = datatable.data.first
+          expect(item[:full_name]).to eq 'John Doe'
+        end
+      end
+    end
   end
 
   describe 'formatter option' do

data/spec/ajax-datatables-rails/orm/active_record_paginate_records_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
     end
 
     it 'paginates records properly' do
-      if ENV['DB_ADAPTER'] == 'oracle_enhanced'
+      if RunningSpec.oracle?
         if Rails.version.in? %w[4.2.11]
           expect(datatable.paginate_records(records).to_sql).to include(
             'rownum <= 10'
@@ -36,7 +36,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
 
       datatable.params[:start] = '26'
       datatable.params[:length] = '25'
-      if ENV['DB_ADAPTER'] == 'oracle_enhanced'
+      if RunningSpec.oracle?
         if Rails.version.in? %w[4.2.11]
           expect(datatable.paginate_records(records).to_sql).to include(
             'rownum <= 51'

data/spec/ajax-datatables-rails/orm/active_record_sort_records_spec.rb

@@ -51,7 +51,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
     after  { datatable.nulls_last = false }
 
     it 'can handle multiple sorting columns' do
-      skip('unsupported database adapter') if ENV['DB_ADAPTER'] == 'oracle_enhanced'
+      skip('unsupported database adapter') if RunningSpec.oracle?
 
       # set to order by Users username in ascending order, and
       # by Users email in descending order
@@ -65,7 +65,7 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
 
   describe '#sort_records with nulls last using column config' do
     it 'can handle multiple sorting columns' do
-      skip('unsupported database adapter') if ENV['DB_ADAPTER'] == 'oracle_enhanced'
+      skip('unsupported database adapter') if RunningSpec.oracle?
 
       # set to order by Users username in ascending order, and
       # by Users email in descending order

data/spec/dummy/config/database.yml

@@ -0,0 +1,25 @@
+<% adapter = ENV.fetch('DB_ADAPTER', 'postgresql') %>
+test:
+  adapter:  <%= adapter %>
+  database: ajax_datatables_rails
+  encoding: utf8
+
+<% if adapter == 'postgresql' %>
+  host: '127.0.0.1'
+  port: 5432
+  username: 'postgres'
+  password: 'postgres'
+<% elsif adapter == 'mysql2' %>
+  host: '127.0.0.1'
+  port: 3306
+  username: 'root'
+  password: 'root'
+<% elsif adapter == 'oracle_enhanced' %>
+  host: '127.0.0.1/xe'
+  username: <%= ENV.fetch('USER') %>
+  password: <%= ENV.fetch('USER') %>
+  database: 'xe'
+<% elsif adapter == 'sqlite3' %>
+  # database: ':memory:'
+  database: db/ajax_datatables_rails.sqlite3
+<% end %>

data/spec/dummy/config/routes.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Rails.application.routes.draw do
+  # Add your own routes here, or remove this file if you don't have need for it.
+end

data/spec/dummy/config/storage.yml

@@ -0,0 +1,3 @@
+test:
+  service: Disk
+  root: /tmp/ajax-datatables-rails/tmp/storage

data/spec/{support → dummy/db}/schema.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 ActiveRecord::Schema.define do
-  self.verbose = false
-
   create_table :users, force: true do |t|
     t.string  :username
     t.string  :email
@@ -12,5 +10,4 @@ ActiveRecord::Schema.define do
 
     t.timestamps null: false
   end
-
 end

data/spec/dummy/log/.gitignore

@@ -0,0 +1 @@
+*.log

data/spec/spec_helper.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+require 'combustion'
+
+Combustion.path = 'spec/dummy'
+Combustion.initialize! :active_record, :action_controller
+
 require 'simplecov'
 require 'rspec'
 require 'rspec/retry'
@@ -7,9 +12,6 @@ require 'database_cleaner'
 require 'factory_bot'
 require 'faker'
 require 'pry'
-require 'rails'
-require 'active_record'
-require 'action_controller'
 
 # Start Simplecov
 SimpleCov.start do
@@ -61,28 +63,23 @@ RSpec.configure do |config|
   end
 end
 
-# Configure ActiveRecord
-adapter = ENV.fetch('DB_ADAPTER', 'postgresql')
-
-options = {
-  adapter:  adapter,
-  database: 'ajax_datatables_rails',
-  encoding: 'utf8',
-}
-
-options =
-  case adapter
-  when 'postgresql'
-    options.merge(host: '127.0.0.1', port: 5432, username: 'postgres', password: 'postgres')
-  when 'mysql2'
-    options.merge(host: '127.0.0.1', port: 3306, username: 'root', password: 'root')
-  when 'oracle_enhanced'
-    options.merge(host: '127.0.0.1/xe', username: ENV['USER'], password: ENV['USER'], database: 'xe')
-  when 'sqlite3'
-    options.merge(database: ':memory:')
+class RunningSpec
+  def self.sqlite?
+    ENV['DB_ADAPTER'] == 'sqlite3'
+  end
+
+  def self.oracle?
+    ENV['DB_ADAPTER'] == 'oracle_enhanced'
   end
 
-ActiveRecord::Base.establish_connection(options)
+  def self.mysql?
+    ENV['DB_ADAPTER'] == 'mysql2'
+  end
+
+  def self.postgresql?
+    ENV['DB_ADAPTER'] == 'postgresql'
+  end
+end
 
 # Require our gem
 require 'ajax-datatables-rails'

data/spec/support/datatables/complex_datatable.rb

@@ -7,6 +7,7 @@ class ComplexDatatable < AjaxDatatablesRails::ActiveRecord
       email:      { source: 'User.email'      },
       first_name: { source: 'User.first_name' },
       last_name:  { source: 'User.last_name'  },
+      full_name:  { source: 'full_name' },
       post_id:    { source: 'User.post_id', orderable: false },
       created_at: { source: 'User.created_at' },
     }
@@ -19,6 +20,7 @@ class ComplexDatatable < AjaxDatatablesRails::ActiveRecord
         email:      record.email,
         first_name: record.first_name,
         last_name:  record.last_name,
+        full_name:  record.full_name,
         post_id:    record.post_id,
         created_at: record.created_at,
       }

data/spec/support/datatables/datatable_custom_column.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class DatatableCustomColumn < ComplexDatatable
+  def view_columns
+    super.deep_merge(full_name: { cond: filter_full_name })
+  end
+
+  def get_raw_records
+    User.select("*, CONCAT(first_name, ' ', last_name) as full_name")
+  end
+
+  private
+
+  def filter_full_name
+    ->(_column, value) { ::Arel::Nodes::SqlLiteral.new("CONCAT(first_name, ' ', last_name)").matches("#{value}%") }
+  end
+end

data/spec/support/helpers/params.rb

@@ -31,12 +31,18 @@ def sample_params
           }
         },
         '4' => {
-          'data' => 'post_id', 'name' => '', 'searchable' => 'true', 'orderable' => 'true',
+          'data' => 'full_name', 'name' => '', 'searchable' => 'true', 'orderable' => 'true',
           'search' => {
             'value' => '', 'regex' => 'false'
           }
         },
         '5' => {
+          'data' => 'post_id', 'name' => '', 'searchable' => 'true', 'orderable' => 'true',
+          'search' => {
+            'value' => '', 'regex' => 'false'
+          }
+        },
+        '6' => {
           'data' => 'created_at', 'name' => '', 'searchable' => 'true', 'orderable' => 'true',
           'search' => {
             'value' => '', 'regex' => 'false'

data/spec/support/models/user.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
 
 class User < ActiveRecord::Base
+  def full_name
+    "#{first_name} #{last_name}"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ajax-datatables-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Joel Quenneville
@@ -9,8 +9,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2022-12-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +67,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -152,19 +180,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +263,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 description: A wrapper around datatable's ajax methods that allow synchronization
   with server-side pagination in a rails app
 email:
@@ -257,18 +299,22 @@ files:
 - README.md
 - Rakefile
 - ajax-datatables-rails.gemspec
+- appraisal.yml
 - bin/_guard-core
 - bin/appraisal
 - bin/bundle
 - bin/guard
+- bin/rackup
 - bin/rake
 - bin/rspec
 - bin/rubocop
+- config.ru
 - doc/migrate.md
 - doc/webpack.md
-- gemfiles/rails_5.2.4.gemfile
-- gemfiles/rails_6.0.3.gemfile
-- gemfiles/rails_6.1.0.gemfile
+- gemfiles/rails_5.2.8.gemfile
+- gemfiles/rails_6.0.6.gemfile
+- gemfiles/rails_6.1.7.gemfile
+- gemfiles/rails_7.0.4.gemfile
 - lib/ajax-datatables-rails.rb
 - lib/ajax-datatables-rails/active_record.rb
 - lib/ajax-datatables-rails/base.rb
@@ -294,6 +340,13 @@ files:
 - spec/ajax-datatables-rails/orm/active_record_filter_records_spec.rb
 - spec/ajax-datatables-rails/orm/active_record_paginate_records_spec.rb
 - spec/ajax-datatables-rails/orm/active_record_sort_records_spec.rb
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/config/database.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/storage.yml
+- spec/dummy/db/schema.rb
+- spec/dummy/log/.gitignore
+- spec/dummy/public/favicon.ico
 - spec/factories/user.rb
 - spec/install_oracle.sh
 - spec/spec_helper.rb
@@ -304,10 +357,10 @@ files:
 - spec/support/datatables/datatable_cond_proc.rb
 - spec/support/datatables/datatable_cond_string.rb
 - spec/support/datatables/datatable_cond_unknown.rb
+- spec/support/datatables/datatable_custom_column.rb
 - spec/support/datatables/datatable_order_nulls_last.rb
 - spec/support/helpers/params.rb
 - spec/support/models/user.rb
-- spec/support/schema.rb
 homepage: https://github.com/jbox-web/ajax-datatables-rails
 licenses:
 - MIT
@@ -324,14 +377,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: A gem that simplifies using datatables and hundreds of records via ajax

data/gemfiles/rails_5.2.4.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "5.2.4"
-gem "activerecord-oracle_enhanced-adapter", "~> 5.2.0"
-gem "sqlite3", "~> 1.3.0"
-gem "mysql2"
-gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
-
-gemspec path: "../"

data/gemfiles/rails_6.0.3.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "6.0.3"
-gem "activerecord-oracle_enhanced-adapter", "~> 6.0.0"
-gem "sqlite3", "~> 1.4.0"
-gem "mysql2"
-gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
-
-gemspec path: "../"

data/gemfiles/rails_6.1.0.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "6.1.0"
-gem "activerecord-oracle_enhanced-adapter", "~> 6.1.0"
-gem "sqlite3", "~> 1.4.0"
-gem "mysql2"
-gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
-
-gemspec path: "../"