faceted_search 3.5.10 → 3.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4d977f19f2132c5b2bd915b5e31b8994bc3a9cfea14e437abd71335e9ade21d
-  data.tar.gz: ee426d8c2bc8db64d11e00ec0200e292c51fbd7d056267a3389ff4ad44d75f38
+  metadata.gz: 4a8ff3818f88576b800821c3f4152958722d3baa7d22f18414d55ac6ac46ef0e
+  data.tar.gz: 0ffa91d5c127d09f0136ad63c23b096a3a5750d9fbbc585e44e3cd4785686e5e
 SHA512:
-  metadata.gz: f73ede5472a4581e99a3a0fa8b54bd65221cc2cc02ab24d12d692ee89570aa20e57dab1849f1f0b59cc3d37b27c7037cb0b4e6d21abc2f7f33f2e0253e29cf3b
-  data.tar.gz: c38073518e0da2178cd5a4d7e431fb315a879b8e9446d12eedf80ba4c2318b06aced9541aa8381e073e16058656de81286c6ae638f24f1a532c44436f9121961
+  metadata.gz: 713230c2382f554042a0258f2f1d4de5dbb74b89e21c7f92b5fb42008a7a4ffa082e86ca0067545e5238a494c0e2137e8c9273b3c0b2957d47b54381a7b9180a
+  data.tar.gz: aa54ae605ca1428fa6ae943569ac164ff8b5ed3fa819e6c67c5e5256584b1d7cfad2623b52b1859377cbf3483799e54bd3d79c6aa48978ec92c52f5b460729cd

data/app/models/faceted_search/facets/primitive_list.rb

@@ -4,13 +4,12 @@ module FacetedSearch
     def source
       @source ||= begin
         if @options[:source].present?
-          @options[:source]
+          @options[:source].where("#{field} IS NOT NULL")
         else
           results = params_array.compact.blank? ? facets.results : facets.results_except(@name)
           results.send(:all).where("#{field} IS NOT NULL")
         end
       end
-      @options[:source].where("#{field} IS NOT NULL")
     end
 
     def order

data/app/models/faceted_search/facets/text.rb

@@ -8,7 +8,18 @@ module FacetedSearch
 
     def add_scope(scope)
       return scope if params.blank?
-      scope.where("#{facets.model_table_name}.#{name} ILIKE ?", "%#{self.class.sanitize_sql_like(params)}%")
+      scope.where(where_condition, search_term: "%#{self.class.sanitize_sql_like(params)}%")
+    end
+
+    protected
+
+    def where_condition
+      # PostgreSQL handles removing accents if `unaccent` extension is enabled
+      if ActiveRecord::Base.connection.adapter_name == "PostgreSQL" && ActiveRecord::Base.connection.extensions.include?('unaccent')
+        "unaccent(#{facets.model_table_name}.#{name}) ILIKE unaccent(:search_term)"
+      else
+        "#{facets.model_table_name}.#{name} ILIKE :search_term"
+      end
     end
   end
 end

data/app/views/faceted_search/facets/_facet-selected.html.erb

@@ -1,6 +1,6 @@
 <li class=" faceted__facet-selected
             list-inline-item">
-  <%= link_to path, class: 'badge badge-light', rel: 'nofollow' do %>
+  <%= link_to path, class: 'badge badge-light bg-light text-dark', rel: 'nofollow' do %>
     <% unless title %>
       <span class="faceted__facet-selected__title d-none">
         <%= title %>

data/lib/faceted_search/version.rb

@@ -1,3 +1,3 @@
 module FacetedSearch
-  VERSION = '3.5.10'
+  VERSION = '3.5.13'
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: faceted_search
 version: !ruby/object:Gem::Version
-  version: 3.5.10
+  version: 3.5.13
 platform: ruby
 authors:
 - Arnaud Levy
 - Sébastien Gaya
 - Sébastien Moulène
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -170,7 +170,7 @@ homepage: http://github.com/lespoupeesrusses/faceted_search
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,8 +185,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Faceted search with Active Record
 test_files: []