ajax-datatables-rails 1.3.0 → 1.3.1

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

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
-describe AjaxDatatablesRails::ORM::ActiveRecord do
+RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
 
   let(:datatable) { ComplexDatatable.new(sample_params) }
   let(:records) { User.all }
 
-  before(:each) do
+  before do
     create(:user, username: 'johndoe', email: 'johndoe@example.com')
     create(:user, username: 'msmith', email: 'mary.smith@example.com')
   end

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

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
-describe AjaxDatatablesRails::ORM::ActiveRecord do
+RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
 
   let(:datatable) { ComplexDatatable.new(sample_params) }
   let(:nulls_last_datatable) { DatatableOrderNullsLast.new(sample_params) }
   let(:records) { User.all }
 
-  before(:each) do
+  before do
     create(:user, username: 'johndoe', email: 'johndoe@example.com')
     create(:user, username: 'msmith', email: 'mary.smith@example.com')
   end
@@ -30,7 +32,7 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
       )
     end
 
-    it 'should not sort a column which is not orderable' do
+    it 'does not sort a column which is not orderable' do
       datatable.params[:order]['0'] = { column: '0', dir: 'asc' }
       datatable.params[:order]['1'] = { column: '4', dir: 'desc' }
 

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,5 @@
+# frozen_string_literal: true
+
 require 'simplecov'
 require 'rspec'
 require 'rspec/retry'
@@ -36,40 +38,54 @@ 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'
-
+# Configure ActiveRecord
 adapter = ENV.fetch('DB_ADAPTER', 'postgresql')
 
 options = {
   adapter:  adapter,
   database: 'ajax_datatables_rails',
-  encoding: 'utf8'
+  encoding: 'utf8',
 }
 
-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'
+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:')
+  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 ||= {

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_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(
@@ -42,7 +44,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 +56,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 +65,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,4 @@
+# frozen_string_literal: true
+
 class User < ActiveRecord::Base
 end

data/spec/support/schema.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define do
   self.verbose = false
 
-  create_table :users, :force => true do |t|
+  create_table :users, force: true do |t|
     t.string  :username
     t.string  :email
     t.string  :first_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ajax-datatables-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Joel Quenneville
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -259,6 +259,7 @@ files:
 - ajax-datatables-rails.gemspec
 - bin/_guard-core
 - bin/appraisal
+- bin/bundle
 - bin/guard
 - bin/rake
 - bin/rspec
@@ -293,7 +294,6 @@ 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/factories/user.rb
 - spec/install_oracle.sh
 - spec/spec_helper.rb
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.7
 signing_key:
 specification_version: 4
 summary: A gem that simplifies using datatables and hundreds of records via ajax

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