ajax-datatables-rails 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48269680add42469ca399b87c62e395e7496c576ff1e5e350c67156d2b9daf6e
-  data.tar.gz: 2f1798f22e4cbe46709b54ec31a589c00a076e0a989b67d8aa76f7a550e9531f
+  metadata.gz: b690e6b2bd562caa937795e7aeab2a0cff933087cc48d6949a74feefe94b8715
+  data.tar.gz: 20c23647a4dfbc9d98e342d05d15a831af37aeba0b4ec3d1bba60353988a6c46
 SHA512:
-  metadata.gz: 1821dac17ccb0ecc2e5b81ceffd2e3401a7ebe004e388378ab118046bafcf9634dbcb2dbb28a18a1e7482d21abfd28cf0e3868265a1ed88f0b648e81a701a6e9
-  data.tar.gz: d6ed01a390d8f9c16861d7258a57e65ac40ce5b1fd8bd74f43185e8ad27009393017d64bd33e43e2c649ee59394abc41591a74dff4767d56ddba61435f10de7f
+  metadata.gz: 8eed46ec32eca34390aba3612445be363c20e576b451116c870c5f14dadffe6422c1956368e74f4d7a141e5f36f31c621390fa2299880988c1479f850c3d105c
+  data.tar.gz: 3ec8bbc383634e76dbce2df04f428cae377f9b26ca698ec71a7eae097c9156ba7fcd75eab90f18823660801600e39c75ef4bbdb91f65c13ae65802561f3d4d79

data/.rubocop.yml

@@ -9,7 +9,7 @@ AllCops:
 Documentation:
   Enabled: false
 
-Gemspec/OrderedDependencies:
+Layout/AlignHash:
   Enabled: false
 
 Layout/EmptyLines:
@@ -45,5 +45,8 @@ Metrics/ClassLength:
 Naming/AccessorMethodName:
   Enabled: false
 
-Style/NumericPredicate:
-  Enabled: false
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma

data/.travis.yml

@@ -1,31 +1,24 @@
-dist: trusty
 language: ruby
-sudo: required
 cache: bundler
+sudo: required
 rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.6.5
+  - 2.5.7
+  - 2.4.9
+  - 2.3.8
+  - ruby-head
 gemfile:
-  - gemfiles/rails_4.2.10.gemfile
+  - gemfiles/rails_4.2.11.gemfile
   - gemfiles/rails_5.0.7.gemfile
-  - gemfiles/rails_5.1.6.gemfile
-  - gemfiles/rails_5.2.0.gemfile
-after_success:
-  - bundle exec codeclimate-test-reporter
+  - gemfiles/rails_5.1.7.gemfile
+  - gemfiles/rails_5.2.3.gemfile
+  - gemfiles/rails_6.0.1.gemfile
 services:
   - postgresql
   - mysql
 addons:
   postgresql: '9.6'
-  apt:
-    packages:
-    - mysql-server-5.6
-    - mysql-client-core-5.6
-    - mysql-client-5.6
 before_install:
-  - gem update --system
-  - gem install bundler
   - sh -c "if [ '$DB_ADAPTER' = 'mysql2' ]; then mysql -e 'create database ajax_datatables_rails;'; fi"
   - sh -c "if [ '$DB_ADAPTER' = 'postgresql' ]; then psql -c 'create database ajax_datatables_rails;' -U postgres; fi"
   - sh -c "if [ '$DB_ADAPTER' = 'oracle_enhanced' ]; then ./spec/install_oracle.sh; fi"
@@ -41,5 +34,16 @@ env:
     - DB_ADAPTER=sqlite3
     - DB_ADAPTER=oracle_enhanced
 matrix:
-  allow_failures:
-    - env: DB_ADAPTER=oracle_enhanced
+  exclude:
+    - rvm: ruby-head
+      gemfile: gemfiles/rails_4.2.11.gemfile
+    - rvm: 2.3.8
+      gemfile: gemfiles/rails_6.0.1.gemfile
+    - rvm: 2.4.9
+      gemfile: gemfiles/rails_6.0.1.gemfile
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/Appraisals

@@ -1,21 +1,36 @@
 # frozen_string_literal: true
 
 RAILS_VERSIONS = {
-  '4.2.10' => {
-    'activerecord-oracle_enhanced-adapter' => '~> 1.6.0'
+  '4.2.11' => {
+    'activerecord-oracle_enhanced-adapter' => '~> 1.6.0',
+    'sqlite3' => '~> 1.3.0',
+    'mysql2' => '0.4.10',
+    'ruby-oci8' => '',
   },
   '5.0.7' => {
     'activerecord-oracle_enhanced-adapter' => '~> 1.7.0',
-    'ruby-oci8' => ''
+    'sqlite3' => '~> 1.3.0',
+    'mysql2' => '',
+    'ruby-oci8' => '',
   },
-  '5.1.6' => {
+  '5.1.7' => {
     'activerecord-oracle_enhanced-adapter' => '~> 1.8.0',
-    'ruby-oci8' => ''
+    'sqlite3' => '~> 1.3.0',
+    'mysql2' => '',
+    'ruby-oci8' => '',
   },
-  '5.2.0' => {
+  '5.2.3' => {
     'activerecord-oracle_enhanced-adapter' => '~> 5.2.0',
-    'ruby-oci8' => ''
-  }
+    'sqlite3' => '~> 1.3.0',
+    'mysql2' => '',
+    'ruby-oci8' => '',
+  },
+  '6.0.1' => {
+    'activerecord-oracle_enhanced-adapter' => '~> 6.0.0',
+    'sqlite3' => '~> 1.4.0',
+    'mysql2' => '',
+    'ruby-oci8' => '',
+  },
 }.freeze
 
 RAILS_VERSIONS.each do |version, gems|

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 1.1.0 (to come)
+
+* Add rudimentary support for Microsoft SQL Server
+* Fixes errors when options[param] is nil [PR 315](https://github.com/jbox-web/ajax-datatables-rails/pull/315) (thanks @allard)
+* Improve query performance when nulls_last option is enabled [PR 317](https://github.com/jbox-web/ajax-datatables-rails/pull/317) (thanks @natebird)
+* Add :string_in cond [PR 323](https://github.com/jbox-web/ajax-datatables-rails/pull/323) (thanks @donnguyen)
+* Rename `sanitize` private method [PR 326](https://github.com/jbox-web/ajax-datatables-rails/pull/326) (thanks @epipheus)
+* Update documentation
+* Test with latest Rails (6.x) and Ruby versions (2.6)
+
+This is the last version to support Rails 4.x and Ruby 2.3.x.
+
 ## 1.0.0 (2018-08-28)
 
 * Breaking change: Remove dependency on view_context [Issue #288](https://github.com/jbox-web/ajax-datatables-rails/issues/288)

data/Gemfile

@@ -3,8 +3,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-# CodeClimate Test Coverage
-group :test do
-  gem 'codeclimate-test-reporter', '~> 1.0.0'
-end

data/README.md

@@ -3,7 +3,7 @@
 [![GitHub license](https://img.shields.io/github/license/jbox-web/ajax-datatables-rails.svg)](https://github.com/jbox-web/ajax-datatables-rails/blob/master/LICENSE)
 [![Gem](https://img.shields.io/gem/v/ajax-datatables-rails.svg)](https://rubygems.org/gems/ajax-datatables-rails)
 [![Gem](https://img.shields.io/gem/dtv/ajax-datatables-rails.svg)](https://rubygems.org/gems/ajax-datatables-rails)
-[![Build Status](https://travis-ci.org/jbox-web/ajax-datatables-rails.svg?branch=master)](https://travis-ci.org/jbox-web/ajax-datatables-rails)
+[![Build Status](https://travis-ci.com/jbox-web/ajax-datatables-rails.svg?branch=master)](https://travis-ci.com/jbox-web/ajax-datatables-rails)
 [![Code Climate](https://codeclimate.com/github/jbox-web/ajax-datatables-rails/badges/gpa.svg)](https://codeclimate.com/github/jbox-web/ajax-datatables-rails)
 [![Test Coverage](https://codeclimate.com/github/jbox-web/ajax-datatables-rails/badges/coverage.svg)](https://codeclimate.com/github/jbox-web/ajax-datatables-rails/coverage)
 
@@ -11,8 +11,8 @@
 
 It's tested against :
 
-* Rails 4.2.10 / 5.0.7 / 5.1.6 / 5.2.0
-* Ruby 2.3.7 / 2.4.4 / 2.5.1
+* Rails 4.2.11 / 5.0.7 / 5.1.7 / 5.2.3 / 6.0.1
+* Ruby 2.3.8 / 2.4.9 / 2.5.7 / 2.6.5
 * Postgresql 9.6
 * MySQL 5.6
 * Oracle XE 11.2 (thanks to [travis-oracle](https://github.com/cbandy/travis-oracle))
@@ -215,7 +215,7 @@ end
 
 `cond` can be :
 
-* `:like`, `:start_with`, `:end_with`, `:string_eq` for string or full text search
+* `:like`, `:start_with`, `:end_with`, `:string_eq`, `:string_in` for string or full text search
 * `:eq`, `:not_eq`, `:lt`, `:gt`, `:lteq`, `:gteq`, `:in` for numeric
 * `:date_range` for date range (only for Rails > 4.2.x, see [here](#daterange-search))
 * `:null_value` for nil field
@@ -337,6 +337,8 @@ Don't forget to make sure the proper route has been added to `config/routes.rb`.
 
 [See here](#pass-options-to-the-datatable-class) if you need to inject params in the `UserDatatable`.
 
+**Note :** If you have more than **2** datatables in your application, don't forget to read [this](#use-http-post-method-medium).
+
 ### 5) Wire up the Javascript
 
 Finally, the javascript to tie this all together. In the appropriate `coffee` file:
@@ -348,7 +350,8 @@ $ ->
   $('#users-datatable').dataTable
     processing: true
     serverSide: true
-    ajax: $('#users-datatable').data('source')
+    ajax:
+      url: $('#users-datatable').data('source')
     pagingType: 'full_numbers'
     columns: [
       {data: 'id'}
@@ -371,7 +374,9 @@ jQuery(document).ready(function() {
   $('#users-datatable').dataTable({
     "processing": true,
     "serverSide": true,
-    "ajax": $('#users-datatable').data('source'),
+    "ajax": {
+      "url": $('#users-datatable').data('source')
+    },
     "pagingType": "full_numbers",
     "columns": [
       {"data": "id"},
@@ -451,7 +456,8 @@ It also helps in separating view/presentation logic from filtering logic (the on
 Example :
 
 ```ruby
-...
+class UserDatatable < AjaxDatatablesRails::ActiveRecord
+  ...
   def data
     records.map do |record|
       {
@@ -464,7 +470,8 @@ Example :
       }
     end
   end
-...
+  ...
+end
 
 class UserDecorator < ApplicationDecorator
   delegate :last_name, :bio
@@ -653,7 +660,7 @@ This feature works with [yadcf](https://github.com/vedmack/yadcf).
 
 To enable the date range search, for example `created_at` :
 
-* add a 'created_at' `<th>` in your html
+* add a `created_at` `<th>` in your html
 * declare your column in `view_columns` : `created_at: { source: 'Post.created_at', cond: :date_range, delimiter: '-yadcf_delim-' }`
 * add it in `data` : `created_at: record.decorate.created_at`
 * setup yadcf to make `created_at` search field a range
@@ -680,9 +687,21 @@ In the end, it's up to the developer which model(s), scope(s), relationship(s)
 (or else) to employ inside the datatable class to retrieve records from the
 database.
 
+## Tests
+
+Datatables can be tested with Capybara provided you don't use Webrick during integration tests.
+
+Long story short and as a rule of thumb : use the same webserver everywhere (dev, prod, staging, test, etc...).
+
+If you use Puma (the Rails default webserver), use Puma everywhere, even in CI/test environment. The same goes for Thin.
+
+You will avoid the usual story : it works in dev but not in test environment...
+
+If you want to test datatables with a lot of data you might need this kind of tricks : https://robots.thoughtbot.com/automatically-wait-for-ajax-with-capybara. (thanks CharlieIGG)
+
 ## ProTips™
 
-### Create a master parent class
+### Create a master parent class (Easy)
 
 In the same spirit of Rails `ApplicationController` and `ApplicationRecord`, you can create an `ApplicationDatatable` class (in `app/datatables/application_datatable.rb`)
 that will be inherited from other classes :
@@ -698,34 +717,7 @@ end
 
 This way it will be easier to DRY you datatables.
 
-### Create indices for Postgresql
-
-In order to speed up the `ILIKE` queries that are executed when using the default configuration, you might want to consider adding some indices.
-For postgresql, you are advised to use the [gin/gist index type](http://www.postgresql.org/docs/current/interactive/pgtrgm.html).
-This makes it necessary to enable the postgrsql extension `pg_trgm`. Double check that you have this extension installed before trying to enable it.
-A migration for enabling the extension and creating the indices could look like this:
-
-```ruby
-def change
-  enable_extension :pg_trgm
-  TEXT_SEARCH_ATTRIBUTES = ['your', 'attributes']
-  TABLE = 'your_table'
-
-  TEXT_SEARCH_ATTRIBUTES.each do |attr|
-    reversible do |dir|
-      dir.up do
-        execute "CREATE INDEX #{TABLE}_#{attr}_gin ON #{TABLE} USING gin(#{attr} gin_trgm_ops)"
-      end
-
-      dir.down do
-        remove_index TABLE.to_sym, name: "#{TABLE}_#{attr}_gin"
-      end
-    end
-  end
-end
-```
-
-### Speedup JSON rendering
+### Speedup JSON rendering (Easy)
 
 Install [yajl-ruby](https://github.com/brianmario/yajl-ruby), basically :
 
@@ -741,9 +733,9 @@ $ bundle install
 
 That's all :) ([Automatically prefer Yajl or JSON backend over Yaml, if available](https://github.com/rails/rails/commit/63bb955a99eb46e257655c93dd64e86ebbf05651))
 
-### Use HTTP `POST` method
+### Use HTTP `POST` method (Medium)
 
-Use HTTP `POST` method to avoid `414 Request-URI Too Large` error. See : [#278](https://github.com/jbox-web/ajax-datatables-rails/issues/278).
+Use HTTP `POST` method to avoid `414 Request-URI Too Large` error. See : [#278](https://github.com/jbox-web/ajax-datatables-rails/issues/278) and [#308](https://github.com/jbox-web/ajax-datatables-rails/issues/308#issuecomment-424897335).
 
 You can easily define a route concern in `config/routes.rb` and reuse it when you need it :
 
@@ -806,6 +798,33 @@ $ ->
     # ...others options, see [here](#5-wire-up-the-javascript)
 ```
 
+### Create indices for Postgresql (Expert)
+
+In order to speed up the `ILIKE` queries that are executed when using the default configuration, you might want to consider adding some indices.
+For postgresql, you are advised to use the [gin/gist index type](http://www.postgresql.org/docs/current/interactive/pgtrgm.html).
+This makes it necessary to enable the postgrsql extension `pg_trgm`. Double check that you have this extension installed before trying to enable it.
+A migration for enabling the extension and creating the indices could look like this:
+
+```ruby
+def change
+  enable_extension :pg_trgm
+  TEXT_SEARCH_ATTRIBUTES = ['your', 'attributes']
+  TABLE = 'your_table'
+
+  TEXT_SEARCH_ATTRIBUTES.each do |attr|
+    reversible do |dir|
+      dir.up do
+        execute "CREATE INDEX #{TABLE}_#{attr}_gin ON #{TABLE} USING gin(#{attr} gin_trgm_ops)"
+      end
+
+      dir.down do
+        remove_index TABLE.to_sym, name: "#{TABLE}_#{attr}_gin"
+      end
+    end
+  end
+end
+```
+
 ## Tutorial
 
 You'll find a sample project [here](https://github.com/ajahongir/ajax-datatables-rails-v-0-4-0-how-to). Its real world example.

data/Rakefile

@@ -10,6 +10,7 @@ task :console do
   require 'pry'
   require 'rails'
   require 'ajax-datatables-rails'
+  puts 'Loaded AjaxDatatablesRails'
   ARGV.clear
   Pry.start
 end

data/ajax-datatables-rails.gemspec

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.push File.expand_path('lib', __dir__)
-require 'ajax-datatables-rails/version'
+require_relative 'lib/ajax-datatables-rails/version'
 
 Gem::Specification.new do |s|
   s.name        = 'ajax-datatables-rails'
@@ -14,25 +13,20 @@ Gem::Specification.new do |s|
   s.description = "A wrapper around datatable's ajax methods that allow synchronization with server-side pagination in a rails app"
   s.license     = 'MIT'
 
-  s.add_dependency 'railties', '>= 4.2'
+  s.files = `git ls-files`.split("\n")
+
+  s.add_runtime_dependency 'railties', '>= 4.2'
 
-  s.add_development_dependency 'rails', '>= 4.2'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'pg', '< 1.0'
-  s.add_development_dependency 'mysql2'
-  s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'activerecord-oracle_enhanced-adapter'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'generator_spec'
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'appraisal'
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'factory_bot'
   s.add_development_dependency 'faker'
-  s.add_development_dependency 'appraisal'
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  s.require_paths = ['lib']
+  s.add_development_dependency 'generator_spec'
+  s.add_development_dependency 'pg', '< 1.0'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'rails', '>= 4.2'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'simplecov'
 end

data/doc/webpack.md

@@ -5,7 +5,9 @@ We assume here that Bootstrap and FontAwesome are already installed with Webpack
 Inspired by https://datatables.net/download and completed :
 
 Add npm packages :
-
+```sh
+$ yarn add imports-loader
+```
 ```sh
 $ yarn add datatables.net
 $ yarn add datatables.net-bs

data/gemfiles/{rails_4.2.10.gemfile → rails_4.2.11.gemfile}

@@ -2,13 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.2.10"
-gem "mysql2", "0.4.10"
+gem "rails", "4.2.11"
 gem "activerecord-oracle_enhanced-adapter", "~> 1.6.0"
+gem "sqlite3", "~> 1.3.0"
+gem "mysql2", "0.4.10"
 gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
 
-group :test do
-  gem "codeclimate-test-reporter", "~> 1.0.0"
-end
-
 gemspec path: "../"

data/gemfiles/rails_5.0.7.gemfile

@@ -4,10 +4,8 @@ source "https://rubygems.org"
 
 gem "rails", "5.0.7"
 gem "activerecord-oracle_enhanced-adapter", "~> 1.7.0"
+gem "sqlite3", "~> 1.3.0"
+gem "mysql2"
 gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
 
-group :test do
-  gem "codeclimate-test-reporter", "~> 1.0.0"
-end
-
 gemspec path: "../"

data/gemfiles/{rails_5.1.6.gemfile → rails_5.1.7.gemfile}

@@ -2,12 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "rails", "5.1.6"
+gem "rails", "5.1.7"
 gem "activerecord-oracle_enhanced-adapter", "~> 1.8.0"
+gem "sqlite3", "~> 1.3.0"
+gem "mysql2"
 gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
 
-group :test do
-  gem "codeclimate-test-reporter", "~> 1.0.0"
-end
-
 gemspec path: "../"

data/gemfiles/{rails_5.2.0.gemfile → rails_5.2.3.gemfile}

@@ -2,12 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "rails", "5.2.0"
+gem "rails", "5.2.3"
 gem "activerecord-oracle_enhanced-adapter", "~> 5.2.0"
+gem "sqlite3", "~> 1.3.0"
+gem "mysql2"
 gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
 
-group :test do
-  gem "codeclimate-test-reporter", "~> 1.0.0"
-end
-
 gemspec path: "../"

data/gemfiles/rails_6.0.1.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "6.0.1"
+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/lib/ajax-datatables-rails/base.rb

@@ -33,7 +33,7 @@ module AjaxDatatablesRails
       {
         recordsTotal:    records_total_count,
         recordsFiltered: records_filtered_count,
-        data:            sanitize(data)
+        data:            sanitize_data(data),
       }.merge(get_additional_data)
     end
 
@@ -81,7 +81,7 @@ module AjaxDatatablesRails
       end
     end
 
-    def sanitize(data)
+    def sanitize_data(data)
       data.map do |record|
         if record.is_a?(Array)
           record.map { |td| ERB::Util.html_escape(td) }
@@ -111,6 +111,15 @@ module AjaxDatatablesRails
       GLOBAL_SEARCH_DELIMITER
     end
 
+    def column_id(name)
+      view_columns.keys.index(name.to_sym)
+    end
+
+    def column_data(column)
+      id = column_id(column)
+      params.dig('columns', id.to_s, 'search', 'value')
+    end
+
     def raw_records_error_text
       <<-ERROR
 

data/lib/ajax-datatables-rails/datatable/column.rb

@@ -4,10 +4,11 @@ module AjaxDatatablesRails
   module Datatable
     class Column
 
-      TYPE_CAST_DEFAULT = 'VARCHAR'
-      TYPE_CAST_MYSQL   = 'CHAR'
-      TYPE_CAST_SQLITE  = 'TEXT'
-      TYPE_CAST_ORACLE  = 'VARCHAR2(4000)'
+      TYPE_CAST_DEFAULT   = 'VARCHAR'
+      TYPE_CAST_MYSQL     = 'CHAR'
+      TYPE_CAST_SQLITE    = 'TEXT'
+      TYPE_CAST_ORACLE    = 'VARCHAR2(4000)'
+      TYPE_CAST_SQLSERVER = 'VARCHAR(4000)'
 
       DB_ADAPTER_TYPE_CAST = {
         mysql:          TYPE_CAST_MYSQL,
@@ -15,7 +16,8 @@ module AjaxDatatablesRails
         sqlite:         TYPE_CAST_SQLITE,
         sqlite3:        TYPE_CAST_SQLITE,
         oracle:         TYPE_CAST_ORACLE,
-        oracleenhanced: TYPE_CAST_ORACLE
+        oracleenhanced: TYPE_CAST_ORACLE,
+        sqlserver:      TYPE_CAST_SQLSERVER,
       }.freeze
 
       attr_reader :datatable, :index, :options

data/lib/ajax-datatables-rails/datatable/column/date_filter.rb

@@ -44,6 +44,7 @@ module AjaxDatatablesRails
         # Do a range search
         def date_range_search
           return nil if empty_range_search?
+
           table[field].between(DateRange.new(range_start_casted, range_end_casted))
         end
 

data/lib/ajax-datatables-rails/datatable/column/search.rb

@@ -71,6 +71,8 @@ module AjaxDatatablesRails
             casted_column.matches("%#{formatted_value}%")
           when :string_eq
             raw_search(:eq)
+          when :string_in
+            raw_search(:in)
           when :date_range
             date_range_search
           end

data/lib/ajax-datatables-rails/datatable/datatable.rb

@@ -68,6 +68,8 @@ module AjaxDatatablesRails
       end
 
       def get_param(param)
+        return {} if options[param].nil?
+
         options[param].to_unsafe_h.with_indifferent_access
       end
 

data/lib/ajax-datatables-rails/datatable/simple_order.rb

@@ -14,11 +14,7 @@ module AjaxDatatablesRails
       end
 
       def query(sort_column)
-        if sort_nulls_last?
-          "CASE WHEN #{sort_column} IS NULL THEN 1 ELSE 0 END, #{sort_column} #{direction}"
-        else
-          "#{sort_column} #{direction}"
-        end
+        [sort_column, direction, nulls_last_sql].compact.join(" ")
       end
 
       def column
@@ -43,6 +39,19 @@ module AjaxDatatablesRails
         column.nulls_last? || AjaxDatatablesRails.config.nulls_last == true
       end
 
+      def nulls_last_sql
+        return unless sort_nulls_last?
+
+        case AjaxDatatablesRails.config.db_adapter
+        when :pg, :postgresql, :postgres, :oracle
+          "NULLS LAST"
+        when :mysql, :mysql2, :sqlite, :sqlite3
+          "IS NULL"
+        else
+          raise 'unsupported database adapter'
+        end
+      end
+
     end
   end
 end

data/lib/ajax-datatables-rails/orm/active_record.rb

@@ -12,7 +12,7 @@ module AjaxDatatablesRails
         records.where(build_conditions)
       end
 
-      # rubocop:disable Style/EachWithObject
+      # rubocop:disable Style/EachWithObject, Style/SafeNavigation
       def sort_records(records)
         sort_by = datatable.orders.inject([]) do |queries, order|
           column = order.column
@@ -21,7 +21,7 @@ module AjaxDatatablesRails
         end
         records.order(Arel.sql(sort_by.join(', ')))
       end
-      # rubocop:enable Style/EachWithObject
+      # rubocop:enable Style/EachWithObject, Style/SafeNavigation
 
       def paginate_records(records)
         records.offset(datatable.offset).limit(datatable.per_page)

data/lib/ajax-datatables-rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AjaxDatatablesRails
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/ajax-datatables-rails/base_spec.rb

@@ -54,7 +54,7 @@ describe AjaxDatatablesRails::Base do
 
         it 'should html escape data' do
           create(:user, first_name: 'Name "><img src=x onerror=alert("first_name")>', last_name: 'Name "><img src=x onerror=alert("last_name")>')
-          data = datatable.send(:sanitize, datatable.data)
+          data = datatable.send(:sanitize_data, datatable.data)
           item = data.first
           expect(item[:first_name]).to eq 'Name &quot;&gt;&lt;img src=x onerror=alert(&quot;first_name&quot;)&gt;'
           expect(item[:last_name]).to eq 'Name &quot;&gt;&lt;img src=x onerror=alert(&quot;last_name&quot;)&gt;'
@@ -74,7 +74,7 @@ describe AjaxDatatablesRails::Base do
 
         it 'should html escape data' do
           create(:user, first_name: 'Name "><img src=x onerror=alert("first_name")>', last_name: 'Name "><img src=x onerror=alert("last_name")>')
-          data = datatable.send(:sanitize, datatable.data)
+          data = datatable.send(:sanitize_data, datatable.data)
           item = data.first
           expect(item[2]).to eq 'Name &quot;&gt;&lt;img src=x onerror=alert(&quot;first_name&quot;)&gt;'
           expect(item[3]).to eq 'Name &quot;&gt;&lt;img src=x onerror=alert(&quot;last_name&quot;)&gt;'
@@ -222,6 +222,25 @@ describe AjaxDatatablesRails::Base do
           expect(datatable.datatable.send(:per_page)).to eq(20)
         end
       end
+
+      describe '#column_id' do
+        let(:datatable) { ComplexDatatable.new(sample_params) }
+
+        it 'should return column id from view_columns hash' do
+          expect(datatable.send(:column_id, :username)).to eq(0)
+          expect(datatable.send(:column_id, 'username')).to eq(0)
+        end
+      end
+
+      describe '#column_data' do
+        let(:datatable) { ComplexDatatable.new(sample_params) }
+        before { datatable.params[:columns]['0'][:search][:value] = 'doe' }
+
+        it 'should return column data from params' do
+          expect(datatable.send(:column_data, :username)).to eq('doe')
+          expect(datatable.send(:column_data, 'username')).to eq('doe')
+        end
+      end
     end
   end
 end

data/spec/ajax-datatables-rails/datatable/column_spec.rb

@@ -167,12 +167,12 @@ describe AjaxDatatablesRails::Datatable::Column do
       expect(column.send(:type_cast)).to eq('VARCHAR')
     end
 
-    it 'returns VARCHAR if :db_adapter is :oracle' do
+    it 'returns VARCHAR2(4000) if :db_adapter is :oracle' do
       allow_any_instance_of(AjaxDatatablesRails::Configuration).to receive(:db_adapter) { :oracle }
       expect(column.send(:type_cast)).to eq('VARCHAR2(4000)')
     end
 
-    it 'returns VARCHAR if :db_adapter is :oracleenhanced' do
+    it 'returns VARCHAR2(4000) if :db_adapter is :oracleenhanced' do
       allow_any_instance_of(AjaxDatatablesRails::Configuration).to receive(:db_adapter) { :oracleenhanced }
       expect(column.send(:type_cast)).to eq('VARCHAR2(4000)')
     end
@@ -196,5 +196,10 @@ describe AjaxDatatablesRails::Datatable::Column do
       allow_any_instance_of(AjaxDatatablesRails::Configuration).to receive(:db_adapter) { :sqlite3 }
       expect(column.send(:type_cast)).to eq('TEXT')
     end
+
+    it 'returns VARCHAR(4000) if :db_adapter is :sqlserver' do
+      allow_any_instance_of(AjaxDatatablesRails::Configuration).to receive(:db_adapter) { :sqlserver }
+      expect(column.send(:type_cast)).to eq('VARCHAR(4000)')
+    end
   end
 end

data/spec/ajax-datatables-rails/datatable/simple_order_spec.rb

@@ -18,8 +18,10 @@ describe AjaxDatatablesRails::Datatable::SimpleOrder do
       after  { AjaxDatatablesRails.config.nulls_last = false }
 
       it 'sql query' do
+        skip('unsupported database adapter') if ENV['DB_ADAPTER'] == 'oracle_enhanced'
+
         expect(simple_order.query('email')).to eq(
-          'CASE WHEN email IS NULL THEN 1 ELSE 0 END, email DESC'
+          "email DESC #{nulls_last_sql}"
         )
       end
     end
@@ -28,12 +30,29 @@ describe AjaxDatatablesRails::Datatable::SimpleOrder do
       let(:sorted_datatable) { DatatableOrderNullsLast.new(sample_params).datatable }
       let(:nulls_last_order) { AjaxDatatablesRails::Datatable::SimpleOrder.new(sorted_datatable, options) }
 
-      it 'sql query' do
-        expect(nulls_last_order.query('email')).to eq(
-          'CASE WHEN email IS NULL THEN 1 ELSE 0 END, email DESC'
-        )
+      context 'with postgres database adapter' do
+        before { AjaxDatatablesRails.config.db_adapter = :pg }
+
+        it 'sql query' do
+          expect(nulls_last_order.query('email')).to eq('email DESC NULLS LAST')
+        end
+      end
+
+      context 'with sqlite database adapter' do
+        before { AjaxDatatablesRails.config.db_adapter = :sqlite }
+
+        it 'sql query' do
+          expect(nulls_last_order.query('email')).to eq('email DESC IS NULL')
+        end
+      end
+
+      context 'with mysql database adapter' do
+        before { AjaxDatatablesRails.config.db_adapter = :mysql }
+
+        it 'sql query' do
+          expect(nulls_last_order.query('email')).to eq('email DESC IS NULL')
+        end
       end
     end
   end
-
 end

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

@@ -126,7 +126,7 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
         expect(result).to be_a(Arel::Nodes::And)
       end
 
-      if AjaxDatatablesRails.config.db_adapter == :postgresql
+      if ENV['DB_ADAPTER'] == 'postgresql'
         context 'when db_adapter is postgresql' do
           it 'can call #to_sql on returned object' do
             result = datatable.build_conditions_for_selected_columns
@@ -138,7 +138,7 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
         end
       end
 
-      if AjaxDatatablesRails.config.db_adapter.in? %i[oracle oracleenhanced]
+      if ENV['DB_ADAPTER'] == 'oracle_enhanced'
         context 'when db_adapter is oracle' do
           it 'can call #to_sql on returned object' do
             result = datatable.build_conditions_for_selected_columns
@@ -150,7 +150,7 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
         end
       end
 
-      if AjaxDatatablesRails.config.db_adapter.in? %i[mysql2 sqlite3]
+      if ENV['DB_ADAPTER'] == 'mysql2'
         context 'when db_adapter is mysql2' do
           it 'can call #to_sql on returned object' do
             result = datatable.build_conditions_for_selected_columns
@@ -288,7 +288,7 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
         create(:user, last_name: 'MARY')
       end
 
-      if AjaxDatatablesRails.config.db_adapter == :oracleenhanced
+      if ENV['DB_ADAPTER'] == 'oracle_enhanced'
         context 'when db_adapter is oracleenhanced' do
           it 'should filter records matching' do
             datatable.params[:columns]['3'][:search][:value] = 'RY'
@@ -339,6 +339,40 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
       end
     end
 
+    describe 'it can filter records with condition :string_in' do
+      let(:datatable) { DatatableCondStringIn.new(sample_params) }
+
+      before(:each) do
+        create(:user, email: 'john@foo.com')
+        create(:user, email: 'mary@bar.com')
+        create(:user, email: 'henry@baz.com')
+      end
+
+      it 'should filter records matching' do
+        datatable.params[:columns]['1'][:search][:value] = 'john@foo.com'
+        expect(datatable.data.size).to eq 1
+        item = datatable.data.first
+        expect(item[:email]).to eq 'john@foo.com'
+      end
+
+      it 'should filter records matching with multiple' do
+        datatable.params[:columns]['1'][:search][:value] = 'john@foo.com|henry@baz.com'
+        expect(datatable.data.size).to eq 2
+        items = datatable.data.sort_by { |h| h[:email] }
+        item_first = items.first
+        item_last = items.last
+        expect(item_first[:email]).to eq 'henry@baz.com'
+        expect(item_last[:email]).to eq 'john@foo.com'
+      end
+
+      it 'should filter records matching with multiple contains not found' do
+        datatable.params[:columns]['1'][:search][:value] = 'john@foo.com|henry_not@baz.com'
+        expect(datatable.data.size).to eq 1
+        item = datatable.data.first
+        expect(item[:email]).to eq 'john@foo.com'
+      end
+    end
+
     describe 'it can filter records with condition :null_value' do
       let(:datatable) { DatatableCondNullValue.new(sample_params) }
 

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

@@ -16,8 +16,8 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
     end
 
     it 'paginates records properly' do
-      if AjaxDatatablesRails.config.db_adapter.in? %i[oracle oracleenhanced]
-        if Rails.version.in? %w[4.0.13 4.1.16 4.2.10]
+      if ENV['DB_ADAPTER'] == 'oracle_enhanced'
+        if Rails.version.in? %w[4.2.11]
           expect(datatable.paginate_records(records).to_sql).to include(
             'rownum <= 10'
           )
@@ -34,8 +34,8 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
 
       datatable.params[:start] = '26'
       datatable.params[:length] = '25'
-      if AjaxDatatablesRails.config.db_adapter.in? %i[oracle oracleenhanced]
-        if Rails.version.in? %w[4.0.13 4.1.16 4.2.10]
+      if ENV['DB_ADAPTER'] == 'oracle_enhanced'
+        if Rails.version.in? %w[4.2.11]
           expect(datatable.paginate_records(records).to_sql).to include(
             'rownum <= 51'
           )

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

@@ -49,26 +49,28 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
     after  { AjaxDatatablesRails.config.nulls_last = false }
 
     it 'can handle multiple sorting columns' do
+      skip('unsupported database adapter') if ENV['DB_ADAPTER'] == 'oracle_enhanced'
+
       # set to order by Users username in ascending order, and
       # by Users email in descending order
       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 CASE WHEN users.username IS NULL THEN 1 ELSE 0 END, users.username ASC, ' +
-        'CASE WHEN users.email IS NULL THEN 1 ELSE 0 END, users.email DESC'
+        "ORDER BY users.username ASC #{nulls_last_sql}, users.email DESC #{nulls_last_sql}"
       )
     end
   end
 
   describe '#sort_records with nulls last using column config' do
     it 'can handle multiple sorting columns' do
+      skip('unsupported database adapter') if ENV['DB_ADAPTER'] == 'oracle_enhanced'
+
       # set to order by Users username in ascending order, and
       # by Users email in descending order
       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, ' +
-        'CASE WHEN users.email IS NULL THEN 1 ELSE 0 END, users.email DESC'
+        "ORDER BY users.username ASC, users.email DESC #{nulls_last_sql}"
       )
     end
   end

data/spec/install_oracle.sh

@@ -4,9 +4,15 @@ 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
 
-~/.travis/oracle/download.sh
+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
+
 ~/.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;
 SQL

data/spec/support/datatable_cond_string.rb

@@ -22,6 +22,12 @@ class DatatableCondStringEq < ComplexDatatable
   end
 end
 
+class DatatableCondStringIn < ComplexDatatable
+  def view_columns
+    super.deep_merge(email: { cond: :string_in, formatter: -> (o) { o.split("|") } })
+  end
+end
+
 class DatatableCondNullValue < ComplexDatatable
   def view_columns
     super.deep_merge(email: { cond: :null_value })

data/spec/support/test_helpers.rb

@@ -97,3 +97,14 @@ class ComplexDatatableArray < ComplexDatatable
     end
   end
 end
+
+def nulls_last_sql
+  case AjaxDatatablesRails.config.db_adapter
+  when :pg, :postgresql, :postgres, :oracle
+    "NULLS LAST"
+  when :mysql, :mysql2, :sqlite, :sqlite3
+    "IS NULL"
+  else
+    raise 'unsupported database adapter'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ajax-datatables-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Joel Quenneville
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-25 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -26,21 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: rake
+  name: activerecord-oracle_enhanced-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,21 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord-oracle_enhanced-adapter
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -138,21 +110,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -166,21 +138,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: factory_bot
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -194,7 +166,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -208,7 +180,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -244,10 +216,11 @@ files:
 - ajax-datatables-rails.gemspec
 - doc/migrate.md
 - doc/webpack.md
-- gemfiles/rails_4.2.10.gemfile
+- gemfiles/rails_4.2.11.gemfile
 - gemfiles/rails_5.0.7.gemfile
-- gemfiles/rails_5.1.6.gemfile
-- gemfiles/rails_5.2.0.gemfile
+- gemfiles/rails_5.1.7.gemfile
+- gemfiles/rails_5.2.3.gemfile
+- gemfiles/rails_6.0.1.gemfile
 - lib/ajax-datatables-rails.rb
 - lib/ajax-datatables-rails/active_record.rb
 - lib/ajax-datatables-rails/base.rb
@@ -307,31 +280,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A gem that simplifies using datatables and hundreds of records via ajax
-test_files:
-- 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
-- spec/ajax-datatables-rails/orm/active_record_spec.rb
-- 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/schema.rb
-- spec/support/test_helpers.rb
-- spec/support/test_models.rb
+test_files: []