activeadmin-searchable_select 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afca3ffb2bd7868c51afc6e6793fc4b3080a1fdb0f92a248ccdbe264faa58597
-  data.tar.gz: defeafa115233119aacc2bde15424810bdd1fd05187c2c48536879586b96b00b
+  metadata.gz: 7cfe9f36cf136d370ead8ce6227d00057850a5d4f6ee9520cbed52da1c15a3d8
+  data.tar.gz: d5043ace26e5abc0b5a4ee3c58b2fad8243b9cb8c78de93be0013f6c4116b163
 SHA512:
-  metadata.gz: 527c21ae72869785419007a81436186684d589e87abc4aeb64213a8fe46af2ca1701e98296f8d2a9c64c756a9331a625aac166994591a57d1c43c70cf277ccb0
-  data.tar.gz: 71f29f997879afec190f430697d57362dba21802e322b8045d20b247f3c1ef0df8ed8b88b0a84a4e43910dda1ef9221050e8843fac45133b3c9fd15defe028be
+  metadata.gz: 912517731c734da5286389411fc658c3de99d336b538b8f9c8e6b28640185bcd3b718d7220c3b91d4a1d70f398b0e43bfe606c61403cd66807d441f89eda668d
+  data.tar.gz: 4491ef833bf6b70a2b66008de0507b22ca05dd0d9ff620b76127ec284fd4961c8eb868856ff2f472001d85b904a1e0114509d996c013ff66a81a2f27c8592ee5

data/.github/workflows/tests.yml

@@ -23,6 +23,8 @@ jobs:
         include:
           - ruby-version: '3.0'
             gemfile: gemfiles/rails_6.x_active_admin_2.x.gemfile
+          - ruby-version: '3.0'
+            gemfile: gemfiles/rails_6.x_active_admin_3.x.gemfile
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}

data/Appraisals

@@ -16,4 +16,9 @@ end
 appraise 'rails-6.x-active-admin-2.x' do
   gem 'rails', '~> 6.1'
   gem 'activeadmin', '~> 2.0'
-end
+end
+
+appraise 'rails-6.x-active-admin-3.x' do
+  gem 'rails', '~> 6.1'
+  gem 'activeadmin', '~> 3.0'
+end

data/CHANGELOG.md

@@ -1,17 +1,16 @@
 # CHANGELOG
 
-### Version 1.7.0
+### Version 1.8.0
 
-2023-05-03
+2023-08-17
 
-[Compare changes](https://github.com/codevise/activeadmin-searchable_select/compare/1-6-stable...v1.7.0)
+[Compare changes](https://github.com/codevise/activeadmin-searchable_select/compare/1-7-stable...v1.8.0)
 
-- Fix pre-selected item when using belongs_to
-  ([#43](https://github.com/codevise/activeadmin-searchable_select/pull/43),
-   [#44](https://github.com/codevise/activeadmin-searchable_select/pull/44))
-- Improvement the examples in Readme for import npm assets
-  ([#41](https://github.com/codevise/activeadmin-searchable_select/pull/41))
+- Update webdrivers to fix specs for Chrome 115
+  ([#47](https://github.com/codevise/activeadmin-searchable_select/pull/47))
+- Add support for Active Admin 3.0
+  ([#45](https://github.com/codevise/activeadmin-searchable_select/pull/45))
 
 See
-[1-6-stable branch](https://github.com/codevise/activeadmin-searchable_select/blob/1-6-stable/CHANGELOG.md)
+[1-7-stable branch](https://github.com/codevise/activeadmin-searchable_select/blob/1-7-stable/CHANGELOG.md)
 for previous changes.

data/README.md

@@ -3,7 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/activeadmin-searchable_select.svg)](http://badge.fury.io/rb/activeadmin-searchable_select)
 [![NPM Version](https://badge.fury.io/js/@codevise%2Factiveadmin-searchable_select.svg)](https://badge.fury.io/js/@codevise%2Factiveadmin-searchable_select)
 [![npm](https://img.shields.io/npm/dm/@codevise/activeadmin-searchable_select)](https://www.npmjs.com/package/@codevise/activeadmin-searchable_select)
-[![Build Status](https://github.com/codevise/activeadmin-searchable_select.svg?branch=master)](https://github.com/codevise/activeadmin-searchable_select/actions)
+[![Build Status](https://github.com/codevise/activeadmin-searchable_select/actions/workflows/tests.yml/badge.svg)](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

data/activeadmin-searchable_select.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
 
   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 'selenium-webdriver', '~> 4.1'
+  spec.add_development_dependency 'webdrivers', '= 5.3.0'
 
   spec.add_development_dependency 'coffee-rails'
   spec.add_development_dependency 'rails'
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'semmy', '~> 1.0'
   spec.add_development_dependency 'sprockets', '~> 3.7'
 
-  spec.add_runtime_dependency 'activeadmin', ['>= 1.x', '< 3']
+  spec.add_runtime_dependency 'activeadmin', ['>= 1.x', '< 4']
   spec.add_runtime_dependency 'jquery-rails', ['>= 3.0', '< 5']
   spec.add_runtime_dependency 'select2-rails', '~> 4.0'
 end

data/gemfiles/rails_6.x_active_admin_3.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", "~> 3.0"
+
+gemspec path: "../"

data/lib/activeadmin/searchable_select/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module SearchableSelect
-    VERSION = '1.7.0'.freeze
+    VERSION = '1.8.0'.freeze
   end
 end

data/spec/support/models.rb

@@ -4,6 +4,10 @@ class User < ActiveRecord::Base; end
 
 class Category < ActiveRecord::Base
   belongs_to :created_by, class_name: 'User'
+
+  def self.ransackable_attributes(_auth_object = nil)
+    ['name']
+  end
 end
 
 class Post < ActiveRecord::Base
@@ -11,6 +15,10 @@ class Post < ActiveRecord::Base
   belongs_to :user
 
   scope(:published, -> { where(published: true) })
+
+  def self.ransackable_attributes(_auth_object = nil)
+    %w(category_id title)
+  end
 end
 
 module RGB
@@ -24,6 +32,10 @@ module Internal
   class TagName < ActiveRecord::Base
     self.table_name = :internal_tag_names
     belongs_to :color, class_name: 'RGB::Color', foreign_key: :color_id
+
+    def self.ransackable_attributes(_auth_object = nil)
+      ['color_id']
+    end
   end
 end
 
@@ -31,6 +43,10 @@ class OptionType < ActiveRecord::Base; end
 
 class OptionValue < ActiveRecord::Base
   belongs_to :option_type
+
+  def self.ransackable_attributes(_auth_object = nil)
+    ['value']
+  end
 end
 
 class Product < ActiveRecord::Base

data/src/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/src/searchable_select.js

@@ -0,0 +1,2 @@
+import 'select2';
+import './searchable_select/init';

data/src/searchable_select.scss

@@ -0,0 +1,5 @@
+@import "select2";
+
+.searchable_select.input .select2-container {
+  min-width: 30%;
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-searchable_select
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,28 +148,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.3.0
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -249,7 +249,7 @@ dependencies:
         version: 1.x
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -259,7 +259,7 @@ dependencies:
         version: 1.x
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -321,6 +321,7 @@ files:
 - 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
+- gemfiles/rails_6.x_active_admin_3.x.gemfile
 - lib/activeadmin-searchable_select.rb
 - lib/activeadmin/inputs/filters/searchable_select_input.rb
 - lib/activeadmin/inputs/searchable_select_input.rb
@@ -355,6 +356,9 @@ files:
 - spec/support/models.rb
 - spec/support/pluck_polyfill.rb
 - spec/support/reset_settings.rb
+- src/searchable_select.js
+- src/searchable_select.scss
+- src/searchable_select/init.js
 homepage: https://github.com/codevise/activeadmin-searchable_select
 licenses:
 - MIT