faceted_search 3.5.14 → 3.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 520ee5f81cdb24604ce3fd089e7dae9bc2314be94af1ec6680752f7f34b65a70
-  data.tar.gz: 685e1ab85a7642f65229fedb80b8af52c40eac12b29ade22f752e2d71cc3ba89
+  metadata.gz: 6cd10cd89d2ea082ea27d55ffdc5063487d03c9682cf7bfcb05b1609244738fc
+  data.tar.gz: adf343649365ab7d49c763362db083dc4d9a5420b793c41e12d061fc58fc8eb7
 SHA512:
-  metadata.gz: c116e4a7e83f6806483f9f30b4524123173d7dffd70be045f5f8ce5930c280dc1889544307559b7e10617860798f577052d4017bb4a336e6d23710e6e476da2d
-  data.tar.gz: 32bfd0603e52e9e93f7ceadcb49e1ed5dc29c9ebf6986fd9e39f7afe8f005dff5ef5960595ce69f4ed3e351961663e8ab9aecfa7c43cca44232b1fa0df09824d
+  metadata.gz: 6e207f0b79d30adea678c56fe99d5b337b9d0f8c73043dd809ed7ad20187dbacd2073155579bff89915be5bb1d2dd57c9547a3dfe7e588c74e27c0b109e70bab
+  data.tar.gz: 802f00e9a008d836e5cd341d524aedc23e67fe6f31fa92574da40b663484529f723eb94e2f81c2d23e17361e81835f55c5955ed60d669959d7e0d962dffbb213

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

@@ -6,7 +6,7 @@ module FacetedSearch
         if @options[:source].present?
           @options[:source]
         else
-          results = params_array.blank? ? facets.results : facets.results_except(@name)
+          results = params_array.blank? ? facets.results : facets.results_except(param_name)
           results.send(:all).pluck(name).compact.map(&:year).uniq.sort
         end
       end

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

@@ -33,6 +33,10 @@ module FacetedSearch
       @options[:hide_in_selected] || path_pattern?
     end
 
+    def param_name
+      @options[:param_name] || name
+    end
+
     def kind
       self.class.to_s
     end
@@ -48,7 +52,7 @@ module FacetedSearch
 
     def path(custom_params = @params)
       return '' if custom_params.blank?
-      "&facets[#{name}]=#{custom_params}"
+      "&facets[#{param_name}]=#{custom_params}"
     end
 
     def to_s

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

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

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

@@ -6,7 +6,7 @@ module FacetedSearch
         if @options[:source].present?
           @options[:source].where("#{field} IS NOT NULL")
         else
-          results = params_array.compact.blank? ? facets.results : facets.results_except(@name)
+          results = params_array.compact.blank? ? facets.results : facets.results_except(param_name)
           results.send(:all).where("#{field} IS NOT NULL")
         end
       end

data/app/models/faceted_search/facets.rb

@@ -39,10 +39,10 @@ module FacetedSearch
       @results ||= results_except []
     end
 
-    def results_except(*facet_names)
+    def results_except(*facet_param_names)
       scope = @model
       list.each do |facet|
-        next if facet_names.include?(facet.name) || facet.ignore_scope?
+        next if facet_param_names.include?(facet.param_name) || facet.ignore_scope?
         scope = facet.add_scope(scope)
       end
       scope.distinct
@@ -95,12 +95,13 @@ module FacetedSearch
       add_facet Range, value, options
     end
 
-    def params_for(value)
-      @params[value] if @params.has_key? value
+    def params_for(value, options)
+      param_name = (options[:param_name] || value).to_sym
+      @params[param_name] if @params.has_key? param_name
     end
 
     def add_facet(kind, value, options)
-      @list << kind.new(value, params_for(value), self, options)
+      @list << kind.new(value, params_for(value, options), self, options)
     end
   end
 end

data/app/views/faceted_search/_facets.html.erb

@@ -20,10 +20,12 @@ reset ||= 'Reset'
     <% partial = "#{facet.kind.underscore}/all" %>
     <%= render partial, facet: facet, anchor: anchor %>
   <% end %>
-  <li class="faceted__facet__reinit">
-    <a href="<%= facets.path %>" rel="nofollow">
-      <i class="fas fa-ban"></i>
-      <%= reset %>
-    </a>
-  </li>
+  <% if facets.has_params? %>
+    <li class="faceted__facet__reinit">
+      <a href="<%= facets.path %>" rel="nofollow">
+        <i class="fas fa-ban"></i>
+        <%= reset %>
+      </a>
+    </li>
+  <% end %>
 </ul>

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

@@ -2,18 +2,18 @@
 <li>
   <% unless facet.title.blank? %><b><%= facet.title %></b><% end %>
   <%
-  value = params[:facets][facet.name] if params.dig(:facets, facet.name).present?
+  value = params[:facets][facet.param_name] if params.dig(:facets, facet.param_name).present?
   value ||= facet.default_value
   %>
   <form action="<%= anchor %>" class="faceted__facet__text form-inline">
     <% facet.facets.list.each do |f| %>
       <% next if f == facet || f.params.blank? || f.path_pattern? %>
       <input  type="hidden"
-              name="facets[<%= f.name %>]"
+              name="facets[<%= f.param_name %>]"
               value="<%= f.params %>" />
     <% end %>
     <input  type="range"
-            name="facets[<%= facet.name %>]"
+            name="facets[<%= facet.param_name %>]"
             min="<%= facet.min %>"
             max="<%= facet.max %>"
             step="<%= facet.step %>"

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

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

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

@@ -1,16 +1,16 @@
 <% 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) %>
+  <% value = params[:facets][facet.param_name] if params[:facets] && params[:facets].has_key?(facet.param_name) %>
   <form action="<%= anchor %>" class="faceted__facet__text form-inline">
     <% facet.facets.list.each do |f| %>
       <% next if f == facet || f.params.blank? || f.path_pattern? %>
       <input  type="hidden"
-              name="facets[<%= f.name %>]"
+              name="facets[<%= f.param_name %>]"
               value="<%= f.params %>" />
     <% end %>
     <input  type="search"
-            name="facets[<%= facet.name %>]"
+            name="facets[<%= facet.param_name %>]"
             placeholder="<%= facet.placeholder %>"
             value="<%= value %>"
             class="form-control" />

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

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

data/lib/faceted_search/version.rb

@@ -1,3 +1,3 @@
 module FacetedSearch
-  VERSION = '3.5.14'
+  VERSION = '3.5.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faceted_search
 version: !ruby/object:Gem::Version
-  version: 3.5.14
+  version: 3.5.16
 platform: ruby
 authors:
 - Arnaud Levy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Faceted search with Active Record