activeadmin-ajax_filter 0.3.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c4beba629d7d61e584bf3637003e08429160d10
-  data.tar.gz: 3b650d2fbf09d433ab5e8496a121d259394cc199
+  metadata.gz: c172a963f8a95375c2b510f11c9ec7f4f2641253
+  data.tar.gz: 32f874eb19074d53b794e975300ee782a8c2919a
 SHA512:
-  metadata.gz: ab76f9f1d5f850c9e68e8fbd3a8a3ced12033ff5222ed9cc9a51891075052e9fbe346065c166b726ddc1cf1513ef2b4c0de40073fcb666c8dbfe4268e6e4fbef
-  data.tar.gz: fb2737b2f3f7385d85ba8573c8d5c34d22c7ae417800b86bc6737075b6acd48b10c1d654099ec040d42e853eb3879a9e2eaed46ac4e7b686b699d1e3cc6f4484
+  metadata.gz: e771c42b7d88b7c91fea8998856d2e295028a19bba9ae1888614fa4e09e8fc218004e26b4f7adbe9b803218ff216623f342fa6de6bc6917ca04aea1f0523dd93
+  data.tar.gz: 50846de39f9c27886e158c9214ae4669c53fb237dc7fdc175a1192486c32d2dda925f3a4fdaf14e2dd6835e9d7a061b6b12f5235b409888b695064faa972663c

data/.travis.yml

@@ -2,9 +2,9 @@ sudo: false
 language: ruby
 
 rvm:
-  - 2.2.6
-  - 2.3.3
-  - 2.4.1
+  - 2.3
+  - 2.4
+  - 2.5
   - ruby-head
 
 matrix:

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in activeadmin-ajax_filter.gemspec
-gemspec
+gemspec
+gem 'draper', group: 'test'

data/Gemfile.lock

@@ -1,60 +1,58 @@
 PATH
   remote: .
   specs:
-    activeadmin-ajax_filter (0.3.7)
-      activeadmin (>= 1.0.0.pre1)
+    activeadmin-ajax_filter (0.4.0)
+      activeadmin (>= 1.0)
       coffee-rails (>= 4.1.0)
       has_scope (>= 0.6.0)
-      rails (>= 4)
+      rails (>= 4.2)
       selectize-rails (>= 0.11.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
+    actionmailer (4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.9)
-      actionview (= 4.2.9)
-      activesupport (= 4.2.9)
+    actionpack (4.2.10)
+      actionview (= 4.2.10)
+      activesupport (= 4.2.10)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.9)
-      activesupport (= 4.2.9)
+    actionview (4.2.10)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activeadmin (1.0.0)
+    activeadmin (1.3.1)
       arbre (>= 1.1.1)
-      bourbon
       coffee-rails
       formtastic (~> 3.1)
       formtastic_i18n
-      inherited_resources (~> 1.7)
-      jquery-rails
-      jquery-ui-rails
-      kaminari (>= 0.15, < 2.0)
-      railties (>= 4.2, < 5.2)
-      ransack (~> 1.3)
-      sass-rails
+      inherited_resources (>= 1.9.0)
+      jquery-rails (>= 4.2.0)
+      kaminari (>= 0.15)
+      railties (>= 4.2, < 5.3)
+      ransack (>= 1.8.7)
+      sass (~> 3.1)
       sprockets (< 4.1)
-    activejob (4.2.9)
-      activesupport (= 4.2.9)
+    activejob (4.2.10)
+      activesupport (= 4.2.10)
       globalid (>= 0.3.0)
-    activemodel (4.2.9)
-      activesupport (= 4.2.9)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
-    activerecord (4.2.9)
-      activemodel (= 4.2.9)
-      activesupport (= 4.2.9)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
       arel (~> 6.0)
-    activesupport (4.2.9)
+    activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -63,9 +61,6 @@ GEM
     arbre (1.1.1)
       activesupport (>= 3.0.0)
     arel (6.0.4)
-    bourbon (4.3.4)
-      sass (~> 3.4)
-      thor (~> 0.19)
     builder (3.2.3)
     capybara (2.7.1)
       addressable
@@ -85,9 +80,15 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
+    crass (1.0.4)
     database_cleaner (1.5.3)
     diff-lcs (1.2.5)
     docile (1.1.5)
+    draper (2.1.0)
+      actionpack (>= 3.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      request_store (~> 1.0)
     erubis (2.7.0)
     execjs (2.7.0)
     factory_girl (4.5.0)
@@ -95,93 +96,97 @@ GEM
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
+    ffi (1.9.25)
     formtastic (3.1.5)
       actionpack (>= 3.2.13)
     formtastic_i18n (0.6.0)
-    globalid (0.4.0)
+    globalid (0.4.1)
       activesupport (>= 4.2.0)
-    has_scope (0.7.1)
-      actionpack (>= 4.1, < 5.2)
-      activesupport (>= 4.1, < 5.2)
-    i18n (0.8.6)
-    inherited_resources (1.7.2)
-      actionpack (>= 3.2, < 5.2.x)
+    has_scope (0.7.2)
+      actionpack (>= 4.1)
+      activesupport (>= 4.1)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    inherited_resources (1.9.0)
+      actionpack (>= 4.2, < 5.3)
       has_scope (~> 0.6)
-      railties (>= 3.2, < 5.2.x)
+      railties (>= 4.2, < 5.3)
       responders
-    jquery-rails (4.3.1)
+    jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (6.0.1)
-      railties (>= 3.2.16)
     json (1.8.6)
-    kaminari (1.0.1)
+    kaminari (1.1.1)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.0.1)
-      kaminari-activerecord (= 1.0.1)
-      kaminari-core (= 1.0.1)
-    kaminari-actionview (1.0.1)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
       actionview
-      kaminari-core (= 1.0.1)
-    kaminari-activerecord (1.0.1)
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
       activerecord
-      kaminari-core (= 1.0.1)
-    kaminari-core (1.0.1)
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.0.3)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    mime-types (3.1)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
+    mime-types-data (3.2018.0812)
+    mini_mime (1.0.1)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nokogiri (1.8.4)
+      mini_portile2 (~> 2.3.0)
     phantomjs (2.1.1.0)
     poltergeist (1.10.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
-    polyamorous (1.3.1)
-      activerecord (>= 3.0)
-    rack (1.6.8)
+    rack (1.6.10)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.9)
-      actionmailer (= 4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
-      activemodel (= 4.2.9)
-      activerecord (= 4.2.9)
-      activesupport (= 4.2.9)
+    rails (4.2.10)
+      actionmailer (= 4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
+      activemodel (= 4.2.10)
+      activerecord (= 4.2.10)
+      activesupport (= 4.2.10)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.9)
+      railties (= 4.2.10)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.9)
-      actionpack (= 4.2.9)
-      activesupport (= 4.2.9)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (4.2.10)
+      actionpack (= 4.2.10)
+      activesupport (= 4.2.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
-    ransack (1.8.3)
-      actionpack (>= 3.0)
-      activerecord (>= 3.0)
-      activesupport (>= 3.0)
+    ransack (1.8.9)
+      actionpack (>= 3.0, <= 5.1.1)
+      activerecord (>= 3.0, <= 5.1.1)
+      activesupport (>= 3.0, <= 5.1.1)
       i18n
-      polyamorous (~> 1.3)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    request_store (1.4.1)
+      rack (>= 1.4)
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
@@ -206,20 +211,18 @@ GEM
       rspec-mocks (~> 3.3.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
-    sass (3.4.24)
-    sass-rails (5.0.6)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
+    sass (3.5.7)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     selectize-rails (0.12.4)
     simplecov (0.11.1)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -232,8 +235,7 @@ GEM
       activesupport (>= 3.1)
     thor (0.20.0)
     thread_safe (0.3.6)
-    tilt (2.0.7)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
@@ -250,6 +252,7 @@ DEPENDENCIES
   capybara (~> 2.1)
   codeclimate-test-reporter (~> 0.4)
   database_cleaner (~> 1.5.0)
+  draper
   factory_girl_rails
   launchy (~> 2.4.3)
   phantomjs (~> 2.1.1)
@@ -262,4 +265,4 @@ DEPENDENCIES
   temping (~> 3.3, >= 3.3.0)
 
 BUNDLED WITH
-   1.15.4
+   1.16.2

data/README.md

@@ -17,6 +17,8 @@ Filter
 
 ## Prerequisites
 
+Minimum Ruby version `2.3`
+
 This extension assumes that you're using [Active Admin](https://github.com/activeadmin/activeadmin) with [Ransack](https://github.com/activerecord-hackery/ransack). And for AJAX input it uses [selectize-rails](https://github.com/manuelvanrijn/selectize-rails)
 
 ## Installation
@@ -90,6 +92,7 @@ end
 You can use next parameters in `data` hash:
 
 * `search_fields` - fields by which AJAX search will be performed, **required**
+* `display_fields` - fields which will be displayed in drop down list during search, first field will be displayed for selected option
 * `limit` - count of the items which will be requested by AJAX, by default `5`
 * `value_field` - value field for html select element, by default `id`
 * `ordering` - sort string like `email ASC, customer_uid DESC`, by default it uses first value of `search_fields` with `ASC` direction
@@ -98,6 +101,23 @@ You can use next parameters in `data` hash:
 * `ajax_search_fields` - array of field names. `ajax_select` input depends on `ajax_search_fields` values: e.g. you can scope user by languages.
 * `static_ransack` - hash of ransack predicates which will be applied statically and independently from current input field value
 
+## Caveats 
+
+### Ransack _cont on Integer column
+
+Due to issue with Ransack and Postgres it's not possbile to make searches like `id_cont` because `id` is a `Integer` type (more here https://github.com/activerecord-hackery/ransack/issues/85)
+
+The way to handle it find with another predicate like:
+
+```
+filter :user_id, as: :ajax_select, collection: [], data: {
+    url: '/admin/users/filter',
+    display_fields: [:full_name, :phone],
+    ransack: 'id_eq', # !!! predicate is ovewritten to `eq` by default it's `cont`
+    search_fields: ['id'],
+  }
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake false` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/activeadmin-ajax_filter.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^exe/}) { |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'activeadmin', '>= 1.0.0.pre1'
-  gem.add_dependency 'rails', '>= 4'
+  gem.add_dependency 'activeadmin', '>= 1.0'
+  gem.add_dependency 'rails', '>= 4.2'
   gem.add_dependency 'coffee-rails', '>= 4.1.0'
   gem.add_dependency 'selectize-rails', '>= 0.11.2'
   gem.add_dependency 'has_scope', '>= 0.6.0' # Force Ruby 2.1.5 support

data/app/assets/javascripts/activeadmin-ajax_filter.js.coffee

@@ -1,8 +1,13 @@
 $ ->
+  unique = (array) ->
+    array.filter (item, i, array) ->
+      i == array.indexOf(item)
+
   apply_filter_ajax_select = () ->
     $('.filter_ajax_select select, .ajax_select select').each (_, select) ->
       select = $(select)
       valueField = select.data('value-field')
+      display_fields = select.data('display-fields').split(' ')
       searchFields = select.data('search-fields').split(' ')
       staticRansack = select.data('static-ransack')
 
@@ -40,7 +45,7 @@ $ ->
 
       select.selectize
         valueField: valueField
-        labelField: searchFields[0]
+        labelField: display_fields[0]
         searchField: searchFields
         sortField: ordering.split(',').map (clause)->
           c = clause.trim().split(' ')
@@ -49,7 +54,7 @@ $ ->
         create: false
         render:
           option: (item, escape) ->
-            html = searchFields.map (field, index)->
+            html = unique(display_fields.concat(searchFields)).map (field, index)->
               value = escape(item[field])
 
               if index == 0
@@ -103,4 +108,4 @@ $ ->
 
   # apply ajax filter on inputs inside has_many entries
   $("form.formtastic .has_many_add").click ->
-    setTimeout((-> apply_filter_ajax_select()), 0)
+    setTimeout((-> apply_filter_ajax_select()), 0)

data/lib/active_admin/ajax_filter.rb

@@ -14,10 +14,10 @@ module ActiveAdmin
       def included(dsl)
         dsl.instance_eval do
           collection_action :filter, method: :get do
-            scope = collection.order(params[:order]).limit(params[:limit] || 10)
-            scope = apply_collection_decorator(scope)
-
-            render plain: scope.to_json
+            render plain: apply_collection_decorator(
+              find_collection(except: [:pagination, :collection_decorator])
+                .order(params[:order]).limit(params[:limit] || 10),
+            ).to_json
           end
         end
       end

data/lib/active_admin/ajax_filter/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module AjaxFilter
-    VERSION = '0.3.8'
+    VERSION = '0.4.0'
   end
 end

data/lib/active_admin/inputs/ajax_core.rb

@@ -11,6 +11,7 @@ module ActiveAdmin
         super.merge(
           'data-limit' => collection_limit,
           'data-value-field' => value_field,
+          'data-display-fields' => display_fields,
           'data-search-fields' => search_fields,
           'data-ajax-search-fields' => ajax_search_fields,
           'data-ordering' => ordering,
@@ -37,6 +38,10 @@ module ActiveAdmin
         ajax_data[:value_field] || :id
       end
 
+      def display_fields
+        ajax_data[:display_fields] || search_fields[0]
+      end
+
       def search_fields
         ajax_data[:search_fields] || raise(ArgumentError, 'search_fields in required')
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-ajax_filter
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
 platform: ruby
 authors:
 - Alex Emelyanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-09 00:00:00.000000000 Z
+date: 2018-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -314,7 +314,7 @@ files:
 - Rakefile
 - activeadmin-ajax_filter.gemspec
 - app/assets/javascripts/activeadmin-ajax_filter.js.coffee
-- app/assets/stylesheets/activeadmin-ajax_filter.css
+- app/assets/stylesheets/activeadmin-ajax_filter.scss
 - bin/console
 - bin/setup
 - lib/active_admin/ajax_filter.rb
@@ -344,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: AJAX filters for ActiveAdmin