ajax-datatables-rails 0.4.0 → 0.4.1

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe AjaxDatatablesRails::ORM::ActiveRecord do
 
   let(:view) { double('view', params: sample_params) }
-  let(:datatable) { SampleDatatable.new(view) }
+  let(:datatable) { ComplexDatatable.new(view) }
   let(:records) { User.all }
 
   before(:each) do
@@ -18,7 +18,7 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
 
     it 'paginates records properly' do
       if AjaxDatatablesRails.config.db_adapter.in? %i[oracle oracleenhanced]
-        if Rails.version.in? %w[4.0.13 4.1.15 4.2.8]
+        if Rails.version.in? %w[4.0.13 4.1.16 4.2.10]
           expect(datatable.paginate_records(records).to_sql).to include(
             'rownum <= 10'
           )
@@ -36,18 +36,18 @@ 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.15 4.2.8]
+        if Rails.version.in? %w[4.0.13 4.1.16 4.2.10]
           expect(datatable.paginate_records(records).to_sql).to include(
-            'rownum <= 50'
+            'rownum <= 51'
           )
         else
           expect(datatable.paginate_records(records).to_sql).to include(
-            'rownum <= (25 + 25)'
+            'rownum <= (26 + 25)'
           )
         end
       else
         expect(datatable.paginate_records(records).to_sql).to include(
-          'LIMIT 25 OFFSET 25'
+          'LIMIT 25 OFFSET 26'
         )
       end
     end

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

@@ -4,6 +4,7 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
 
   let(:view) { double('view', params: sample_params) }
   let(:datatable) { ComplexDatatable.new(view) }
+  let(:nulls_last_datatable) { DatatableOrderNullsLast.new(view) }
   let(:records) { User.all }
 
   before(:each) do
@@ -29,6 +30,48 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
         'ORDER BY users.username ASC, users.email DESC'
       )
     end
+
+    it 'should 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' }
+
+      expect(datatable.sort_records(records).to_sql).to include(
+        'ORDER BY users.username ASC'
+      )
+
+      expect(datatable.sort_records(records).to_sql).to_not include(
+        'users.post_id DESC'
+      )
+    end
+  end
+
+  describe '#sort_records with nulls last using global config' do
+    before { AjaxDatatablesRails.config.nulls_last = true }
+    after  { AjaxDatatablesRails.config.nulls_last = false }
+  
+    it 'can handle multiple sorting columns' do
+      # 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'
+      )
+    end
+  end
+  
+  describe '#sort_records with nulls last using column config' do
+    it 'can handle multiple sorting columns' do
+      # 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'
+      )
+    end
   end
 
 end

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe AjaxDatatablesRails::ORM::ActiveRecord do
   context 'Private API' do
     let(:view) { double('view', params: sample_params) }
-    let(:datatable) { SampleDatatable.new(view) }
+    let(:datatable) { ComplexDatatable.new(view) }
 
     before(:each) do
       create(:user, username: 'johndoe', email: 'johndoe@example.com')

data/spec/factories/user.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do |f|
     f.username   { Faker::Internet.user_name }
     f.email      { Faker::Internet.email }

data/spec/install_oracle.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-wget 'https://github.com/cbandy/travis-oracle/archive/v2.0.2.tar.gz'
+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.2.tar.gz
+tar xz --strip-components 1 -C ~/.travis/oracle -f v2.0.3.tar.gz
 
 ~/.travis/oracle/download.sh
 ~/.travis/oracle/install.sh

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'simplecov'
 require 'rspec'
 require 'database_cleaner'
-require 'factory_girl'
+require 'factory_bot'
 require 'faker'
 require 'pry'
 require 'rails'
@@ -15,10 +15,10 @@ end
 
 # Configure RSpec
 RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 
   config.before(:suite) do
-    FactoryGirl.find_definitions
+    FactoryBot.find_definitions
   end
 
   config.after(:each) do
@@ -78,4 +78,9 @@ 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'

data/spec/support/datatable_cond_date.rb

@@ -0,0 +1,5 @@
+class DatatableCondDate < ComplexDatatable
+  def view_columns
+    super.deep_merge(created_at: { cond: :date_range })
+  end
+end

data/spec/support/datatable_cond_numeric.rb

@@ -0,0 +1,41 @@
+class DatatableCondEq < ComplexDatatable
+  def view_columns
+    super.deep_merge(post_id: { cond: :eq })
+  end
+end
+
+class DatatableCondNotEq < ComplexDatatable
+  def view_columns
+    super.deep_merge(post_id: { cond: :not_eq })
+  end
+end
+
+class DatatableCondLt < ComplexDatatable
+  def view_columns
+    super.deep_merge(post_id: { cond: :lt })
+  end
+end
+
+class DatatableCondGt < ComplexDatatable
+  def view_columns
+    super.deep_merge(post_id: { cond: :gt })
+  end
+end
+
+class DatatableCondLteq < ComplexDatatable
+  def view_columns
+    super.deep_merge(post_id: { cond: :lteq })
+  end
+end
+
+class DatatableCondGteq < ComplexDatatable
+  def view_columns
+    super.deep_merge(post_id: { cond: :gteq })
+  end
+end
+
+class DatatableCondIn < ComplexDatatable
+  def view_columns
+    super.deep_merge(post_id: { cond: :in })
+  end
+end

data/spec/support/datatable_cond_proc.rb

@@ -0,0 +1,11 @@
+class DatatableCondProc < ComplexDatatable
+  def view_columns
+    super.deep_merge(username: { cond: custom_filter })
+  end
+
+  private
+
+  def custom_filter
+    ->(column, value) { ::Arel::Nodes::SqlLiteral.new(column.field.to_s).matches("#{value}%") }
+  end
+end

data/spec/support/datatable_cond_string.rb

@@ -0,0 +1,23 @@
+class DatatableCondStartWith < ComplexDatatable
+  def view_columns
+    super.deep_merge(first_name: { cond: :start_with })
+  end
+end
+
+class DatatableCondEndWith < ComplexDatatable
+  def view_columns
+    super.deep_merge(last_name: { cond: :end_with })
+  end
+end
+
+class DatatableCondNullValue < ComplexDatatable
+  def view_columns
+    super.deep_merge(email: { cond: :null_value })
+  end
+end
+
+class DatatableWithFormater < ComplexDatatable
+  def view_columns
+    super.deep_merge(last_name: { formater: -> (o) { o.upcase } })
+  end
+end

data/spec/support/datatable_order_nulls_last.rb

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

data/spec/support/test_helpers.rb

@@ -53,27 +53,15 @@ def sample_params
 end
 # rubocop:enable Metrics/MethodLength
 
-class SampleDatatable < AjaxDatatablesRails::Base
-  def view_columns
-    @view_columns ||= ['User.username', 'User.email', 'User.first_name', 'User.last_name']
-  end
-
-  def data
-    [{}, {}]
-  end
-
-  def get_raw_records
-    User.all
-  end
-end
-
-class ComplexDatatable < SampleDatatable
+class ComplexDatatable < AjaxDatatablesRails::Base
   def view_columns
     @view_columns ||= {
-      username:   { source: 'User.username' },
-      email:      { source: 'User.email' },
+      username:   { source: 'User.username'   },
+      email:      { source: 'User.email'      },
       first_name: { source: 'User.first_name' },
-      last_name:  { source: 'User.last_name', formater: -> (o) { o.upcase } },
+      last_name:  { source: 'User.last_name'  },
+      post_id:    { source: 'User.post_id', orderable: false },
+      created_at: { source: 'User.created_at' },
     }
   end
 
@@ -84,12 +72,15 @@ class ComplexDatatable < SampleDatatable
         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
-end
 
-class ComplexDatatableHash < ComplexDatatable
+  def get_raw_records
+    User.all
+  end
 end
 
 class ComplexDatatableArray < ComplexDatatable
@@ -100,75 +91,9 @@ class ComplexDatatableArray < ComplexDatatable
         record.email,
         record.first_name,
         record.last_name,
+        record.post_id,
+        record.created_at,
       ]
     end
   end
 end
-
-class ReallyComplexDatatable < SampleDatatable
-  def view_columns
-    @view_columns ||= {
-      username:   { source: 'User.username' },
-      email:      { source: 'User.email',      cond: :null_value },
-      first_name: { source: 'User.first_name', cond: :start_with },
-      last_name:  { source: 'User.last_name',  cond: :end_with, formater: -> (o) { o.upcase } },
-      post_id:    { source: 'User.post_id' },
-      created_at: { source: 'User.created_at', cond: :date_range },
-    }
-  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
-end
-
-class ReallyComplexDatatableEq < ReallyComplexDatatable
-  def view_columns
-    super.deep_merge(post_id: { cond: :eq })
-  end
-end
-
-class ReallyComplexDatatableNotEq < ReallyComplexDatatable
-  def view_columns
-    super.deep_merge(post_id: { cond: :not_eq })
-  end
-end
-
-class ReallyComplexDatatableLt < ReallyComplexDatatable
-  def view_columns
-    super.deep_merge(post_id: { cond: :lt })
-  end
-end
-
-class ReallyComplexDatatableGt < ReallyComplexDatatable
-  def view_columns
-    super.deep_merge(post_id: { cond: :gt })
-  end
-end
-
-class ReallyComplexDatatableLteq < ReallyComplexDatatable
-  def view_columns
-    super.deep_merge(post_id: { cond: :lteq })
-  end
-end
-
-class ReallyComplexDatatableGteq < ReallyComplexDatatable
-  def view_columns
-    super.deep_merge(post_id: { cond: :gteq })
-  end
-end
-
-class ReallyComplexDatatableIn < ReallyComplexDatatable
-  def view_columns
-    super.deep_merge(post_id: { cond: :in })
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ajax-datatables-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Joel Quenneville
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-21 00:00:00.000000000 Z
+date: 2018-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -57,16 +57,16 @@ dependencies:
   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: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -242,21 +242,26 @@ files:
 - README.md
 - Rakefile
 - ajax-datatables-rails.gemspec
+- doc/webpack.md
 - gemfiles/rails_4.0.13.gemfile
-- gemfiles/rails_4.1.15.gemfile
-- gemfiles/rails_4.2.8.gemfile
-- gemfiles/rails_5.0.3.gemfile
-- gemfiles/rails_5.1.1.gemfile
+- gemfiles/rails_4.1.16.gemfile
+- gemfiles/rails_4.2.10.gemfile
+- gemfiles/rails_5.0.7.gemfile
+- gemfiles/rails_5.1.6.gemfile
+- gemfiles/rails_5.2.0.gemfile
 - lib/ajax-datatables-rails.rb
 - lib/ajax-datatables-rails/base.rb
 - lib/ajax-datatables-rails/config.rb
 - lib/ajax-datatables-rails/datatable/column.rb
-- lib/ajax-datatables-rails/datatable/column_date_filter.rb
+- lib/ajax-datatables-rails/datatable/column/date_filter.rb
+- lib/ajax-datatables-rails/datatable/column/order.rb
+- lib/ajax-datatables-rails/datatable/column/search.rb
 - 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/orm/active_record.rb
 - lib/ajax-datatables-rails/version.rb
+- lib/ajax_datatables_rails.rb
 - lib/generators/datatable/config_generator.rb
 - lib/generators/datatable/templates/ajax_datatables_rails_config.rb
 - lib/generators/rails/datatable_generator.rb
@@ -275,6 +280,11 @@ 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/schema.rb
 - spec/support/test_helpers.rb
 - spec/support/test_models.rb
@@ -298,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A gem that simplifies using datatables and hundreds of records via ajax
@@ -317,6 +327,11 @@ test_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/schema.rb
 - spec/support/test_helpers.rb
 - spec/support/test_models.rb