faceted_search 3.5.3 → 3.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '04106970c4095477714e7d1a968b62ed26b5d0bd155995c1bb90570fab2e7534'
-  data.tar.gz: 23d62e43c40553664cc941f8e5ec80090c5a7e5a39be72e5c06368427ff1c1cb
+  metadata.gz: 265734657b1546de2a80bb631adf099b8758bedd7baf5f4af71a3c266cbf2547
+  data.tar.gz: 66f75f2e72f13bb7bb67b94d613c4597a866e8cba1c1f2dc789cbae542f851a8
 SHA512:
-  metadata.gz: cfd6cd87a2b7ba8be6ed284337169a9ea487aba35d5f0ffdbf3b0d662c78b0d05aa611b11e75ee9171030929a63fa4fd1a60e24f7e044ee25c8fb37b5bf2bff1
-  data.tar.gz: a32ca6d1a6c37bd1b84b246b824415bcae8ec712878606f77f115de4a55cf40341afca91273ba2b5c4e1c269114688a1d61e300b85853017c0ef31030012c1f8
+  metadata.gz: de25113088db0880b13fa1aef84d86b03fe88572e54f334c7b2c7bcff4e6831a87d253c1cbb14f9483167ca5edc2ad041e34dbb8773aff732fd080ddc56fff58
+  data.tar.gz: e687d54f22dbb7d1b00a897268b07bb5a51de83a7980dbb1f190df105c381733f1f907031490b9da6cf3bd004867f45b9cc70dd42efb3c59cf251e084838b22d

data/README.md

@@ -65,6 +65,15 @@ Create a model defining your facets:
             Rails.application.routes.url_helpers.category_path(category_id)
           }
         }
+
+        # Filter with range input
+        filter_with_range :distance, {
+          min: 10,
+          max: 200,
+          step: 10,
+          default_value: 50,
+          hide_in_selected: true
+        }
       end
     end
 

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)
-        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
@@ -84,6 +91,10 @@ module FacetedSearch
       add_facet FullTree, value, options
     end
 
+    def filter_with_range(value, options = {})
+      add_facet Range, value, options
+    end
+
     def params_for(value)
       @params[value] if @params.has_key? value
     end

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.rb

@@ -25,6 +25,14 @@ module FacetedSearch
       @options.has_key? :path_pattern
     end
 
+    def ignore_scope?
+      @options[:ignore_scope] || false
+    end
+
+    def hide_in_selected?
+      @options[:hide_in_selected] || path_pattern?
+    end
+
     def kind
       self.class.to_s
     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/models/faceted_search/facets/range.rb

@@ -0,0 +1,24 @@
+module FacetedSearch
+  class Facets::Range < Facets::Default
+    def min
+      @options[:min] || 0
+    end
+
+    def max
+      @options[:max] || 100
+    end
+
+    def step
+      @options[:step] || 1
+    end
+
+    def default_value
+      @options[:default_value] || min
+    end
+
+    def add_scope(scope)
+      return scope if params.blank?
+      scope.where("#{facets.model_table_name}.#{name}" => params)
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 module FacetedSearch
   class Facets::Text < Facets::Default
+    include ActiveRecord::Sanitization
 
     def placeholder
       @options[:placeholder]
@@ -7,7 +8,7 @@ module FacetedSearch
 
     def add_scope(scope)
       return scope if params.blank?
-      scope.where("#{facets.model_table_name}.#{name} ILIKE ?", "%#{params}%")
+      scope.where("#{facets.model_table_name}.#{name} ILIKE ?", "%#{self.class.sanitize_sql_like(params)}%")
     end
   end
 end

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

@@ -7,10 +7,10 @@ reset ||= 'Reset'
   <ul class="faceted__facets-selected list-inline">
     <% facets.list.each do |facet| %>
       <%
-      next if facet.path_pattern?
+      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/_selected.html.erb

@@ -6,7 +6,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/_selected.html.erb

@@ -4,7 +4,7 @@
       <%= 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

@@ -4,7 +4,7 @@
     <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,6 @@
 <% 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

@@ -4,7 +4,7 @@
     <%= 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

@@ -3,12 +3,12 @@
   <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/_selected.html.erb

@@ -6,7 +6,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/range/_all.html.erb

@@ -0,0 +1,25 @@
+<li>
+  <% unless facet.title.blank? %><b><%= facet.title %></b><% end %>
+  <%
+  value = params[:facets][facet.name] if params.dig(:facets, facet.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 %>]"
+              value="<%= f.params %>" />
+    <% end %>
+    <input  type="range"
+            name="facets[<%= facet.name %>]"
+            min="<%= facet.min %>"
+            max="<%= facet.max %>"
+            step="<%= facet.step %>"
+            value="<%= value %>"
+            class="form-control-range" />
+    <input  type="submit"
+            class="btn btn-light"
+            value="OK" />
+  </form>
+</li>

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

@@ -0,0 +1,7 @@
+<% 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) + anchor %>
+<% end %>

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

@@ -3,8 +3,7 @@
   <% value = params[:facets][facet.name] if params[:facets] && params[:facets].has_key?(facet.name) %>
   <form action="<%= anchor %>" class="faceted__facet__text form-inline">
     <% facet.facets.list.each do |f| %>
-      <% next if f == facet %>
-      <% next if f.params.blank? %>
+      <% next if f == facet || f.params.blank? || f.path_pattern? %>
       <input  type="hidden"
               name="facets[<%= f.name %>]"
               value="<%= f.params %>" />

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

@@ -3,5 +3,5 @@
   <%= 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

@@ -6,7 +6,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 +20,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.3'
+  VERSION = '3.5.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faceted_search
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 3.5.9
 platform: ruby
 authors:
 - Arnaud Levy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -137,6 +137,7 @@ files:
 - app/models/faceted_search/facets/full_tree.rb
 - app/models/faceted_search/facets/list.rb
 - app/models/faceted_search/facets/primitive_list.rb
+- app/models/faceted_search/facets/range.rb
 - app/models/faceted_search/facets/text.rb
 - app/models/faceted_search/facets/tree.rb
 - app/views/faceted_search/_facets.html.erb
@@ -154,6 +155,8 @@ files:
 - app/views/faceted_search/facets/list/_selected.html.erb
 - app/views/faceted_search/facets/primitive_list/_all.html.erb
 - app/views/faceted_search/facets/primitive_list/_selected.html.erb
+- app/views/faceted_search/facets/range/_all.html.erb
+- app/views/faceted_search/facets/range/_selected.html.erb
 - app/views/faceted_search/facets/text/_all.html.erb
 - app/views/faceted_search/facets/text/_selected.html.erb
 - app/views/faceted_search/facets/tree/_all.html.erb