activeadmin-tom_select 4.1.0 → 4.1.2

data/gemfiles/rails_8.x_active_admin_4.x.gemfile.lock

@@ -1,36 +1,36 @@
 PATH
   remote: ..
   specs:
-    activeadmin-tom_select (4.1.0)
+    activeadmin-tom_select (4.1.2)
       activeadmin (>= 3.0, < 5)
       ransack (>= 1.8, < 5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (8.0.2.1)
-      actionpack (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
+    actioncable (8.0.3)
+      actionpack (= 8.0.3)
+      activesupport (= 8.0.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (8.0.2.1)
-      actionpack (= 8.0.2.1)
-      activejob (= 8.0.2.1)
-      activerecord (= 8.0.2.1)
-      activestorage (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
+    actionmailbox (8.0.3)
+      actionpack (= 8.0.3)
+      activejob (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
       mail (>= 2.8.0)
-    actionmailer (8.0.2.1)
-      actionpack (= 8.0.2.1)
-      actionview (= 8.0.2.1)
-      activejob (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
+    actionmailer (8.0.3)
+      actionpack (= 8.0.3)
+      actionview (= 8.0.3)
+      activejob (= 8.0.3)
+      activesupport (= 8.0.3)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (8.0.2.1)
-      actionview (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
+    actionpack (8.0.3)
+      actionview (= 8.0.3)
+      activesupport (= 8.0.3)
       nokogiri (>= 1.8.5)
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
@@ -38,15 +38,15 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (8.0.2.1)
-      actionpack (= 8.0.2.1)
-      activerecord (= 8.0.2.1)
-      activestorage (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
+    actiontext (8.0.3)
+      actionpack (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (8.0.2.1)
-      activesupport (= 8.0.2.1)
+    actionview (8.0.3)
+      activesupport (= 8.0.3)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -60,22 +60,22 @@ GEM
       kaminari (>= 1.2.1)
       railties (>= 7.0)
       ransack (>= 4.0)
-    activejob (8.0.2.1)
-      activesupport (= 8.0.2.1)
+    activejob (8.0.3)
+      activesupport (= 8.0.3)
       globalid (>= 0.3.6)
-    activemodel (8.0.2.1)
-      activesupport (= 8.0.2.1)
-    activerecord (8.0.2.1)
-      activemodel (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
+    activemodel (8.0.3)
+      activesupport (= 8.0.3)
+    activerecord (8.0.3)
+      activemodel (= 8.0.3)
+      activesupport (= 8.0.3)
       timeout (>= 0.4.0)
-    activestorage (8.0.2.1)
-      actionpack (= 8.0.2.1)
-      activejob (= 8.0.2.1)
-      activerecord (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
+    activestorage (8.0.3)
+      actionpack (= 8.0.3)
+      activejob (= 8.0.3)
+      activerecord (= 8.0.3)
+      activesupport (= 8.0.3)
       marcel (~> 1.0)
-    activesupport (8.0.2.1)
+    activesupport (8.0.3)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -142,7 +142,7 @@ GEM
     formtastic (5.0.0)
       actionpack (>= 6.0.0)
     formtastic_i18n (0.7.0)
-    globalid (1.2.1)
+    globalid (1.3.0)
       activesupport (>= 6.1)
     has_scope (0.8.2)
       actionpack (>= 5.2)
@@ -159,7 +159,7 @@ GEM
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.13.2)
+    json (2.15.0)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -183,12 +183,12 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.4)
+    marcel (1.1.0)
     matrix (0.4.3)
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2025.0909)
+    mime-types-data (3.2025.0924)
     mini_mime (1.1.5)
     minitest (5.25.5)
     net-imap (0.5.10)
@@ -215,7 +215,7 @@ GEM
       prettyprint
     prettyprint (0.2.0)
     prism (1.5.1)
-    propshaft (1.2.1)
+    propshaft (1.3.1)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
@@ -234,20 +234,20 @@ GEM
       rack (>= 1.3)
     rackup (2.2.1)
       rack (>= 3)
-    rails (8.0.2.1)
-      actioncable (= 8.0.2.1)
-      actionmailbox (= 8.0.2.1)
-      actionmailer (= 8.0.2.1)
-      actionpack (= 8.0.2.1)
-      actiontext (= 8.0.2.1)
-      actionview (= 8.0.2.1)
-      activejob (= 8.0.2.1)
-      activemodel (= 8.0.2.1)
-      activerecord (= 8.0.2.1)
-      activestorage (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
+    rails (8.0.3)
+      actioncable (= 8.0.3)
+      actionmailbox (= 8.0.3)
+      actionmailer (= 8.0.3)
+      actionpack (= 8.0.3)
+      actiontext (= 8.0.3)
+      actionview (= 8.0.3)
+      activejob (= 8.0.3)
+      activemodel (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
       bundler (>= 1.15.0)
-      railties (= 8.0.2.1)
+      railties (= 8.0.3)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
@@ -255,19 +255,20 @@ GEM
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (8.0.2.1)
-      actionpack (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
+    railties (8.0.3)
+      actionpack (= 8.0.3)
+      activesupport (= 8.0.3)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.3.0)
-    ransack (4.3.0)
-      activerecord (>= 6.1.5)
-      activesupport (>= 6.1.5)
+    ransack (4.4.1)
+      activerecord (>= 7.2)
+      activesupport (>= 7.2)
       i18n
     rdoc (6.14.2)
       erb
@@ -294,7 +295,7 @@ GEM
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-support (3.13.5)
+    rspec-support (3.13.6)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (1.80.2)
@@ -322,10 +323,11 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    sqlite3 (2.7.3-x86_64-linux-gnu)
+    sqlite3 (2.7.4-x86_64-linux-gnu)
     stringio (3.1.7)
     thor (1.4.0)
     timeout (0.4.3)
+    tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.2.0)

data/lib/activeadmin/inputs/filters/searchable_select_input.rb

@@ -1,18 +1,11 @@
+require 'activeadmin/inputs/filters/tom_select_input'
+
 module ActiveAdmin
   module Inputs
     module Filters
-      # Searchable select input type for ActiveAdmin filters.
-      #
-      # @see ActiveAdmin::SearchableSelect::SelectInputExtension
-      #   SelectInputExtension for list of available options.
-      class SearchableSelectInput < SelectInput
-        include ActiveAdmin::SearchableSelect::SelectInputExtension
-
-        # Override to remove the empty "Any" option since we're using
-        # Tom Select's clear button plugin instead
-        def input_options
-          super.merge(include_blank: false)
-        end
+      # Legacy alias for TomSelectInput - maintained for backward compatibility
+      # @deprecated Use TomSelectInput instead
+      class SearchableSelectInput < TomSelectInput
       end
     end
   end

data/lib/activeadmin/inputs/filters/tom_select_input.rb

@@ -0,0 +1,19 @@
+module ActiveAdmin
+  module Inputs
+    module Filters
+      # Tom Select input type for ActiveAdmin filters.
+      #
+      # @see ActiveAdmin::TomSelect::SelectInputExtension
+      #   SelectInputExtension for list of available options.
+      class TomSelectInput < SelectInput
+        include ActiveAdmin::TomSelect::SelectInputExtension
+
+        # Override to remove the empty "Any" option since we're using
+        # Tom Select's clear button plugin instead
+        def input_options
+          super.merge(include_blank: false)
+        end
+      end
+    end
+  end
+end

data/lib/activeadmin/inputs/searchable_select_input.rb

@@ -1,16 +1,10 @@
+require 'activeadmin/inputs/tom_select_input'
+
 module ActiveAdmin
   module Inputs
-    # Searchable select input type for ActiveAdmin filters.
-    #
-    # @see ActiveAdmin::SearchableSelect::SelectInputExtension
-    #   SelectInputExtension for list of available options.
-    class SearchableSelectInput < Formtastic::Inputs::SelectInput
-      include ActiveAdmin::SearchableSelect::SelectInputExtension
-
-      # Override to prevent adding empty options
-      def input_options
-        super.merge(include_blank: false)
-      end
+    # Legacy alias for TomSelectInput - maintained for backward compatibility
+    # @deprecated Use TomSelectInput instead
+    class SearchableSelectInput < TomSelectInput
     end
   end
 end

data/lib/activeadmin/inputs/tom_select_input.rb

@@ -0,0 +1,16 @@
+module ActiveAdmin
+  module Inputs
+    # Tom Select input type for ActiveAdmin forms.
+    #
+    # @see ActiveAdmin::TomSelect::SelectInputExtension
+    #   SelectInputExtension for list of available options.
+    class TomSelectInput < Formtastic::Inputs::SelectInput
+      include ActiveAdmin::TomSelect::SelectInputExtension
+
+      # Override to prevent adding empty options
+      def input_options
+        super.merge(include_blank: false)
+      end
+    end
+  end
+end

data/lib/activeadmin/tom_select/engine.rb

@@ -1,13 +1,15 @@
 require 'active_admin'
 
 module ActiveAdmin
-  module SearchableSelect
+  module TomSelect
     # @api private
     class Engine < ::Rails::Engine
       engine_name 'activeadmin_tom_select'
 
       initializer 'activeadmin_tom_select.setup' do
         ActiveSupport.on_load(:active_admin) do
+          require 'activeadmin/inputs/tom_select_input'
+          require 'activeadmin/inputs/filters/tom_select_input'
           require 'activeadmin/inputs/searchable_select_input'
           require 'activeadmin/inputs/filters/searchable_select_input'
         end

data/lib/activeadmin/tom_select/option_collection.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  module SearchableSelect
+  module TomSelect
     # @api private
     class OptionCollection
       def initialize(name, options)

data/lib/activeadmin/tom_select/resource_dsl_extension.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  module SearchableSelect
+  module TomSelect
     # Mixin for ActiveAdmin resource DSL
     module ResourceDSLExtension
       # Define a collection action to serve options JSON data for

data/lib/activeadmin/tom_select/resource_extension.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  module SearchableSelect
+  module TomSelect
     # @api private
     module ResourceExtension
       def searchable_select_option_collections

data/lib/activeadmin/tom_select/select_input_extension.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  module SearchableSelect
+  module TomSelect
     # Mixin for searchable select inputs.
     #
     # Supports the same options as inputs of type `:select`.
@@ -26,7 +26,7 @@ module ActiveAdmin
     #
     # If the `ajax` option is present, the `collection` option is
     # ignored.
-    module SelectInputExtension
+    module SelectInputExtension # rubocop:disable Metrics/ModuleLength
       # @api private
       def to_html
         super
@@ -40,30 +40,53 @@ module ActiveAdmin
       # @api private
       def input_html_options
         super.tap do |options|
-          options[:class] = [options[:class], 'searchable-select-input'].compact.join(' ')
-          options['data-ajax-url'] = ajax_url if ajax? && !SearchableSelect.inline_ajax_options
-          options['data-clearable'] = true if clearable?
+          add_css_class(options)
+          add_data_attributes(options)
         end
       end
 
       # @api private
+      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+      # rubocop:disable Metrics/PerceivedComplexity
       def collection_from_options
-        return super unless options[:ajax]
+        if ajax?
+          collection = if TomSelect.inline_ajax_options
+                         all_options_collection
+                       else
+                         selected_value_collection
+                       end
+
+          # Remove any empty/blank options since we use clear button instead
+          collection.reject { |item| item.first.to_s.strip.empty? && item.last.to_s.strip.empty? }
+        else
+          # When not using ajax, get the original collection
+          collection = super
+          # Add empty option at the beginning if not present to prevent auto-selection
+          if collection.present? && collection.none? { |item| item.last.to_s.strip.empty? }
+            [['', '']] + collection
+          else
+            collection
+          end
+        end
+      end
+      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+      # rubocop:enable Metrics/PerceivedComplexity
 
-        collection = if SearchableSelect.inline_ajax_options
-                       all_options_collection
-                     else
-                       selected_value_collection
-                     end
+      private
 
-        # Remove any empty/blank options since we use clear button instead
-        collection.reject { |item| item.first.to_s.strip.empty? && item.last.to_s.strip.empty? }
+      def add_css_class(options)
+        css_class = self.class.name.demodulize.underscore.dasherize
+        options[:class] = [options[:class], css_class].compact.join(' ')
       end
 
-      private
+      def add_data_attributes(options)
+        options['data-ajax-url'] = ajax_url if ajax? && !TomSelect.inline_ajax_options
+        options['data-clearable'] = true if clearable?
+      end
 
       def ajax?
-        options[:ajax].present?
+        # Default to true unless explicitly set to false
+        options[:ajax] != false
       end
 
       def clearable?
@@ -72,7 +95,7 @@ module ActiveAdmin
       end
 
       def ajax_url
-        return unless options[:ajax]
+        return unless ajax?
 
         [ajax_resource.route_collection_path(path_params),
          '/',

data/lib/activeadmin/tom_select/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  module SearchableSelect
-    VERSION = '4.1.0'.freeze
+  module TomSelect
+    VERSION = '4.1.2'.freeze
   end
 end

data/lib/activeadmin/tom_select.rb

@@ -5,12 +5,12 @@ require 'activeadmin/tom_select/resource_dsl_extension'
 require 'activeadmin/tom_select/select_input_extension'
 require 'activeadmin/tom_select/version'
 
-ActiveAdmin::Resource.include ActiveAdmin::SearchableSelect::ResourceExtension
-ActiveAdmin::ResourceDSL.include ActiveAdmin::SearchableSelect::ResourceDSLExtension
+ActiveAdmin::Resource.include ActiveAdmin::TomSelect::ResourceExtension
+ActiveAdmin::ResourceDSL.include ActiveAdmin::TomSelect::ResourceDSLExtension
 
 module ActiveAdmin
   # Global settings for searchable selects
-  module SearchableSelect
+  module TomSelect
     # Statically render all options into searchable selects with
     # `ajax` option set to true. This can be used to ease ui driven
     # integration testing.

data/lib/generators/active_admin/tom_select/install/install_generator.rb

@@ -17,8 +17,8 @@ module ActiveAdmin
         def install_npm_package
           return unless options[:bundler] != 'importmap'
 
-          say 'Installing @rocket-sensei/activeadmin-tom_select npm package...', :green
-          run 'npm install @rocket-sensei/activeadmin-tom_select'
+          say 'Installing activeadmin-tom_select npm package...', :green
+          run 'npm install activeadmin-tom_select'
         end
 
         def setup_javascript
@@ -90,7 +90,7 @@ module ActiveAdmin
               <<~JS
 
                 // ActiveAdmin Tom Select
-                import '@rocket-sensei/activeadmin-tom_select';
+                import 'activeadmin-tom_select';
               JS
             end
           else
@@ -100,7 +100,7 @@ module ActiveAdmin
                 import "@activeadmin/activeadmin";
 
                 // ActiveAdmin Tom Select
-                import '@rocket-sensei/activeadmin-tom_select';
+                import 'activeadmin-tom_select';
               JS
             end
           end
@@ -166,7 +166,7 @@ module ActiveAdmin
               <<~JS
 
                 // ActiveAdmin Tom Select
-                import '@rocket-sensei/activeadmin-tom_select';
+                import 'activeadmin-tom_select';
               JS
             end
           else

data/npm-package/package-lock.json

@@ -1,11 +1,11 @@
 {
-  "name": "@rocket-sensei/activeadmin-tom_select",
+  "name": "activeadmin-tom_select",
   "version": "4.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "@rocket-sensei/activeadmin-tom_select",
+      "name": "activeadmin-tom_select",
       "version": "4.1.0",
       "license": "MIT",
       "peerDependencies": {

data/npm-package/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@rocket-sensei/activeadmin-tom_select",
-  "version": "4.1.0",
+  "name": "activeadmin-tom_select",
+  "version": "4.1.2",
   "description": "Use Tom Select for searchable selects in Active Admin forms and filters.",
   "main": "src/index.js",
   "module": "src/index.js",

data/npm-package/src/index.js

@@ -3,7 +3,7 @@
 import TomSelect from 'tom-select';
 
 const MODULE_NAME = 'ActiveAdmin Searchable Select';
-const SELECTOR = '.searchable-select-input';
+const SELECTOR = '.searchable-select-input, .tom-select-input';
 const INITIALIZED_CLASS = 'tom-select-initialized';
 
 // Core initialization function
@@ -148,6 +148,4 @@ export function setupAutoInit() {
       initSearchableSelects(selects);
     }
   });
-
-  console.log(`${MODULE_NAME} (Tom Select) initialized`);
 }