ajax-datatables-rails 1.3.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c458882fe0c2ff86e0b262ccdc9e37af67c348941f902e29bee7a9ec7b1ad9f0
-  data.tar.gz: 9fe38de08324f1f281f5a7c24d3e0c782c71bc741a23ae301952c0ef7bfcbb09
+  metadata.gz: df0c98573d156527bb34590ddac2fb860c53c578b3be69306d71db1123c0c1df
+  data.tar.gz: bef2b0041b0755590c3d98607f9234514e289ce654cb4b34399b0f50211c8500
 SHA512:
-  metadata.gz: 943655268357523c6594845e708f41fbe515284736b1c96d6150514b6c39478d563719c4051c0c3568942e138c1166ab2193cec5585742c1640242a7adbdd381
-  data.tar.gz: 6507a0827be528e61dfb07f905b4016d0d65543b19b3becf8d557884890fa88dbdefd815441f0b6f4cc4c784b24ebb58924f0b69357576295138af67cdf7ca78
+  metadata.gz: dcb780dd2416b592daadce7774a2002e37e81535399638012a7ae958c5385a31b79a544a72c80b914f0f2d3ab42dc9b483ac5c2953de7e82270971b3982f245e
+  data.tar.gz: c52b3cdb779556d89251b4434419aa269966d80e56c97479a87986c96d7889005d9222a4b6bbdf604ca120a320c2ce26efefcfdb58f1ffac099bc8f06cc17719

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,12 +2,18 @@
 name: CI
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - '**'
+  pull_request:
+    branches:
+      - '**'
+  schedule:
+    - cron: '0 4 1 * *'
 
 jobs:
   rspec:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     env:
       ORACLE_COOKIE: sqldev
@@ -17,7 +23,7 @@ jobs:
 
     services:
       postgres:
-        image: 'postgres:13'
+        image: 'postgres:16'
         ports: ['5432:5432']
         env:
           POSTGRES_PASSWORD: postgres
@@ -46,26 +52,35 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - '3.3'
+          - '3.2'
+          - '3.1'
           - '3.0'
           - '2.7'
-          - '2.6'
-          - '2.5'
+          - 'head'
         rails:
-          - rails_5.2.4
-          - rails_6.0.3
-          - rails_6.1.0
+          - rails_7.1.0
+          - rails_7.0.8
+          - rails_6.1.7
+          - rails_6.0.6
         adapter:
           - sqlite3
           - postgresql
           - mysql2
           - oracle_enhanced
+          - postgis
+          # - trilogy
         exclude:
-          - ruby: '3.0'
-            rails: rails_5.2.4
+          - rails: rails_7.1.0
+            adapter: oracle_enhanced
+
+          - rails: rails_7.1.0
+            adapter: postgis
+            ruby: 2.7'
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -80,19 +95,19 @@ jobs:
 
         # See: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md#mysql
         run: |
-          if [ "${DB_ADAPTER}" = "mysql2" ]; then
+          if [[ "${DB_ADAPTER}" == "mysql2" ]] || [[ "${DB_ADAPTER}" == "trilogy" ]]; then
             sudo systemctl start mysql.service
             mysql -u root -proot -e 'create database ajax_datatables_rails;'
           fi
 
-          if [ "${DB_ADAPTER}" = "oracle_enhanced" ]; then
+          if [[ "${DB_ADAPTER}" == "oracle_enhanced" ]]; then
             ./spec/install_oracle.sh
             # Fix error : libnnz11.so: cannot open shared object file: No such file or directory
             sudo ln -s ${ORACLE_HOME}/lib/libnnz11.so /usr/lib/libnnz11.so
           fi
 
       - name: Setup Ruby cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.rails }}-${{ matrix.adapter }}-${{ hashFiles('**/Gemfile.lock') }}
@@ -101,16 +116,19 @@ jobs:
 
       - name: Bundle
         env:
+          RUBY_VERSION: ${{ matrix.ruby }}
           RAILS_VERSION: ${{ matrix.rails }}
           DB_ADAPTER: ${{ matrix.adapter }}
           BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
         run: |
-          gem install bundler
+          if [[ "${RUBY_VERSION}" != "2.7" ]]; then
+            gem install bundler
+          fi
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
 
       - name: RSpec & publish code coverage
-        uses: paambaati/codeclimate-action@v2.7.5
+        uses: paambaati/codeclimate-action@v5.0.0
         env:
           RAILS_VERSION: ${{ matrix.rails }}
           DB_ADAPTER: ${{ matrix.adapter }}

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.safe_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,27 @@
 # CHANGELOG
 
+## 1.5.0 (2024-04-08)
+
+* Drop support of Rails 5.2
+* Add support for grouped results (merge: [#419](https://github.com/jbox-web/ajax-datatables-rails/pull/419))
+* Fix server-side out of order ajax responses (merge: [#418](https://github.com/jbox-web/ajax-datatables-rails/pull/418))
+* Add support for postgis adapter (merge: [#417](https://github.com/jbox-web/ajax-datatables-rails/pull/417))
+* Add support for trilogy adapter (merge: [#423](https://github.com/jbox-web/ajax-datatables-rails/pull/423))
+* Add support for Rails 7.1
+* Add support for Ruby 3.3
+
+This is the last version to support Rails 6.0.x and Ruby 2.7.x.
+
+## 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,6 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'appraisal', git: 'https://github.com/n-rodriguez/appraisal.git', branch: 'wip/combustion'
+gem 'combustion', git: 'https://github.com/pat/combustion.git'

data/README.md

@@ -11,8 +11,8 @@
 
 It's tested against :
 
-* Rails 5.2.4 / 6.0.3 / 6.1.0
-* Ruby 2.5.x / 2.6.x / 2.7.x
+* Rails 6.0.6 / 6.1.7 / 7.0.4
+* Ruby 2.7 / 3.0 / 3.1
 * SQLite3
 * Postgresql 13
 * MySQL 8

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', '>= 6.0'
   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,131 @@
+---
+6.0.6:
+  sqlite3:
+    version: ~> 1.4.0
+    install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }'
+  mysql2:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "mysql2" }'
+  activerecord-trilogy-adapter:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "trilogy" }'
+  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" }'
+  activerecord-postgis-adapter:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "postgis" }'
+  base64:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  bigdecimal:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  mutex_m:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  drb:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+
+
+6.1.7:
+  sqlite3:
+    version: ~> 1.4.0
+    install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }'
+  mysql2:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "mysql2" }'
+  activerecord-trilogy-adapter:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "trilogy" }'
+  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" }'
+  activerecord-postgis-adapter:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "postgis" }'
+  base64:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  bigdecimal:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  mutex_m:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  drb:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+
+
+7.0.8:
+  sqlite3:
+    version: ~> 1.4.0
+    install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }'
+  mysql2:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "mysql2" }'
+  activerecord-trilogy-adapter:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "trilogy" }'
+  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" }'
+  activerecord-postgis-adapter:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "postgis" }'
+  base64:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  bigdecimal:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  mutex_m:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  drb:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+
+
+7.1.0:
+  sqlite3:
+    version: ~> 1.4.0
+    install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }'
+  mysql2:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "mysql2" }'
+  activerecord-trilogy-adapter:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "trilogy" }'
+  # 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" }'
+  activerecord-postgis-adapter:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "postgis" }'
+  base64:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  bigdecimal:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  mutex_m:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  drb:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'

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_6.0.6.gemfile

@@ -0,0 +1,37 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
+gem "combustion", git: "https://github.com/pat/combustion.git"
+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"] == "trilogy" } do
+  gem "activerecord-trilogy-adapter"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "oracle_enhanced" } do
+  gem "activerecord-oracle_enhanced-adapter", "~> 6.0.0"
+  gem "ruby-oci8"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "postgis" } do
+  gem "activerecord-postgis-adapter"
+end
+
+install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") } do
+  gem "base64"
+  gem "bigdecimal"
+  gem "mutex_m"
+  gem "drb"
+end
+
+gemspec path: "../"

data/gemfiles/rails_6.1.7.gemfile

@@ -0,0 +1,37 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
+gem "combustion", git: "https://github.com/pat/combustion.git"
+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"] == "trilogy" } do
+  gem "activerecord-trilogy-adapter"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "oracle_enhanced" } do
+  gem "activerecord-oracle_enhanced-adapter", "~> 6.1.0"
+  gem "ruby-oci8"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "postgis" } do
+  gem "activerecord-postgis-adapter"
+end
+
+install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") } do
+  gem "base64"
+  gem "bigdecimal"
+  gem "mutex_m"
+  gem "drb"
+end
+
+gemspec path: "../"

data/gemfiles/rails_7.0.8.gemfile

@@ -0,0 +1,37 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
+gem "combustion", git: "https://github.com/pat/combustion.git"
+gem "rails", "7.0.8"
+
+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"] == "trilogy" } do
+  gem "activerecord-trilogy-adapter"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "oracle_enhanced" } do
+  gem "activerecord-oracle_enhanced-adapter", "~> 7.0.0"
+  gem "ruby-oci8"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "postgis" } do
+  gem "activerecord-postgis-adapter"
+end
+
+install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") } do
+  gem "base64"
+  gem "bigdecimal"
+  gem "mutex_m"
+  gem "drb"
+end
+
+gemspec path: "../"

data/gemfiles/rails_7.1.0.gemfile

@@ -0,0 +1,32 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
+gem "combustion", git: "https://github.com/pat/combustion.git"
+gem "rails", "7.1.0"
+
+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"] == "trilogy" } do
+  gem "activerecord-trilogy-adapter"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "postgis" } do
+  gem "activerecord-postgis-adapter"
+end
+
+install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") } do
+  gem "base64"
+  gem "bigdecimal"
+  gem "mutex_m"
+  gem "drb"
+end
+
+gemspec path: "../"