ajax-datatables-rails 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0e67f285cdb991efbf4ab474b3a7fff772c37a546637f004bc57bf71a3402af
-  data.tar.gz: c599a40dde96f2244e0645900d48366ea0624b16502944b5ba2256698725c707
+  metadata.gz: e2064c07e3bb12f0a75c6dc7836a55bc4dd867346b14a94201d44cda7bd79acb
+  data.tar.gz: c22548d1c62ffc8a80c93dc4b5d22bd6de5fd31fc6cd97b6fc06fc4a6e7689ee
 SHA512:
-  metadata.gz: c33dc7544a72a23c02524bd8b1480dcf903d2a28076411e762a1af68a2a644b288f48d7aba19a25eb0774db2277807b0911b612ef023bdf04cb8e985ff85869c
-  data.tar.gz: 67d1e16bdb6ea901614234e30690cd8a42bcc3edfd70099c85857ae4e1aa70736594cbbcfda5e0aba9459a59b08ce43a29e18ac471244880aa882cad5b49470c
+  metadata.gz: da9707d5d8c8b8af19739f6286b5c3e7eef88b59482975f209ff4f6cf5296fed91ed512a5f8802e81ca6ec58e140d15c7598748cae0c75db06adf9a5c797e7d8
+  data.tar.gz: 6bfb29fa4b4ffb222a144acfa378947edc7112e180968ddf10807ba4c63e9f77ce10fe784782273a6f119c0c9e077ec5ef987321f20e4f96de5369c6ce843365

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.4.2 (2018-05-11)
+
+* Fix: Integer out of range [PR #289](https://github.com/jbox-web/ajax-datatables-rails/pull/289) from [PR #284](https://github.com/jbox-web/ajax-datatables-rails/pull/284)
+
 ## 0.4.1 (2018-05-06)
 
 * Fix: Restore behavior of #filter method [Comment](https://github.com/jbox-web/ajax-datatables-rails/commit/07795fd26849ff1b3b567f4ce967f722907a45be#comments)

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

@@ -5,6 +5,9 @@ module AjaxDatatablesRails
     class Column
       module Search
 
+        SMALLEST_PQ_INTEGER = -2147483648
+        LARGEST_PQ_INTEGER = 2147483647
+
         def searchable?
           @view_column.fetch(:searchable, true)
         end
@@ -54,7 +57,7 @@ module AjaxDatatablesRails
           when Proc
             filter
           when :eq, :not_eq, :lt, :gt, :lteq, :gteq, :in
-            numeric_search
+            is_searchable_integer? ? numeric_search : empty_search
           when :null_value
             null_value_search
           when :start_with
@@ -82,6 +85,27 @@ module AjaxDatatablesRails
           end
         end
 
+        def empty_search
+          casted_column.matches('')
+        end
+
+        def is_searchable_integer?
+          if formated_value.is_a?(Array)
+            valids = formated_value.map { |v| is_integer?(v) && !is_out_of_range?(v) }
+            !valids.include?(false)
+          else
+            is_integer?(formated_value) && !is_out_of_range?(formated_value)
+          end
+        end
+
+        def is_out_of_range?(search_value)
+          Integer(search_value) > LARGEST_PQ_INTEGER || Integer(search_value) < SMALLEST_PQ_INTEGER
+        end
+
+        def is_integer?(string)
+          true if Integer(string) rescue false
+        end
+
       end
     end
   end

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

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

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

@@ -494,5 +494,49 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
         expect(item[:first_name]).to eq 'john'
       end
     end
+
+    describe 'it can filter records with condition :in with regex' do
+      let(:datatable) { DatatableCondInWithRegex.new(view) }
+
+      before(:each) do
+        create(:user, first_name: 'john', post_id: 1)
+        create(:user, first_name: 'mary', post_id: 2)
+      end
+
+      it 'should filter records matching' do
+        datatable.params[:columns]['4'][:search][:value] = '1|2'
+        datatable.params[:order]['0'] = { column: '4', dir: 'asc' }
+        expect(datatable.data.size).to eq 2
+        item = datatable.data.first
+        expect(item[:first_name]).to eq 'john'
+      end
+    end
+
+    describe 'Integer overflows' do
+      let(:datatable) { DatatableCondEq.new(view) }
+      let(:largest_postgresql_integer_value) { 2147483647 }
+      let(:smallest_postgresql_integer_value) { -2147483648 }
+
+      before(:each) do
+        create(:user, first_name: 'john', post_id: 1)
+        create(:user, first_name: 'mary', post_id: 2)
+        create(:user, first_name: 'phil', post_id: largest_postgresql_integer_value)
+      end
+
+      it 'Returns an empty result if input value is too large' do
+        datatable.params[:columns]['4'][:search][:value] = largest_postgresql_integer_value + 1
+        expect(datatable.data.size).to eq 0
+      end
+
+      it 'Returns an empty result if input value is too small' do
+        datatable.params[:columns]['4'][:search][:value] = smallest_postgresql_integer_value - 1
+        expect(datatable.data.size).to eq 0
+      end
+
+      it 'returns the matching user' do
+        datatable.params[:columns]['4'][:search][:value] = largest_postgresql_integer_value
+        expect(datatable.data.size).to eq 1
+      end
+    end
   end
 end

data/spec/support/datatable_cond_numeric.rb

@@ -39,3 +39,13 @@ class DatatableCondIn < ComplexDatatable
     super.deep_merge(post_id: { cond: :in })
   end
 end
+
+class DatatableCondInWithRegex < DatatableCondIn
+  def view_columns
+    super.deep_merge(post_id: { cond: :in, use_regex: false, orderable: true, formater: ->(str) { cast_regex_value(str) } })
+  end
+
+  def cast_regex_value(value)
+    value.split('|').map(&:to_i)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ajax-datatables-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Joel Quenneville
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-06 00:00:00.000000000 Z
+date: 2018-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties