ajax-datatables-rails 1.3.0 → 1.4.0

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,7 +1,7 @@
-ActiveRecord::Schema.define do
-  self.verbose = false
+# frozen_string_literal: true
 
-  create_table :users, :force => true do |t|
+ActiveRecord::Schema.define do
+  create_table :users, force: true do |t|
     t.string  :username
     t.string  :email
     t.string  :first_name
@@ -10,5 +10,4 @@ ActiveRecord::Schema.define do
 
     t.timestamps null: false
   end
-
 end

data/spec/dummy/log/.gitignore

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

data/spec/factories/user.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :user do |f|
     f.username   { Faker::Internet.user_name }
     f.email      { Faker::Internet.email }
     f.first_name { Faker::Name.first_name }
     f.last_name  { Faker::Name.last_name }
-    f.post_id    { ((1..100).to_a).sample }
+    f.post_id    { (1..100).to_a.sample }
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +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'
@@ -5,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
@@ -36,40 +40,49 @@ RSpec.configure do |config|
     DatabaseCleaner.clean_with(:truncation)
   end
 
-  config.before(:each) do
+  config.before do
     DatabaseCleaner.strategy = :transaction
   end
 
-  config.before(:each) do
+  config.before do
     DatabaseCleaner.start
   end
 
-  config.after(:each) do
+  config.after do
     DatabaseCleaner.clean
   end
 
+  # disable monkey patching
+  # see: https://relishapp.com/rspec/rspec-core/v/3-8/docs/configuration/zero-monkey-patching-mode
+  config.disable_monkey_patching!
+
   if ENV.key?('GITHUB_ACTIONS')
-    config.around(:each) do |ex|
+    config.around do |ex|
       ex.run_with_retry retry: 3
     end
   end
 end
 
-require 'ajax-datatables-rails'
+class RunningSpec
+  def self.sqlite?
+    ENV['DB_ADAPTER'] == 'sqlite3'
+  end
 
-adapter = ENV.fetch('DB_ADAPTER', 'postgresql')
+  def self.oracle?
+    ENV['DB_ADAPTER'] == 'oracle_enhanced'
+  end
 
-options = {
-  adapter:  adapter,
-  database: 'ajax_datatables_rails',
-  encoding: 'utf8'
-}
+  def self.mysql?
+    ENV['DB_ADAPTER'] == 'mysql2'
+  end
 
-options = options.merge(host: '127.0.0.1', port: 5432, username: 'postgres', password: 'postgres') if adapter == 'postgresql'
-options = options.merge(host: '127.0.0.1', port: 3306, username: 'root', password: 'root') if adapter == 'mysql2'
-options = options.merge(username: ENV['USER'], password: ENV['USER'], database: 'xe', host: '127.0.0.1/xe') if adapter == 'oracle_enhanced'
-options = options.merge(database: ':memory:') if adapter == 'sqlite3'
+  def self.postgresql?
+    ENV['DB_ADAPTER'] == 'postgresql'
+  end
+end
 
-ActiveRecord::Base.establish_connection(options)
+# Require our gem
+require 'ajax-datatables-rails'
 
+# Load test helpers
 Dir[File.dirname(__FILE__) + '/support/**/*.rb'].sort.each { |f| require f }

data/spec/support/datatables/complex_datatable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ComplexDatatable < AjaxDatatablesRails::ActiveRecord
   def view_columns
     @view_columns ||= {
@@ -5,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' },
     }
@@ -17,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/complex_datatable_array.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ComplexDatatableArray < ComplexDatatable
   def data
     records.map do |record|

data/spec/support/datatables/datatable_cond_date.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DatatableCondDate < ComplexDatatable
   def view_columns
     super.deep_merge(created_at: { cond: :date_range })

data/spec/support/datatables/datatable_cond_numeric.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DatatableCondEq < ComplexDatatable
   def view_columns
     super.deep_merge(post_id: { cond: :eq })

data/spec/support/datatables/datatable_cond_proc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DatatableCondProc < ComplexDatatable
   def view_columns
     super.deep_merge(username: { cond: custom_filter })

data/spec/support/datatables/datatable_cond_string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DatatableCondStartWith < ComplexDatatable
   def view_columns
     super.deep_merge(first_name: { cond: :start_with })
@@ -24,7 +26,7 @@ end
 
 class DatatableCondStringIn < ComplexDatatable
   def view_columns
-    super.deep_merge(email: { cond: :string_in, formatter: -> (o) { o.split("|") } })
+    super.deep_merge(email: { cond: :string_in, formatter: ->(o) { o.split('|') } })
   end
 end
 
@@ -36,6 +38,6 @@ end
 
 class DatatableWithFormater < ComplexDatatable
   def view_columns
-    super.deep_merge(last_name: { formatter: -> (o) { o.upcase } })
+    super.deep_merge(last_name: { formatter: ->(o) { o.upcase } })
   end
 end

data/spec/support/datatables/datatable_cond_unknown.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DatatableCondUnknown < ComplexDatatable
   def view_columns
     super.deep_merge(username: { cond: :foo })

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/datatable_order_nulls_last.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DatatableOrderNullsLast < ComplexDatatable
   def view_columns
     super.deep_merge(email: { nulls_last: true })

data/spec/support/helpers/params.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # rubocop:disable Metrics/MethodLength
 def sample_params
   ActionController::Parameters.new(
@@ -29,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'
@@ -42,7 +50,7 @@ def sample_params
         },
       },
       'order' => {
-        '0' => {'column' => '0', 'dir' => 'asc'}
+        '0' => { 'column' => '0', 'dir' => 'asc' },
       },
       'start' => '0', 'length' => '10', 'search' => {
         'value' => '', 'regex' => 'false'
@@ -54,8 +62,8 @@ end
 
 def sample_params_json
   hash_params = sample_params.to_unsafe_h
-  hash_params["columns"] = hash_params["columns"].values
-  hash_params["order"] = hash_params["order"].values
+  hash_params['columns'] = hash_params['columns'].values
+  hash_params['order'] = hash_params['order'].values
   ActionController::Parameters.new(hash_params)
 end
 # rubocop:enable Metrics/MethodLength
@@ -63,9 +71,9 @@ end
 def nulls_last_sql(datatable)
   case datatable.db_adapter
   when :pg, :postgresql, :postgres, :oracle
-    "NULLS LAST"
+    'NULLS LAST'
   when :mysql, :mysql2, :sqlite, :sqlite3
-    "IS NULL"
+    'IS NULL'
   else
     raise 'unsupported database adapter'
   end

data/spec/support/models/user.rb

@@ -1,2 +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.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Joel Quenneville
@@ -9,8 +9,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-04 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,17 +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
@@ -293,7 +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/ajax-datatables-rails/orm/active_record_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.3
+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: "../"

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

@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-describe AjaxDatatablesRails::ORM::ActiveRecord do
-  context 'Private API' do
-    let(:datatable) { ComplexDatatable.new(sample_params) }
-
-    before(:each) do
-      create(:user, username: 'johndoe', email: 'johndoe@example.com')
-      create(:user, username: 'msmith', email: 'mary.smith@example.com')
-    end
-
-    describe '#fetch_records' do
-      it 'calls #get_raw_records' do
-        expect(datatable).to receive(:get_raw_records) { User.all }
-        datatable.fetch_records
-      end
-
-      it 'returns a collection of records' do
-        expect(datatable).to receive(:get_raw_records) { User.all }
-        expect(datatable.fetch_records).to be_a(ActiveRecord::Relation)
-      end
-    end
-  end
-end