recourse 2.0.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60194be6140d65a8864c22b460e7887350d353f4d1c57d678659c71bafbd142c
-  data.tar.gz: 7613666c954f8aedb3dd7798cd961a14c17f4518efa6a9fbd8cfebf5477a6b0b
+  metadata.gz: '091131788570e0d656c7d18722d0ee4f8250407302b6837b05f00c80cedbe187'
+  data.tar.gz: 055b6fbf31f3709bd0f8cceea226a80d3b16449f19ec2dfb76702063f13e7173
 SHA512:
-  metadata.gz: 7e354bc6c67f848bd7155dcf9c01eeb07817d337681d2d1b1f42025059bc41aa4b52f536af5de504f12a271b85db7142a89d593afe7c8f345b4b77e40700f2dc
-  data.tar.gz: 51d1b0cc87aece205403feeeaf9f347b2f91840ca8bc55b0691ce3d074eca23c3d694e06baf5ccf5971fd1c202c1bcb0c982bcd4046e6805e0ded353941428eb
+  metadata.gz: 5e7e0c9f483521daa886026dd2249c4e66772afd4f2ce85a876f1b58e469f4b99c5796291cd26686f4207e192475c8ac4a28a5761a971efbc37df3740131ac09
+  data.tar.gz: f6f76dbfe6678da9edbf3e3994a0646ade63bacd2ef2b2d540730cd0f4a7748508f40334c77e98a9087ce4eab63099d6b59080b14c6ca32e4aec7a92bde5005e

data/app/helpers/searchable_helper.rb

@@ -5,7 +5,7 @@ module SearchableHelper
   # @param [ApplicationRecord] model the model of each object returned by the search
   def search_form(q:, model:, url: url_for(model))
     search_form_for(q, search_form_params(url: url)) do |form|
-      safe_join [filter_field_for(form, model:), search_field_for(form, model:)].compact
+      safe_join [*filter_fields_for(form, model:), search_field_for(form, model:)].compact
     end
   end
 
@@ -16,14 +16,16 @@ module SearchableHelper
 
 private
 
-  def filter_field_for(form, model:)
-    method = model.filter_field
-    choices = model.filter_choices
-    options = { prompt: model.filter_prompt }
-    form.select method, choices, options, filter_field_params if method && choices
+  def filter_fields_for(form, model:)
+    selects = model.filter_fields.map do |method, options = {}|
+      choices = options.delete :choices
+      form.select method, choices, options, filter_field_params if choices
+    end
+    safe_join selects.compact
   end
 
   def search_field_for(form, model:)
+    return unless model.search_field
     adorn = tag.svg width: 16, height: 16, viewBox: '0 0 16 16', xmlns: 'http://www.w3.org/2000/svg' do
       tag.path d: 'M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001q.044.06.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1 1 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0'
     end
@@ -33,7 +35,7 @@ private
 
   def search_form_params(url:)
     {
-      url: url, class: 'col-8 sm:col-6 md:col-4 d-flex pe-4', role: 'search',
+      url: url, class: 'col-6 d-flex pe-4', role: 'search',
       data: { turbo_frame: :results, turbo_action: :advance },
     }
   end

data/lib/recourse/searchable.rb

@@ -26,16 +26,7 @@ module Recourse
     end
 
     # @note to be overriden by subclasses -- the name of the field to filter by.
-    def filter_field
-    end
-
-    # @note to be overriden by subclasses -- the prompt for the field to filter by.
-    def filter_prompt
-    end
-
-    # @note to be overriden by subclasses -- the values for the field to filter by.
-    def filter_choices
-    end
+    def filter_fields = {}
   end
 end
 

data/lib/recourse/version.rb

@@ -1,3 +1,3 @@
 module Recourse
-  VERSION = '2.0.2'
+  VERSION = '3.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recourse
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Claudio Baccigalupo