activeadmin-searchable_select 1.0.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e45366aab36050f1bacd26cf7c7e083f73366337
-  data.tar.gz: 41b977d5f33c903293d2cccccfcabf2de910c71a
+SHA256:
+  metadata.gz: 0f06a7e42bdf09260f9581eb93b9b53254410068c9f0748d958621b75b47a1d9
+  data.tar.gz: 7a735aed9e7a2bd6da9c7702407a318dd0740f1b3d519bf220513163ddf848a9
 SHA512:
-  metadata.gz: 48d3f353accca041a2bc5d533cc8574d6f895f7b04fca7354b5d10e6fc73c3ae276b555ed031ea8226bcfc0a68f70c49657f737df9c51fb0f6f316700d34c2a4
-  data.tar.gz: 1114951d8895a4a25a1e56162d099c9fc60592241ec79b9ee8c573fed3db93e427b3137f41d555c3a658eef3f0df6cecf2a3f4034e8102a8a4280cfa97336a8e
+  metadata.gz: 10cf476611bc7d46a2c39d8db812c1638de6d4484e6cd522962ab951a97ffb1353fc23313df5bf47cbb417176f0d3df9bb2de5557f5e7f33d650df4e27366bcb
+  data.tar.gz: 2bb155897e057ca7c073677cc232ccfdde3c761e463ee261382fed82f020921fa2b80e26a10dd8494650b21b0d1b0696934762a9f9e2d817d0f79a4bc9274dad

data/.travis.yml

@@ -10,7 +10,8 @@ cache:
 
 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
+  - 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
 
 script: bundle exec rspec

data/Appraisals

@@ -2,14 +2,20 @@ 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'
+  gem 'sqlite3', '~> 1.3.6'
 end
 
-appraise 'rails-5.1-active-admin-1.0' do
-  gem 'rails', '~> 5.1'
+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.1' do
-  gem 'rails', '~> 5.1'
-  gem 'activeadmin', '~> 1.1'
+appraise 'rails-5.x-active-admin-1.x' do
+  gem 'rails', '~> 5.2'
+  gem 'activeadmin', '~> 1.0'
 end
+
+appraise 'rails-5.x-active-admin-2.x' do
+  gem 'rails', '~> 5.2'
+  gem 'activeadmin', '~> 2.0'
+end

data/CHANGELOG.md

@@ -1,7 +1,25 @@
 # CHANGELOG
 
-### Version 1.0.0
+### Version 1.2.1
 
-2017-10-23
+2020-12-08
 
-- Initial release.
+[Compare changes](https://github.com/codevise/activeadmin-searchable_select/compare/v1.2.0...v1.2.1)
+
+- Fix ajax url when active admin namespace is set to false
+  ([#22](https://github.com/codevise/activeadmin-searchable_select/pull/22))
+
+### Version 1.2.0
+
+2019-05-10
+
+[Compare changes](https://github.com/codevise/activeadmin-searchable_select/compare/1-1-stable...v1.2.0)
+
+- Add support for Active Admin 2.0
+  ([#13](https://github.com/codevise/activeadmin-searchable_select/pull/13))
+- Improve Appraisal setup
+  ([#12](https://github.com/codevise/activeadmin-searchable_select/pull/12))
+
+See
+[1-1-stable branch](https://github.com/codevise/activeadmin-searchable_select/blob/1-1-stable/CHANGELOG.md)
+for previous changes.

data/Gemfile

@@ -1,3 +1,7 @@
 source 'https://rubygems.org'
 
+# Required for select2-rails to work with Active Admin 1.1
+# see https://github.com/activeadmin/activeadmin/issues/5226
+gem 'sass-rails'
+
 gemspec

data/README.md

@@ -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:

data/activeadmin-searchable_select.gemspec

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'activeadmin/searchable_select/version'
@@ -22,7 +20,7 @@ Gem::Specification.new do |spec|
   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'
@@ -31,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'semmy', '~> 1.0'
   spec.add_development_dependency 'rails'
 
-  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/app/assets/javascripts/active_admin/searchable_select.js

@@ -0,0 +1,3 @@
+//= require select2
+
+//= require_tree ./searchable_select

data/app/assets/javascripts/active_admin/searchable_select/init.js

@@ -0,0 +1,46 @@
+(function() {
+  function initSearchableSelects(inputs, extra) {
+    inputs.each(function() {
+      var item = $(this);
+
+      // reading from data allows <input data-searchable_select='{"tags": ['some']}'>
+      // to be passed to select2
+      var options = $.extend(extra || {}, item.data('searchableSelect'));
+      var url = item.data('ajaxUrl');
+
+      if (url) {
+        $.extend(options, {
+          ajax: {
+            url: url,
+            dataType: 'json',
+
+            data: function (params) {
+              return {
+                term: params.term,
+                page: pageParamWithBaseZero(params)
+              };
+            }
+          }
+        });
+      }
+
+      item.select2(options);
+    });
+  }
+
+  function pageParamWithBaseZero(params) {
+    return params.page ? params.page - 1 : undefined;
+  }
+
+  $(document).on('has_many_add:after', '.has_many_container', function(e, fieldset) {
+    initSearchableSelects(fieldset.find('.searchable-select-input'));
+  });
+
+  $(document).on('page:load turbolinks:load', function() {
+    initSearchableSelects($(".searchable-select-input"), {placeholder: ""});
+  });
+
+  $(function() {
+    initSearchableSelects($(".searchable-select-input"));
+  });
+}());

data/gemfiles/rails_4.2_active_admin_1.0.0.pre4.gemfile

@@ -2,8 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "sass-rails"
 gem "rails", "~> 4.2"
 gem "activeadmin", "1.0.0.pre4"
 gem "jquery-ui-rails", "~> 5.0"
+gem "sqlite3", "~> 1.3.6"
 
 gemspec path: "../"

data/gemfiles/rails_5.1_active_admin_1.x.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sass-rails"
+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}

@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1"
+gem "sass-rails"
+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}

@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1"
-gem "activeadmin", "~> 1.1"
+gem "sass-rails"
+gem "rails", "~> 5.2"
+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.0'.freeze
+    VERSION = '1.2.1'.freeze
   end
 end

data/spec/features/end_to_end_spec.rb

@@ -24,35 +24,42 @@ RSpec.describe 'end to end', type: :feature, js: true do
   end
 
   describe 'index page with searchable select filter' do
-    before(:each) do
-      music_category = Category.create(name: 'Music')
-      travel_category = Category.create(name: 'Travel')
-
-      Post.create(title: 'Best songs',
-                  category: music_category)
-      Post.create(title: 'Best places',
-                  category: travel_category)
-    end
-
     it 'loads filter input options' do
+      Category.create(name: 'Music')
+      Category.create(name: 'Travel')
+
       visit '/admin/posts'
 
       expand_select_box
+      wait_for_ajax
 
       expect(select_box_items).to eq(%w(Music Travel))
     end
 
     it 'allows filtering options by term' do
+      Category.create(name: 'Music')
+      Category.create(name: 'Travel')
+
       visit '/admin/posts'
 
       expand_select_box
-
-      wait_for_ajax do
-        enter_search_term('T')
-      end
+      enter_search_term('T')
+      wait_for_ajax
 
       expect(select_box_items).to eq(%w(Travel))
     end
+
+    it 'loads more items when scrolling down' do
+      15.times { |i| Category.create(name: "Category #{i}") }
+      visit '/admin/posts'
+
+      expand_select_box
+      wait_for_ajax
+      scroll_select_box_list
+      wait_for_ajax
+
+      expect(select_box_items.size).to eq(15)
+    end
   end
 
   def expand_select_box
@@ -63,21 +70,22 @@ RSpec.describe 'end to end', type: :feature, js: true do
     find('.select2-dropdown input').send_keys(term)
   end
 
+  def scroll_select_box_list
+    page.execute_script '$(".select2-container ul").scrollTop(1000)'
+  end
+
   def select_box_items
     all('.select2-dropdown li').map(&:text)
   end
 
-  def wait_for_ajax(count = 1)
-    page.execute_script 'window._ajaxCalls = 0'
-    page.execute_script 'window._ajaxCompleteCounter = function() { window._ajaxCalls += 1; }'
-    page.execute_script '$(document).ajaxComplete(window._ajaxCompleteCounter)'
-
-    yield
-
-    sleep(0.5) until finished_all_ajax_requests?(count)
+  def wait_for_ajax
+    Timeout.timeout(Capybara.default_max_wait_time) do
+      sleep 0.1
+      loop until finished_all_ajax_requests?
+    end
   end
 
-  def finished_all_ajax_requests?(count)
-    page.evaluate_script('window._ajaxCalls') == count
+  def finished_all_ajax_requests?
+    page.evaluate_script('jQuery.active').zero?
   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/internal/app/assets/stylesheets/active_admin.scss

@@ -1,2 +1,4 @@
 @import "active_admin/mixins";
 @import "active_admin/base";
+
+@import "active_admin/searchable_select";

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-searchable_select
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,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
@@ -182,16 +182,22 @@ dependencies:
   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
@@ -244,13 +250,14 @@ files:
 - README.md
 - Rakefile
 - activeadmin-searchable_select.gemspec
-- app/assets/javascripts/active_admin/searchable_select.js.coffee
-- app/assets/javascripts/active_admin/searchable_select/init.js.coffee
+- app/assets/javascripts/active_admin/searchable_select.js
+- 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
 - lib/activeadmin-searchable_select.rb
 - lib/activeadmin/inputs/filters/searchable_select_input.rb
 - lib/activeadmin/inputs/searchable_select_input.rb
@@ -304,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Use searchable selects based on Select2 in Active Admin forms and filters.

data/app/assets/javascripts/active_admin/searchable_select.js.coffee

@@ -1,3 +0,0 @@
-#= require select2
-
-#= require_tree ./searchable_select

data/app/assets/javascripts/active_admin/searchable_select/init.js.coffee

@@ -1,29 +0,0 @@
-'use strict';
-
-initSearchableSelects = (inputs, extra = {}) ->
-  inputs.each ->
-    item = $(this)
-    # reading from data allows <input data-searchable_select='{"tags": ['some']}'>
-    # to be passed to select2
-    options = $.extend(extra, item.data('searchableSelect'))
-    url = item.data('ajaxUrl');
-
-    if url
-      $.extend(
-        options,
-        ajax: {
-          url: url,
-          dataType: 'json'
-        }
-      )
-
-    item.select2(options)
-
-$(document).on 'has_many_add:after', '.has_many_container', (e, fieldset) ->
-  initSearchableSelects(fieldset.find('.searchable-select-input'))
-
-$(document).on 'page:load turbolinks:load', ->
-  initSearchableSelects($(".searchable-select-input"), placeholder: "")
-  return
-
-$(-> initSearchableSelects($(".searchable-select-input")))