ajax-datatables-rails 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2064c07e3bb12f0a75c6dc7836a55bc4dd867346b14a94201d44cda7bd79acb
-  data.tar.gz: c22548d1c62ffc8a80c93dc4b5d22bd6de5fd31fc6cd97b6fc06fc4a6e7689ee
+  metadata.gz: 32f4790c082cfaf7a15b4463d51e7bfd1d16ddb215ad132a40572765ff79e262
+  data.tar.gz: cca488fce38bd4ea5dcba5112dca37fbc106c196010362ad1b2c24d231d0cf72
 SHA512:
-  metadata.gz: da9707d5d8c8b8af19739f6286b5c3e7eef88b59482975f209ff4f6cf5296fed91ed512a5f8802e81ca6ec58e140d15c7598748cae0c75db06adf9a5c797e7d8
-  data.tar.gz: 6bfb29fa4b4ffb222a144acfa378947edc7112e180968ddf10807ba4c63e9f77ce10fe784782273a6f119c0c9e077ec5ef987321f20e4f96de5369c6ce843365
+  metadata.gz: 3f50889d4584929e3a01f8895d7b3e10e8118dcfa7fe2a4188eefe38f2cdc4b3bf0b043f996a7c7d43ba7706f085dd3dddab84756f8e21d74e3f55f1a73ab083
+  data.tar.gz: 7b36341f278d8cf407cd21060635b37723c14f7b564e510bf5699e6665d81b8fd282220d5fe031ad97f8b67224ce3ab0dddd4131ff18287ff3576d34df1af74d

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.4.3 (2018-06-05)
+
+* Add: Add `:string_eq` condition on columns filter [Issue #291](https://github.com/jbox-web/ajax-datatables-rails/issues/291)
+
+**Note :** This is the last version to support Rails 4.0.x and Rails 4.1.x
+
 ## 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)
@@ -16,9 +22,6 @@
 * Change: Add # frozen_string_literal: true pragma
 * Various improvements in internal API
 
-**Note :** This is the last version to support Rails 4.0.x and Rails 4.1.x
-
-
 ## 0.4.0 (2017-05-21)
 
 **Warning:** this version is a **major break** from v0.3. The core has been rewriten to remove dependency on Kaminari (or WillPaginate).

data/README.md

@@ -205,7 +205,7 @@ end
 
 `cond` can be :
 
-* `:like`, `:start_with`, `:end_with` for string or full text search
+* `:like`, `:start_with`, `:end_with`, `:string_eq` 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

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

@@ -57,7 +57,7 @@ module AjaxDatatablesRails
           when Proc
             filter
           when :eq, :not_eq, :lt, :gt, :lteq, :gteq, :in
-            is_searchable_integer? ? numeric_search : empty_search
+            is_searchable_integer? ? raw_search(cond) : empty_search
           when :null_value
             null_value_search
           when :start_with
@@ -66,6 +66,8 @@ module AjaxDatatablesRails
             casted_column.matches("%#{formated_value}")
           when :like
             casted_column.matches("%#{formated_value}%")
+          when :string_eq
+            raw_search(:eq)
           end
         end
 
@@ -77,7 +79,7 @@ module AjaxDatatablesRails
           end
         end
 
-        def numeric_search
+        def raw_search(cond)
           if custom_field?
             ::Arel::Nodes::SqlLiteral.new(field).eq(formated_value)
           else

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

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

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

@@ -360,6 +360,38 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
       end
     end
 
+    describe 'it can filter records with condition :like' do
+      let(:datatable) { DatatableCondLike.new(view) }
+
+      before(:each) do
+        create(:user, email: 'john@foo.com')
+        create(:user, email: 'mary@bar.com')
+      end
+
+      it 'should filter records matching' do
+        datatable.params[:columns]['1'][:search][:value] = 'foo'
+        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 :string_eq' do
+      let(:datatable) { DatatableCondStringEq.new(view) }
+
+      before(:each) do
+        create(:user, email: 'john@foo.com')
+        create(:user, email: 'mary@bar.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
+    end
+
     describe 'it can filter records with condition :null_value' do
       let(:datatable) { DatatableCondNullValue.new(view) }
 

data/spec/support/datatable_cond_string.rb

@@ -10,6 +10,18 @@ class DatatableCondEndWith < ComplexDatatable
   end
 end
 
+class DatatableCondLike < ComplexDatatable
+  def view_columns
+    super.deep_merge(email: { cond: :like })
+  end
+end
+
+class DatatableCondStringEq < ComplexDatatable
+  def view_columns
+    super.deep_merge(email: { cond: :string_eq })
+  end
+end
+
 class DatatableCondNullValue < ComplexDatatable
   def view_columns
     super.deep_merge(email: { cond: :null_value })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ajax-datatables-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Joel Quenneville
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -308,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A gem that simplifies using datatables and hundreds of records via ajax