activeadmin-searchable_select 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adbee989dd2ce2851dce0565e4eb04e02b7d63dd164fb3bfb491f7b3840eddf9
-  data.tar.gz: 01f9cf36616ed6ccdb22e956f6f43dfd1a3d44cf52a18f9957433b384bfe893d
+  metadata.gz: c6d4c7d8435c3adb952ee4da5da0956da99d127077bbcbc1ac532fe302adf6bd
+  data.tar.gz: 5bbf85c4d97ba8f06798705c25a44dc0e7bb78394d816cf9953b9292ed64f957
 SHA512:
-  metadata.gz: 00ca17e82f7a964c1b50425e2d62a16a49bdb06c041879d05ad6a98e5f520b9f8a324d888b6e26299c6b994199c8e44a402c44a2e303ac1ce6c743c9a5336675
-  data.tar.gz: da3c49a990ca32f3ae6fcbe126eaeb80d144a772a8340ed45d7e40aac5de94440e57035196223af055f69d3eb8cee1377f1fa7cc794d543ede2e4efc964ed414
+  metadata.gz: 8e62b205e6502858dc107a0264e51dc91b45246e6d4215ec458cc6886f451ebbc44a5f5fbdfce7c36c43ddc816896572d0e5430e91dcfbb9119c92a1afa1550d
+  data.tar.gz: b3af3cd5a33b0af6b88b791a758574531b1ff8e9b21acc153c0b81156c66807b3091027c3058809a8681d0c2073ad6ba526461d835dea6f4661b9bc501bcc274

data/CHANGELOG.md

@@ -1,27 +1,14 @@
 # CHANGELOG
 
-### Version 1.0.2
+### Version 1.1.0
 
-2018-02-08
+2019-01-18
 
-[Compare changes](https://github.com/codevise/activeadmin-searchable_select/compare/v1.0.1...v1.0.2)
+[Compare changes](https://github.com/codevise/activeadmin-searchable_select/compare/1-0-stable...v1.1.0)
 
-- Use the namespace for the active admin resource.
-  ([#4](https://github.com/codevise/activeadmin-searchable_select/pull/4))
-- Make end to end specs less brittle
-  ([#5](https://github.com/codevise/activeadmin-searchable_select/pull/5))
+- Allow for multi-select filters
+  ([#11](https://github.com/codevise/activeadmin-searchable_select/pull/11))
 
-### Version 1.0.1
-
-2018-01-19
-
-[Compare changes](https://github.com/codevise/activeadmin-searchable_select/compare/v1.0.0...v1.0.1)
-
-- Use zero based pagination parameter
-  ([#2](https://github.com/codevise/activeadmin-searchable_select/pull/2))
-
-### Version 1.0.0
-
-2017-10-23
-
-- Initial release.
+See
+[1-0-stable branch](https://github.com/codevise/activeadmin-searchable_select/blob/1-0-stable/CHANGELOG.md)
+for previous changes.

data/README.md

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

data/lib/activeadmin/searchable_select/select_input_extension.rb

@@ -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.2'.freeze
+    VERSION = '1.1.0'.freeze
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-searchable_select
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler