ajax-datatables-rails 1.2.0 → 1.3.0

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

@@ -45,8 +45,8 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
   end
 
   describe '#sort_records with nulls last using global config' do
-    before { AjaxDatatablesRails.config.nulls_last = true }
-    after  { AjaxDatatablesRails.config.nulls_last = false }
+    before { datatable.nulls_last = true }
+    after  { datatable.nulls_last = false }
 
     it 'can handle multiple sorting columns' do
       skip('unsupported database adapter') if ENV['DB_ADAPTER'] == 'oracle_enhanced'
@@ -56,7 +56,7 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
       datatable.params[:order]['0'] = { column: '0', dir: 'asc' }
       datatable.params[:order]['1'] = { column: '1', dir: 'desc' }
       expect(datatable.sort_records(records).to_sql).to include(
-        "ORDER BY users.username ASC #{nulls_last_sql}, users.email DESC #{nulls_last_sql}"
+        "ORDER BY users.username ASC #{nulls_last_sql(datatable)}, users.email DESC #{nulls_last_sql(datatable)}"
       )
     end
   end
@@ -70,7 +70,7 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
       nulls_last_datatable.params[:order]['0'] = { column: '0', dir: 'asc' }
       nulls_last_datatable.params[:order]['1'] = { column: '1', dir: 'desc' }
       expect(nulls_last_datatable.sort_records(records).to_sql).to include(
-        "ORDER BY users.username ASC, users.email DESC #{nulls_last_sql}"
+        "ORDER BY users.username ASC, users.email DESC #{nulls_last_sql(datatable)}"
       )
     end
   end

data/spec/install_oracle.sh

@@ -4,8 +4,8 @@ wget 'https://github.com/cbandy/travis-oracle/archive/v2.0.3.tar.gz'
 mkdir -p ~/.travis/oracle
 tar xz --strip-components 1 -C ~/.travis/oracle -f v2.0.3.tar.gz
 
-if [ -n $CUSTOM_ORACLE_FILE ]; then
-  wget -q $CUSTOM_ORACLE_FILE -O ~/.travis/oracle/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
+if [ -n ${CUSTOM_ORACLE_FILE} ]; then
+  wget -q ${CUSTOM_ORACLE_FILE} -O ~/.travis/oracle/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
 else
   ~/.travis/oracle/download.sh
 fi
@@ -13,6 +13,6 @@ fi
 ~/.travis/oracle/install.sh
 
 # in dev env: sqlplus system/password@localhost/XE
-"$ORACLE_HOME/bin/sqlplus" -L -S / AS SYSDBA <<SQL
-ALTER USER $USER IDENTIFIED BY $USER;
+"${ORACLE_HOME}/bin/sqlplus" -L -S / AS SYSDBA <<SQL
+ALTER USER ${USER} IDENTIFIED BY ${USER};
 SQL

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'simplecov'
 require 'rspec'
+require 'rspec/retry'
 require 'database_cleaner'
 require 'factory_bot'
 require 'faker'
@@ -21,12 +22,6 @@ RSpec.configure do |config|
     FactoryBot.find_definitions
   end
 
-  config.after(:each) do
-    AjaxDatatablesRails.configure do |c|
-      c.db_adapter = ActiveRecord::Base.connection.adapter_name.downcase.to_sym
-    end
-  end
-
   config.color = true
   config.fail_fast = false
 
@@ -52,6 +47,12 @@ RSpec.configure do |config|
   config.after(:each) do
     DatabaseCleaner.clean
   end
+
+  if ENV.key?('GITHUB_ACTIONS')
+    config.around(:each) do |ex|
+      ex.run_with_retry retry: 3
+    end
+  end
 end
 
 require 'ajax-datatables-rails'
@@ -64,21 +65,11 @@ options = {
   encoding: 'utf8'
 }
 
-options = options.merge(username: 'root') if adapter == 'mysql2'
+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'
 
 ActiveRecord::Base.establish_connection(options)
 
-AjaxDatatablesRails.configure do |c|
-  c.db_adapter = ActiveRecord::Base.connection.adapter_name.downcase.to_sym
-end
-
-load File.dirname(__FILE__) + '/support/schema.rb'
-load File.dirname(__FILE__) + '/support/test_helpers.rb'
-load File.dirname(__FILE__) + '/support/datatable_cond_date.rb'
-load File.dirname(__FILE__) + '/support/datatable_cond_numeric.rb'
-load File.dirname(__FILE__) + '/support/datatable_cond_proc.rb'
-load File.dirname(__FILE__) + '/support/datatable_cond_string.rb'
-load File.dirname(__FILE__) + '/support/datatable_order_nulls_last.rb'
-require File.dirname(__FILE__) + '/support/test_models.rb'
+Dir[File.dirname(__FILE__) + '/support/**/*.rb'].sort.each { |f| require f }

data/spec/support/datatables/complex_datatable.rb

@@ -0,0 +1,29 @@
+class ComplexDatatable < AjaxDatatablesRails::ActiveRecord
+  def view_columns
+    @view_columns ||= {
+      username:   { source: 'User.username'   },
+      email:      { source: 'User.email'      },
+      first_name: { source: 'User.first_name' },
+      last_name:  { source: 'User.last_name'  },
+      post_id:    { source: 'User.post_id', orderable: false },
+      created_at: { source: 'User.created_at' },
+    }
+  end
+
+  def data
+    records.map do |record|
+      {
+        username:   record.username,
+        email:      record.email,
+        first_name: record.first_name,
+        last_name:  record.last_name,
+        post_id:    record.post_id,
+        created_at: record.created_at,
+      }
+    end
+  end
+
+  def get_raw_records
+    User.all
+  end
+end

data/spec/support/datatables/complex_datatable_array.rb

@@ -0,0 +1,14 @@
+class ComplexDatatableArray < ComplexDatatable
+  def data
+    records.map do |record|
+      [
+        record.username,
+        record.email,
+        record.first_name,
+        record.last_name,
+        record.post_id,
+        record.created_at,
+      ]
+    end
+  end
+end

data/spec/support/datatables/datatable_cond_unknown.rb

@@ -0,0 +1,5 @@
+class DatatableCondUnknown < ComplexDatatable
+  def view_columns
+    super.deep_merge(username: { cond: :foo })
+  end
+end

data/spec/support/{test_helpers.rb → helpers/params.rb}

@@ -51,55 +51,17 @@ def sample_params
     }
   )
 end
-# rubocop:enable Metrics/MethodLength
-
-class ComplexDatatable < AjaxDatatablesRails::ActiveRecord
-  def view_columns
-    @view_columns ||= {
-      username:   { source: 'User.username'   },
-      email:      { source: 'User.email'      },
-      first_name: { source: 'User.first_name' },
-      last_name:  { source: 'User.last_name'  },
-      post_id:    { source: 'User.post_id', orderable: false },
-      created_at: { source: 'User.created_at' },
-    }
-  end
-
-  def data
-    records.map do |record|
-      {
-        username:   record.username,
-        email:      record.email,
-        first_name: record.first_name,
-        last_name:  record.last_name,
-        post_id:    record.post_id,
-        created_at: record.created_at,
-      }
-    end
-  end
 
-  def get_raw_records
-    User.all
-  end
-end
-
-class ComplexDatatableArray < ComplexDatatable
-  def data
-    records.map do |record|
-      [
-        record.username,
-        record.email,
-        record.first_name,
-        record.last_name,
-        record.post_id,
-        record.created_at,
-      ]
-    end
-  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
+  ActionController::Parameters.new(hash_params)
 end
+# rubocop:enable Metrics/MethodLength
 
-def nulls_last_sql
-  case AjaxDatatablesRails.config.db_adapter
+def nulls_last_sql(datatable)
+  case datatable.db_adapter
   when :pg, :postgresql, :postgres, :oracle
     "NULLS LAST"
   when :mysql, :mysql2, :sqlite, :sqlite3

metadata

@@ -1,30 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ajax-datatables-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Joel Quenneville
 - Antonio Antillon
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-19 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -141,16 +127,16 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -171,14 +157,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +193,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -225,16 +225,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '0'
 description: A wrapper around datatable's ajax methods that allow synchronization
   with server-side pagination in a rails app
 email:
@@ -245,10 +245,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -265,14 +265,13 @@ files:
 - bin/rubocop
 - doc/migrate.md
 - doc/webpack.md
-- gemfiles/rails_5.0.7.gemfile
-- gemfiles/rails_5.1.7.gemfile
-- gemfiles/rails_5.2.3.gemfile
-- gemfiles/rails_6.0.1.gemfile
+- gemfiles/rails_5.2.4.gemfile
+- gemfiles/rails_6.0.3.gemfile
+- gemfiles/rails_6.1.0.gemfile
 - lib/ajax-datatables-rails.rb
 - lib/ajax-datatables-rails/active_record.rb
 - lib/ajax-datatables-rails/base.rb
-- lib/ajax-datatables-rails/configuration.rb
+- lib/ajax-datatables-rails/datatable.rb
 - lib/ajax-datatables-rails/datatable/column.rb
 - lib/ajax-datatables-rails/datatable/column/date_filter.rb
 - lib/ajax-datatables-rails/datatable/column/order.rb
@@ -280,19 +279,17 @@ files:
 - lib/ajax-datatables-rails/datatable/datatable.rb
 - lib/ajax-datatables-rails/datatable/simple_order.rb
 - lib/ajax-datatables-rails/datatable/simple_search.rb
+- lib/ajax-datatables-rails/error.rb
+- lib/ajax-datatables-rails/orm.rb
 - lib/ajax-datatables-rails/orm/active_record.rb
 - lib/ajax-datatables-rails/version.rb
-- lib/generators/datatable/config_generator.rb
-- lib/generators/datatable/templates/ajax_datatables_rails_config.rb
 - lib/generators/rails/datatable_generator.rb
 - lib/generators/rails/templates/datatable.rb
 - spec/ajax-datatables-rails/base_spec.rb
-- spec/ajax-datatables-rails/configuration_spec.rb
 - spec/ajax-datatables-rails/datatable/column_spec.rb
 - 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/extended_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
@@ -300,19 +297,26 @@ files:
 - spec/factories/user.rb
 - spec/install_oracle.sh
 - spec/spec_helper.rb
-- spec/support/datatable_cond_date.rb
-- spec/support/datatable_cond_numeric.rb
-- spec/support/datatable_cond_proc.rb
-- spec/support/datatable_cond_string.rb
-- spec/support/datatable_order_nulls_last.rb
+- spec/support/datatables/complex_datatable.rb
+- spec/support/datatables/complex_datatable_array.rb
+- spec/support/datatables/datatable_cond_date.rb
+- spec/support/datatables/datatable_cond_numeric.rb
+- 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_order_nulls_last.rb
+- spec/support/helpers/params.rb
+- spec/support/models/user.rb
 - spec/support/schema.rb
-- spec/support/test_helpers.rb
-- spec/support/test_models.rb
 homepage: https://github.com/jbox-web/ajax-datatables-rails
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/jbox-web/ajax-datatables-rails
+  changelog_uri: https://github.com/jbox-web/ajax-datatables-rails/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/jbox-web/ajax-datatables-rails
+  bug_tracker_uri: https://github.com/jbox-web/ajax-datatables-rails/issues
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -320,15 +324,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.4
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A gem that simplifies using datatables and hundreds of records via ajax
 test_files: []