activeadmin-searchable_select 1.0.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e5f2ce9146eca37e95d909b912c1ef5afe9fc511ac736b3d118e81c05c937a4
-  data.tar.gz: 206673047e75f7a79c369c2a5a4a4532b5f336cc4035b817d313775095f227e9
+  metadata.gz: 6a0f1ed4c7ca3f0b20a9a1844aa46ecf2693b5b91f447874cbfbc013d5a84e31
+  data.tar.gz: cdca70eae83da1caf578f39957b66fe30cec69a76c67f7f06d2a45bb3c680f7d
 SHA512:
-  metadata.gz: 80c69cf8baa62dac91cbf3f0ff073d5b967f87b5966d547cddc984790e63d99754e5e78acb999512f92bee49e996e3b7edb4272dd32356ea101b1ada17b6fc72
-  data.tar.gz: 931f1f0653de38ef169d0664ebf69396dc4819ee2c3eafd4f33a63ca476b658aaa60c9888903919d1f2ed5c43c5c153b7473e7cef2aaa4533dbbc42852268d9f
+  metadata.gz: b509e473b24b32cad8c401f197413c7b01c7de196aaf0a2a4a735f7f6bd40d4ea76ed7733f9b00f87ecf23e6d3aba0bceee599f85c4e39fb1a17639b4234d94f
+  data.tar.gz: f224c6cc6fe60af0373b1d82c9d57a43282c3f327bf5c3c295d2b1d17ce5f9aace56aa0d4320405f40783a270fedaa8137496712091fc167712b9b1e1364a029

data/.github/workflows/tests.yml

@@ -0,0 +1,34 @@
+name: tests
+on: [push, pull_request]
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - '2.6'
+          - '2.7'
+        gemfile:
+          - gemfiles/rails_5.1_active_admin_1.x.gemfile
+          - gemfiles/rails_5.x_active_admin_1.x.gemfile
+          - gemfiles/rails_5.x_active_admin_2.x.gemfile
+          - gemfiles/rails_6.x_active_admin_2.x.gemfile
+        include:
+          - ruby-version: '3.0'
+            gemfile: gemfiles/rails_6.x_active_admin_2.x.gemfile
+
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rspec

data/Appraisals

@@ -1,15 +1,19 @@
-appraise 'rails-4.2-active-admin-1.0.0.pre4' do
-  gem 'rails', '~> 4.2'
-  gem 'activeadmin', '1.0.0.pre4'
-  gem 'jquery-ui-rails', '~> 5.0'
+appraise 'rails-5.1-active-admin-1.x' do
+  gem 'rails', '~> 5.1.0'
+  gem 'activeadmin', '~> 1.0'
 end
 
-appraise 'rails-5.1-active-admin-1.0' do
-  gem 'rails', '~> 5.1'
+appraise 'rails-5.x-active-admin-1.x' do
+  gem 'rails', '~> 5.2'
   gem 'activeadmin', '~> 1.0'
 end
 
-appraise 'rails-5.1-active-admin-1.1' do
-  gem 'rails', '~> 5.1'
-  gem 'activeadmin', '~> 1.1'
+appraise 'rails-5.x-active-admin-2.x' do
+  gem 'rails', '~> 5.2'
+  gem 'activeadmin', '~> 2.0'
 end
+
+appraise 'rails-6.x-active-admin-2.x' do
+  gem 'rails', '~> 6.1'
+  gem 'activeadmin', '~> 2.0'
+end

data/CHANGELOG.md

@@ -1,16 +1,20 @@
 # CHANGELOG
 
-### Version 1.0.1
+### Version 1.3.0
 
-2018-01-19
+2021-02-03
 
-[Compare changes](https://github.com/codevise/activeadmin-searchable_select/compare/v1.0.0...v1.0.1)
+[Compare changes](https://github.com/codevise/activeadmin-searchable_select/compare/1-2-stable...v1.3.0)
 
-- Use zero based pagination parameter
-  ([#2](https://github.com/codevise/activeadmin-searchable_select/pull/2))
+- Add support for Ruby 3
+  ([#26](https://github.com/codevise/activeadmin-searchable_select/pull/26))
+- Add a small description of how to pass options to Select2
+  ([#27](https://github.com/codevise/activeadmin-searchable_select/pull/27))
+- Update CI Setup
+  ([#25](https://github.com/codevise/activeadmin-searchable_select/pull/25))
+- Allow Bundler 2 in development dependencies
+  ([#18](https://github.com/codevise/activeadmin-searchable_select/pull/18))
 
-### Version 1.0.0
-
-2017-10-23
-
-- Initial release.
+See
+[1-2-stable branch](https://github.com/codevise/activeadmin-searchable_select/blob/1-2-stable/CHANGELOG.md)
+for previous changes.

data/README.md

@@ -1,7 +1,7 @@
 # ActiveAdmin Searchable Select
 
 [![Gem Version](https://badge.fury.io/rb/activeadmin-searchable_select.svg)](http://badge.fury.io/rb/activeadmin-searchable_select)
-[![Build Status](https://travis-ci.org/codevise/activeadmin-searchable_select.svg?branch=master)](https://travis-ci.org/codevise/activeadmin-searchable_select)
+[![Build Status](https://github.com/codevise/activeadmin-searchable_select.svg?branch=master)](https://github.com/codevise/activeadmin-searchable_select/actions)
 
 Searchable select boxes (via [Select2](https://select2.org/)) for
 ActiveAdmin forms and filters. Extends the ActiveAdmin resource DSL to
@@ -12,7 +12,7 @@ allow defining JSON endpoints to fetch options from asynchronously.
 Add `activeadmin-searchable_select` to your Gemfile:
 
 ```ruby
-   gem 'activeadmin-searchable_select
+   gem 'activeadmin-searchable_select'
 ```
 
 Import stylesheets and require javascripts:
@@ -23,8 +23,8 @@ Import stylesheets and require javascripts:
 ```
 
 ```coffee
-# active_admin.js.coffee
-#= require active_admin/searchable_select
+// active_admin.js
+//= require active_admin/searchable_select
 ```
 
 ## Usage
@@ -50,6 +50,15 @@ This also works for filters:
    end
 ```
 
+By default, you can only select one at a time for a filter. You can
+specify a multi-select with:
+
+```ruby
+   ActiveAdmin.register Product do
+     filter(:category, as: :searchable_select, multiple: true)
+   end
+```
+
 ### Fetching Options via Ajax
 
 For large collections, rendering the whole set of options can be to
@@ -138,7 +147,7 @@ based on the input attribute name, you can pass an object with a
    end
 ```
 
-#### Mutlple Options Endpoints per Resource
+#### Multiple Options Endpoints per Resource
 
 A single ActiveAdmin resource can define multiple options endpoints:
 
@@ -167,6 +176,23 @@ To specify which collection to use, pass an object with a
    end
 ```
 
+#### Querying Multiple Attributes
+
+ActiveAdmin Searchable Select querying is performed by Ransack. As such, you can
+build your query in a way that it can query multiple attributes at once.
+
+```ruby
+   ActiveAdmin.register User do
+     searchable_select_options(scope: User.all,
+                               text_attribute: :username,
+                               filter: lambda do |term, scope|
+                                 scope.ransack(email_or_username_cont: term).result
+                               end)
+   end
+```
+
+In this example, the `all` scope will query `email OR username`.
+
 #### Passing Parameters
 
 You can pass additional parameters to the options endpoint:
@@ -218,6 +244,29 @@ for feature specs:
 
 ```
 
+### Passing options to Select2
+
+It is possible to pass and define configuration options to Select2 
+via `data-attributes` using nested (subkey) options.
+
+Attributes need to be added to the `input_html` option in the form input.
+For example you can tell Select2 how long to wait after a user
+has stopped typing before sending the request:
+
+```ruby
+   ...
+   f.input(:category,
+           as: :searchable_select,
+           ajax: true,
+           input_html: {
+             data: {
+               'ajax--delay' => 500
+             }
+           })
+   ...
+```
+
+
 ## Development
 
 To run the tests install bundled gems and invoke RSpec:

data/activeadmin-searchable_select.gemspec

@@ -14,22 +14,28 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0")
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 2.1'
+  spec.required_ruby_version = ['>= 2.1', '< 4']
 
-  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'bundler', ['>= 1.5', '< 3']
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'appraisal', '~> 2.2'
   spec.add_development_dependency 'rspec-rails', '~> 3.6'
-  spec.add_development_dependency 'combustion', '~> 0.7.0'
+  spec.add_development_dependency 'combustion', '~> 1.0'
   spec.add_development_dependency 'database_cleaner', '~> 1.6'
   spec.add_development_dependency 'sqlite3', '~> 1.3'
-  spec.add_development_dependency 'capybara', '~> 2.15'
-  spec.add_development_dependency 'poltergeist', '~> 1.15'
+
+  spec.add_development_dependency 'capybara', '~> 3.9'
+  spec.add_development_dependency 'puma', '~> 5.0'
+  spec.add_development_dependency 'selenium-webdriver', '~> 3.6'
+  spec.add_development_dependency 'webdrivers', '~> 4.0'
+
+  spec.add_development_dependency 'coffee-rails'
+  spec.add_development_dependency 'rails'
   spec.add_development_dependency 'rubocop', '~> 0.42.0'
   spec.add_development_dependency 'semmy', '~> 1.0'
-  spec.add_development_dependency 'rails'
+  spec.add_development_dependency 'sprockets', '~> 3.7'
 
-  spec.add_runtime_dependency 'activeadmin', '~> 1.x'
+  spec.add_runtime_dependency 'activeadmin', ['>= 1.x', '< 3']
   spec.add_runtime_dependency 'jquery-rails', ['>= 3.0', '< 5']
   spec.add_runtime_dependency 'select2-rails', '~> 4.0'
 end

data/gemfiles/{rails_4.2_active_admin_1.0.0.pre4.gemfile → rails_5.1_active_admin_1.x.gemfile}

@@ -3,8 +3,7 @@
 source "https://rubygems.org"
 
 gem "sass-rails"
-gem "rails", "~> 4.2"
-gem "activeadmin", "1.0.0.pre4"
-gem "jquery-ui-rails", "~> 5.0"
+gem "rails", "~> 5.1.0"
+gem "activeadmin", "~> 1.0"
 
 gemspec path: "../"

data/gemfiles/{rails_5.1_active_admin_1.0.gemfile → rails_5.x_active_admin_1.x.gemfile}

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "sass-rails"
-gem "rails", "~> 5.1"
+gem "rails", "~> 5.2"
 gem "activeadmin", "~> 1.0"
 
 gemspec path: "../"

data/gemfiles/{rails_5.1_active_admin_1.1.gemfile → rails_5.x_active_admin_2.x.gemfile}

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "sass-rails"
-gem "rails", "~> 5.1"
-gem "activeadmin", "~> 1.1"
+gem "rails", "~> 5.2"
+gem "activeadmin", "~> 2.0"
 
 gemspec path: "../"

data/gemfiles/rails_6.x_active_admin_2.x.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sass-rails"
+gem "rails", "~> 6.1"
+gem "activeadmin", "~> 2.0"
+
+gemspec path: "../"

data/lib/activeadmin/searchable_select/select_input_extension.rb

@@ -45,7 +45,7 @@ module ActiveAdmin
 
       def ajax_url
         return unless options[:ajax]
-        template.polymorphic_path([:admin, ajax_resource_class],
+        template.polymorphic_path([template.active_admin_namespace.route_prefix, ajax_resource_class],
                                   action: option_collection.collection_action_name,
                                   **ajax_params)
       end
@@ -57,23 +57,23 @@ module ActiveAdmin
       end
 
       def selected_value_collection
-        [selected_value_option].compact
-      end
-
-      def selected_value_option
-        option_for_record(selected_record) if selected_record
+        selected_records.collect { |s| option_for_record(s) }
       end
 
       def option_for_record(record)
         [option_collection.display_text(record), record.id]
       end
 
-      def selected_record
-        @selected_record ||=
-          selected_value && option_collection_scope.find_by_id(selected_value)
+      def selected_records
+        @selected_records ||=
+          if selected_values
+            option_collection_scope.where(id: selected_values)
+          else
+            []
+          end
       end
 
-      def selected_value
+      def selected_values
         @object.send(input_name) if @object
       end
 

data/lib/activeadmin/searchable_select/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module SearchableSelect
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.3.0'.freeze
   end
 end

data/spec/features/end_to_end_spec.rb

@@ -80,6 +80,7 @@ RSpec.describe 'end to end', type: :feature, js: true do
 
   def wait_for_ajax
     Timeout.timeout(Capybara.default_max_wait_time) do
+      sleep 0.1
       loop until finished_all_ajax_requests?
     end
   end

data/spec/features/filter_input_spec.rb

@@ -188,4 +188,54 @@ RSpec.describe 'filter input', type: :request do
                                              text: 'Travel')
     end
   end
+
+  describe 'with the multiple option set to true' do
+    before(:each) do
+      ActiveAdminHelpers.setup do
+        ActiveAdmin.register(Category) do
+          searchable_select_options(scope: Category, text_attribute: :name)
+        end
+
+        ActiveAdmin.register(Post) do
+          filter(:category,
+                 as: :searchable_select,
+                 ajax: true,
+                 multiple: true)
+        end
+      end
+    end
+
+    it 'renders select input with searchable-select-input css class and the multiple attribute' do
+      get '/admin/posts'
+
+      expect(response.body).to have_selector("select.searchable-select-input[multiple='multiple']")
+    end
+
+    it 'does not render options statically' do
+      Category.create!(name: 'Travel')
+
+      get '/admin/posts'
+
+      expect(response.body).not_to have_selector('.searchable-select-input option',
+                                                 text: 'Travel')
+    end
+
+    it 'sets data-ajax-url attribute' do
+      get '/admin/posts'
+
+      expect(response.body).to have_selector('.searchable-select-input[data-ajax-url]')
+    end
+
+    it 'renders the filter for multiple values selected' do
+      category1 = Category.create!(name: 'Travel')
+      category2 = Category.create!(name: 'Leisure')
+
+      get "/admin/posts?q[category_id_in][]=#{category1.id}&q[category_id_in][]=#{category2.id}"
+
+      expect(response.body).to have_selector('.searchable-select-input option[selected]',
+                                             text: 'Travel')
+      expect(response.body).to have_selector('.searchable-select-input option[selected]',
+                                             text: 'Leisure')
+    end
+  end
 end

data/spec/support/capybara.rb

@@ -1,7 +1,8 @@
 require 'capybara/rspec'
-require 'capybara/poltergeist'
+require 'selenium-webdriver'
+require 'webdrivers/chromedriver'
 
-Capybara.javascript_driver = :poltergeist
+Capybara.javascript_driver = :selenium_chrome_headless
 
 RSpec.configure do |config|
   config.include Capybara::RSpecMatchers, type: :request

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-searchable_select
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +120,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -165,33 +227,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: activeadmin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.x
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.x
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -232,10 +300,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - ".yardopts"
 - Appraisals
 - CHANGELOG.md
@@ -248,9 +316,10 @@ files:
 - app/assets/javascripts/active_admin/searchable_select/init.js
 - app/assets/stylesheets/active_admin/searchable_select.scss
 - bin/rspec
-- gemfiles/rails_4.2_active_admin_1.0.0.pre4.gemfile
-- gemfiles/rails_5.1_active_admin_1.0.gemfile
-- gemfiles/rails_5.1_active_admin_1.1.gemfile
+- gemfiles/rails_5.1_active_admin_1.x.gemfile
+- gemfiles/rails_5.x_active_admin_1.x.gemfile
+- gemfiles/rails_5.x_active_admin_2.x.gemfile
+- gemfiles/rails_6.x_active_admin_2.x.gemfile
 - lib/activeadmin-searchable_select.rb
 - lib/activeadmin/inputs/filters/searchable_select_input.rb
 - lib/activeadmin/inputs/searchable_select_input.rb
@@ -294,17 +363,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.1'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.0
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Use searchable selects based on Select2 in Active Admin forms and filters.

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-rvm:
-  - 2.3.4
-
-# Use container based travis infrastructure which allows caching
-# features for open source projects.
-sudo: false
-cache:
-  bundler: true
-
-gemfile:
-  - gemfiles/rails_4.2_active_admin_1.0.0.pre4.gemfile
-  - gemfiles/rails_5.1_active_admin_1.0.gemfile
-  - gemfiles/rails_5.1_active_admin_1.1.gemfile
-
-script: bundle exec rspec