ajax-datatables-rails 1.3.1 → 1.5.0

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' || ENV['DB_ADAPTER'] == 'trilogy'
+  end
+
+  def self.postgresql?
+    ENV['DB_ADAPTER'] == 'postgresql' || ENV['DB_ADAPTER'] == 'postgis'
+  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/datatables/grouped_datatable_array.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class GroupedDatatable < ComplexDatatable
+
+  def get_raw_records
+    User.all.group(:id)
+  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'
@@ -64,9 +70,9 @@ end
 
 def nulls_last_sql(datatable)
   case datatable.db_adapter
-  when :pg, :postgresql, :postgres, :oracle
+  when :pg, :postgresql, :postgres, :oracle, :postgis
     'NULLS LAST'
-  when :mysql, :mysql2, :sqlite, :sqlite3
+  when :mysql, :mysql2, :trilogy, :sqlite, :sqlite3
     'IS NULL'
   else
     raise 'unsupported database adapter'

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.5.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: 2024-04-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !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_6.0.6.gemfile
+- gemfiles/rails_6.1.7.gemfile
+- gemfiles/rails_7.0.8.gemfile
+- gemfiles/rails_7.1.0.gemfile
 - lib/ajax-datatables-rails.rb
 - lib/ajax-datatables-rails/active_record.rb
 - lib/ajax-datatables-rails/base.rb
@@ -291,9 +337,17 @@ files:
 - spec/ajax-datatables-rails/datatable/datatable_spec.rb
 - spec/ajax-datatables-rails/datatable/simple_order_spec.rb
 - spec/ajax-datatables-rails/datatable/simple_search_spec.rb
+- spec/ajax-datatables-rails/orm/active_record_count_records_spec.rb
 - 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 +358,11 @@ 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/datatables/grouped_datatable_array.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 +379,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.5.7
 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: "../"