ajax-datatables-rails 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0b5b7242e164445bb1f0faaadadce3cdac7abc9a95ae813f29ff8754eb92060
-  data.tar.gz: b7551245872059aa1dba5dca216ed54fd5a3852a104e7fa6b5cd88c2e6a301a9
+  metadata.gz: a8603311c92aa4db99c7b94103de8ed606a61ffafaf630724517d479cd478331
+  data.tar.gz: 2baccc608a73493ecb7c28570075a9dda5919c91010db322e98a9c8d7032b4be
 SHA512:
-  metadata.gz: 8715a74263a88667f384069d0975c67ec34b558c61291731f4e440d5e46cd803b3b978667b7dcd9945406abc5651f70254904a9f5c5f64172703f040da7a5dce
-  data.tar.gz: 93a2dda89e7293509eaf58525e445616b4f62a126d258b567445c4c143a518f7984cdccefc4186912aa64d6d0c49739cb054e26bd34ab9a9119da43f737c61ce
+  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,19 @@
 # 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))
+
 ## 1.3.0 (2021-01-04)
 
 * Drop support of Rails 5.0.x and 5.1.x

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/README.md

@@ -532,13 +532,13 @@ available in our datatable to search and sort by.
 
 def view_columns
   @view_columns ||= {
-    first_name:       'User.first_name',
-    last_name:        'User.last_name',
-    order_number:     'PurchaseOrder.number',
-    order_created_at: 'PurchaseOrder.created_at',
-    quantity:         'Purchase::LineItem.quantity',
-    unit_price:       'Purchase::LineItem.unit_price',
-    item_total:       'Purchase::LineItem.item_total'
+    first_name:       { source: 'User.first_name' },
+    last_name:        { source: 'User.last_name' },
+    order_number:     { source: 'PurchaseOrder.number' },
+    order_created_at: { source: 'PurchaseOrder.created_at' },
+    quantity:         { source: 'Purchase::LineItem.quantity' },
+    unit_price:       { source: 'Purchase::LineItem.unit_price' },
+    item_total:       { source: 'Purchase::LineItem.item_total }'
   }
 end
 ```
@@ -570,14 +570,14 @@ The related definition would be :
 ```ruby
 def view_columns
   @view_columns ||= {
-    course_type:     'CourseType.name',
-    course_name:     'Course.name',
-    contact_name:    'Contact.full_name',
-    competency_type: 'CompetencyType.name',
-    event_title:     'Event.title',
-    event_start:     'Event.event_start',
-    event_end:       'Event.event_end',
-    event_status:    'Event.status',
+    course_type:     { source: 'CourseType.name' },
+    course_name:     { source: 'Course.name' },
+    contact_name:    { source: 'Contact.full_name' },
+    competency_type: { source: 'CompetencyType.name' },
+    event_title:     { source: 'Event.title' },
+    event_start:     { source: 'Event.event_start' },
+    event_end:       { source: 'Event.event_end' },
+    event_status:    { source: 'Event.status' },
   }
 end
 

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/bundle

@@ -0,0 +1,114 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m = Module.new do
+  module_function
+
+  def invoked_as_script?
+    File.expand_path($0) == File.expand_path(__FILE__)
+  end
+
+  def env_var_version
+    ENV["BUNDLER_VERSION"]
+  end
+
+  def cli_arg_version
+    return unless invoked_as_script? # don't want to hijack other binstubs
+    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+    bundler_version = nil
+    update_index = nil
+    ARGV.each_with_index do |a, i|
+      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
+        bundler_version = a
+      end
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+      bundler_version = $1
+      update_index = i
+    end
+    bundler_version
+  end
+
+  def gemfile
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    return gemfile if gemfile && !gemfile.empty?
+
+    File.expand_path("../../Gemfile", __FILE__)
+  end
+
+  def lockfile
+    lockfile =
+      case File.basename(gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
+      else "#{gemfile}.lock"
+      end
+    File.expand_path(lockfile)
+  end
+
+  def lockfile_version
+    return unless File.file?(lockfile)
+    lockfile_contents = File.read(lockfile)
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+    Regexp.last_match(1)
+  end
+
+  def bundler_version
+    @bundler_version ||=
+      env_var_version || cli_arg_version ||
+        lockfile_version
+  end
+
+  def bundler_requirement
+    return "#{Gem::Requirement.default}.a" unless bundler_version
+
+    bundler_gem_version = Gem::Version.new(bundler_version)
+
+    requirement = bundler_gem_version.approximate_recommendation
+
+    return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0")
+
+    requirement += ".a" if bundler_gem_version.prerelease?
+
+    requirement
+  end
+
+  def load_bundler!
+    ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+    activate_bundler
+  end
+
+  def activate_bundler
+    gem_error = activation_error_handling do
+      gem "bundler", bundler_requirement
+    end
+    return if gem_error.nil?
+    require_error = activation_error_handling do
+      require "bundler/version"
+    end
+    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
+    exit 42
+  end
+
+  def activation_error_handling
+    yield
+    nil
+  rescue StandardError, LoadError => e
+    e
+  end
+end
+
+m.load_bundler!
+
+if m.invoked_as_script?
+  load Gem.bin_path("bundler", "bundle")
+end

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/doc/migrate.md

@@ -1,4 +1,4 @@
-## To migrate from `v1.0.x` to `v1.3.0`
+## To migrate from `v1.x` to `v1.3.0`
 
 The *v1.3.0* version has some breaking changes :
 

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

@@ -62,11 +62,11 @@ module AjaxDatatablesRails
           when :eq, :not_eq, :lt, :gt, :lteq, :gteq, :in
             searchable_integer? ? raw_search(cond) : empty_search
           when :start_with
-            casted_column.matches("#{formatted_value}%")
+            text_search("#{formatted_value}%")
           when :end_with
-            casted_column.matches("%#{formatted_value}")
+            text_search("%#{formatted_value}")
           when :like
-            casted_column.matches("%#{formatted_value}%")
+            text_search("%#{formatted_value}%")
           when :string_eq
             raw_search(:eq)
           when :string_in
@@ -88,11 +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) unless custom_field?
         end
 
         def empty_search