faceted_search 3.5.7 → 3.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80006422a406840a486d9c8f5a50e1a2425057b285af095e95ee359021a1c1d7
-  data.tar.gz: 578682f035d0315fe84a4950e78879eb0f9654b5d9ff2582b091672473c517ff
+  metadata.gz: 1ada6583674e8af506d38ff4d6210031a2c26e36b272d81dcfcc294d771c11b8
+  data.tar.gz: c0ecb0db4418a381bdef93b05e1ea8f69a4b71dcb71c05cc04e5729cb0e41b24
 SHA512:
-  metadata.gz: ee0870c176285f42f78bb0c244a52783dcc54733b1d0ad1fc5a3db88b069b72d0222bc2c87b6873fd1b503f5d5b2f58f6782c905963d38ece704ded9b5b21c0d
-  data.tar.gz: f0f3ab3e4019737a2d48a364f74b82bc449a1d8d26f94972d3830dcf8334b61b2d473026832cec7d6247ac8bf88eb59e68f0e03237c6e30e54d88a091d199b5b
+  metadata.gz: c5618af51815c11964bcf5e17247000c50856a440b30582451382067f3c987df98258b8eb18a2b2d2e08705038f2c508e440e71a377cda146797b60730943f74
+  data.tar.gz: f10e4f886e2097bc67175dd95f29af2afc817bd101f5e2f9e9617743068c736b6ceb908d2051d8085a841e37a6e55d8d2132f0119dee3f7d28fa3dae5d086b41

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

@@ -26,7 +26,10 @@ module FacetedSearch
     end
 
     def values
-      @values ||= order == :asc ? source : source.reverse
+      @values ||= begin
+        values = (source | params_array.map(&:to_i)).sort
+        order == :asc ? values : values.reverse
+      end
     end
   end
 end

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

@@ -29,7 +29,8 @@ module FacetedSearch
       @values ||= begin
         joined_table = facets.model_table_name.to_sym
         results = params_array.blank? ? facets.results : facets.results_except(@name)
-        source.all.joins(joined_table).where(joined_table => { id: results }).distinct
+        values = source.all.joins(joined_table)
+        values.where(joined_table => { id: results }).or(values.where(id: params_array)).distinct
       end
     end
 

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

@@ -31,7 +31,7 @@ module FacetedSearch
 
     def values
       @values ||= begin
-        values = source.pluck(field).uniq.reject(&:blank?).sort
+        values = (source.pluck(field).uniq.reject(&:blank?) | params_array.compact).sort
         order == :asc ? values : values.reverse
       end
     end

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/models/faceted_search/facets.rb

@@ -53,7 +53,12 @@ module FacetedSearch
     end
 
     def has_params?
-      params.values.select(&:present?).any?
+      any = false
+      list.each do |facet|
+        next if facet.hide_in_selected?
+        any = true if facet.params.present?
+      end
+      any
     end
 
     protected

data/app/views/faceted_search/facets/checkboxes/_all.html.erb

@@ -1,3 +1,4 @@
+<% anchor ||= '' %>
 <% if facet.values.any? %>
   <li>
     <% unless facet.title.blank? %><b><%= facet.title %></b><% end %>

data/app/views/faceted_search/facets/checkboxes/_selected.html.erb

@@ -1,3 +1,4 @@
+<% anchor ||= '' %>
 <% if facet.values.any? %>
   <% facet.values.each do |value| %>
     <% identifier = value.send facet.find_by %>

data/app/views/faceted_search/facets/date/_all.html.erb

@@ -1,3 +1,4 @@
+<% anchor ||= '' %>
 <% if facet.values.any? %>
   <li>
     <% unless facet.title.blank? %><b><%= facet.title %></b><% end %>

data/app/views/faceted_search/facets/date/_selected.html.erb

@@ -1,3 +1,4 @@
+<% anchor ||= '' %>
 <% if facet.values.any? %>
   <% facet.values.each do |year| %>
     <% if facet.value_selected?(year) %>

data/app/views/faceted_search/facets/full_tree/_all.html.erb

@@ -1,3 +1,4 @@
+<% anchor ||= '' %>
 <% if facet.values.any? %>
   <li>
     <% unless facet.title.blank? %><b><%= facet.title %></b><% end %>

data/app/views/faceted_search/facets/full_tree/_selected.html.erb

@@ -1,3 +1,4 @@
+<% anchor ||= '' %>
 <% if facet.values.any? %>
   <%= render  'faceted_search/facets/full_tree/values-selected',
               values: facet.values_with_parent(nil),

data/app/views/faceted_search/facets/full_tree/_values-selected.html.erb

@@ -1,3 +1,4 @@
+<% anchor ||= '' %>
 <% values.each do |value| %>
   <% identifier = value.send facet.find_by %>
   <% if facet.value_selected?(identifier) %>

data/app/views/faceted_search/facets/full_tree/_values.html.erb

@@ -1,3 +1,4 @@
+<% anchor ||= '' %>
 <% values.each do |value| %>
   <% identifier = value.send facet.find_by %>
   <li class="faceted__facet__full_tree__value<%= '--selected' if facet.value_selected?(identifier) %> dd-item <%= 'dd-item--selected' if facet.value_selected?(identifier) %>">

data/app/views/faceted_search/facets/list/_all.html.erb

@@ -1,3 +1,4 @@
+<% anchor ||= '' %>
 <% if facet.values.any? %>
   <li>
     <% unless facet.title.blank? %><b><%= facet.title %></b><% end %>

data/app/views/faceted_search/facets/list/_selected.html.erb

@@ -1,3 +1,4 @@
+<% anchor ||= '' %>
 <% if facet.values.any? %>
   <% facet.values.each do |value| %>
     <% identifier = value.send facet.find_by %>

data/app/views/faceted_search/facets/primitive_list/_all.html.erb

@@ -1,3 +1,4 @@
+<% anchor ||= '' %>
 <% if facet.values.any? %>
   <li>
     <% unless facet.title.blank? %><b><%= facet.title %></b><% end %>

data/app/views/faceted_search/facets/range/_all.html.erb

@@ -1,3 +1,4 @@
+<% anchor ||= '' %>
 <li>
   <% unless facet.title.blank? %><b><%= facet.title %></b><% end %>
   <%

data/app/views/faceted_search/facets/range/_selected.html.erb

@@ -1,3 +1,4 @@
+<% anchor ||= '' %>
 <% value = params[:facets][facet.name] if params[:facets] && params[:facets].has_key?(facet.name) %>
 <% unless value.blank? %>
   <%= render 'faceted_search/facets/facet-selected',

data/app/views/faceted_search/facets/text/_all.html.erb

@@ -1,3 +1,4 @@
+<% anchor ||= '' %>
 <li>
   <% unless facet.title.blank? %><b><%= facet.title %></b><% end %>
   <% value = params[:facets][facet.name] if params[:facets] && params[:facets].has_key?(facet.name) %>

data/app/views/faceted_search/facets/text/_selected.html.erb

@@ -1,3 +1,4 @@
+<% anchor ||= '' %>
 <% value = params[:facets][facet.name] if params[:facets] && params[:facets].has_key?(facet.name) %>
 <% unless value.blank? %>
   <%= render 'faceted_search/facets/facet-selected',

data/app/views/faceted_search/facets/tree/_all.html.erb

@@ -1,3 +1,4 @@
+<% anchor ||= '' %>
 <% if facet.values.any? %>
   <li>
     <% unless facet.title.blank? %><b><%= facet.title %></b><% end %>

data/lib/faceted_search/version.rb

@@ -1,3 +1,3 @@
 module FacetedSearch
-  VERSION = '3.5.7'
+  VERSION = '3.5.11'
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: faceted_search
 version: !ruby/object:Gem::Version
-  version: 3.5.7
+  version: 3.5.11
 platform: ruby
 authors:
 - Arnaud Levy
 - Sébastien Gaya
 - Sébastien Moulène
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2022-04-14 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.3.7
+signing_key:
 specification_version: 4
 summary: Faceted search with Active Record
 test_files: []