faceted_search 3.5.4 → 3.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9c031c6042e6795df7c7465fba26d1ff6e8d8ad3c7f3db94859febdcf3df6e0
-  data.tar.gz: c534ffb91303aaa601e530bd2271bb36dcef60ec01d04ba97ee74645f8968e86
+  metadata.gz: f4d977f19f2132c5b2bd915b5e31b8994bc3a9cfea14e437abd71335e9ade21d
+  data.tar.gz: ee426d8c2bc8db64d11e00ec0200e292c51fbd7d056267a3389ff4ad44d75f38
 SHA512:
-  metadata.gz: f062d6086f4608816429ad31f69cf706f7a7868e486183a3c42f7c1d546190c8142d8dcc6b2cb3fb91901b0f26f64cf49c848a3c5de37407d7cd9150ab0ca737
-  data.tar.gz: 90669a44d5ba16929296b22854a80446ddb88cde6ea2df4e38e96495e25ab61b3e7b38788fefce07ce78d5a55162bf11b9cef99106616f6bd9388da228f68b13
+  metadata.gz: f73ede5472a4581e99a3a0fa8b54bd65221cc2cc02ab24d12d692ee89570aa20e57dab1849f1f0b59cc3d37b27c7037cb0b4e6d21abc2f7f33f2e0253e29cf3b
+  data.tar.gz: c38073518e0da2178cd5a4d7e431fb315a879b8e9446d12eedf80ba4c2318b06aced9541aa8381e073e16058656de81286c6ae638f24f1a532c44436f9121961

data/app/models/faceted_search/facets.rb

@@ -36,14 +36,16 @@ module FacetedSearch
     end
 
     def results
-      unless @results
-        scope = @model
-        list.each do |facet|
-          scope = facet.add_scope(scope) unless facet.ignore_scope?
-        end
-        @results = scope.distinct
+      @results ||= results_except []
+    end
+
+    def results_except(*facet_names)
+      scope = @model
+      list.each do |facet|
+        next if facet_names.include?(facet.name) || facet.ignore_scope?
+        scope = facet.add_scope(scope)
       end
-      @results
+      scope.distinct
     end
 
     def model_table_name
@@ -51,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/models/faceted_search/facets/date.rb

@@ -2,7 +2,14 @@ module FacetedSearch
   class Facets::Date < Facets::DefaultList
 
     def source
-      @options[:source] || @facets.model.send(:all).pluck(name).compact.map(&:year).uniq.sort
+      @source ||= begin
+        if @options[:source].present?
+          @options[:source]
+        else
+          results = params_array.blank? ? facets.results : facets.results_except(@name)
+          results.send(:all).pluck(name).compact.map(&:year).uniq.sort
+        end
+      end
     end
 
     def order
@@ -19,11 +26,10 @@ module FacetedSearch
     end
 
     def values
-      unless @values
-        @values = source
-        @values.reverse! unless order == :asc
+      @values ||= begin
+        values = (source | params_array.map(&:to_i)).sort
+        order == :asc ? values : values.reverse
       end
-      @values
     end
   end
 end

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

@@ -26,11 +26,12 @@ module FacetedSearch
     # Show all values that have corresponding results with the current params.
     # This is a regular SQL inner join.
     def values
-      unless @values
+      @values ||= begin
         joined_table = facets.model_table_name.to_sym
-        @values = source.all.joins(joined_table).where(joined_table => { id: facets.results }).distinct
+        results = params_array.blank? ? facets.results : facets.results_except(@name)
+        values = source.all.joins(joined_table)
+        values.where(joined_table => { id: results }).or(values.where(id: params_array)).distinct
       end
-      @values
     end
 
     def value_selected?(value)

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

@@ -2,6 +2,14 @@ module FacetedSearch
   class Facets::PrimitiveList < Facets::DefaultList
 
     def source
+      @source ||= begin
+        if @options[:source].present?
+          @options[:source]
+        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
 
@@ -22,11 +30,10 @@ module FacetedSearch
     end
 
     def values
-      unless @values
-        @values = source.pluck(field).uniq.reject(&:empty?).sort
-        @values.reverse! unless order == :asc
+      @values ||= begin
+        values = (source.pluck(field).uniq.reject(&:blank?) | params_array.compact).sort
+        order == :asc ? values : values.reverse
       end
-      @values
     end
   end
 end

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

@@ -10,7 +10,7 @@ reset ||= 'Reset'
       next if facet.hide_in_selected?
       partial = "#{facet.kind.underscore}/selected"
       %>
-      <%= render partial, facet: facet %>
+      <%= render partial, facet: facet, anchor: anchor %>
     <% end %>
   </ul>
 <% end %>

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 %>
@@ -6,7 +7,7 @@
       <%= render 'faceted_search/facets/facet-selected',
                   title: facet.title,
                   value: display_value,
-                  path: facet.facets.path_for(facet, identifier) %>
+                  path: facet.facets.path_for(facet, identifier) + anchor %>
     <% end %>
   <% end %>
 <% end %>

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,10 +1,11 @@
+<% anchor ||= '' %>
 <% if facet.values.any? %>
   <% facet.values.each do |year| %>
     <% if facet.value_selected?(year) %>
       <%= render  'faceted_search/facets/facet-selected',
                   title: facet.title,
                   value: year,
-                  path: facet.facets.path_for(facet, year) %>
+                  path: facet.facets.path_for(facet, year) + anchor %>
     <% end %>
   <% end %>
 <% end %>

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

@@ -1,10 +1,11 @@
+<% anchor ||= '' %>
 <% if facet.values.any? %>
   <li>
     <% unless facet.title.blank? %><b><%= facet.title %></b><% end %>
     <div class="static-nestable-list">
       <div class="dd">
         <ol class="faceted__facet__full_tree list-unstyled dd-list">
-          <%= render 'faceted_search/facets/full_tree/values', values: facet.values_with_parent(nil), facet: facet %>
+          <%= render 'faceted_search/facets/full_tree/values', values: facet.values_with_parent(nil), facet: facet, anchor: anchor %>
         </ol>
       </div>
     </div>

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

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

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

@@ -1,10 +1,11 @@
+<% anchor ||= '' %>
 <% values.each do |value| %>
   <% identifier = value.send facet.find_by %>
   <% if facet.value_selected?(identifier) %>
     <%= render 'faceted_search/facets/facet-selected',
                 title: facet.title,
                 value: facet.display_method.call(value),
-                path: facet.facets.path_for(facet, identifier) %>
+                path: facet.facets.path_for(facet, identifier) + anchor %>
   <% end %>
   <% child_values = facet.values_with_parent(value.id) %>
   <% if child_values.any? %>

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

@@ -1,14 +1,15 @@
+<% 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) %>">
     <%= render 'faceted_search/link',
                 display_value: facet.display_method.call(value),
-                path: facet.facets.path_for(facet, identifier),
+                path: facet.facets.path_for(facet, identifier) + anchor,
                 searchable: facet.searchable %>
     <% child_values = facet.values_with_parent(value.id) %>
     <% if child_values.any? %>
       <ol class="dd-list">
-        <%= render 'faceted_search/facets/full_tree/values', values: child_values, facet: facet %>
+        <%= render 'faceted_search/facets/full_tree/values', values: child_values, facet: facet, anchor: anchor %>
       </ol>
     <% end %>
   </li>

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 %>
@@ -6,7 +7,7 @@
       <%= render 'faceted_search/facets/facet-selected',
                   title: facet.title,
                   value: display_value,
-                  path: facet.facets.path_for(facet, identifier) %>
+                  path: facet.facets.path_for(facet, identifier) + anchor %>
     <% end %>
   <% end %>
 <% end %>

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,7 +1,8 @@
+<% anchor ||= '' %>
 <% value = params[:facets][facet.name] if params[:facets] && params[:facets].has_key?(facet.name) %>
 <% unless value.blank? %>
   <%= render 'faceted_search/facets/facet-selected',
               title: facet.title,
               value: value,
-              path: facet.facets.path_for(facet, nil) %>
+              path: facet.facets.path_for(facet, nil) + anchor %>
 <% end %>

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,7 +1,8 @@
+<% anchor ||= '' %>
 <% value = params[:facets][facet.name] if params[:facets] && params[:facets].has_key?(facet.name) %>
 <% unless value.blank? %>
   <%= render 'faceted_search/facets/facet-selected',
               title: facet.title,
               value: value,
-              path: facet.facets.path_for(facet, nil) %>
+              path: facet.facets.path_for(facet, nil) + anchor %>
 <% end %>

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 %>
@@ -6,7 +7,7 @@
         <%
         display_value = facet.display_method.call(facet.selected_object)
         identifier = facet.selected_object.send facet.find_by
-        path = facet.facets.path_for(facet, identifier)
+        path = facet.facets.path_for(facet, identifier) + anchor
         %>
         <div class="faceted__facet__tree__back">
           <%= link_to path, rel: 'nofollow' do %>
@@ -20,7 +21,7 @@
           <%
           display_value = facet.display_method.call(value)
           identifier = value.send facet.find_by
-          path = facet.facets.path_for(facet, identifier)
+          path = facet.facets.path_for(facet, identifier) + anchor
           %>
           <li class="faceted__facet__tree__value">
             <%= render 'faceted_search/link',

data/lib/faceted_search/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faceted_search
 version: !ruby/object:Gem::Version
-  version: 3.5.4
+  version: 3.5.10
 platform: ruby
 authors:
 - Arnaud Levy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails