faceted_search 3.5.3 → 3.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '04106970c4095477714e7d1a968b62ed26b5d0bd155995c1bb90570fab2e7534'
-  data.tar.gz: 23d62e43c40553664cc941f8e5ec80090c5a7e5a39be72e5c06368427ff1c1cb
+  metadata.gz: f9c031c6042e6795df7c7465fba26d1ff6e8d8ad3c7f3db94859febdcf3df6e0
+  data.tar.gz: c534ffb91303aaa601e530bd2271bb36dcef60ec01d04ba97ee74645f8968e86
 SHA512:
-  metadata.gz: cfd6cd87a2b7ba8be6ed284337169a9ea487aba35d5f0ffdbf3b0d662c78b0d05aa611b11e75ee9171030929a63fa4fd1a60e24f7e044ee25c8fb37b5bf2bff1
-  data.tar.gz: a32ca6d1a6c37bd1b84b246b824415bcae8ec712878606f77f115de4a55cf40341afca91273ba2b5c4e1c269114688a1d61e300b85853017c0ef31030012c1f8
+  metadata.gz: f062d6086f4608816429ad31f69cf706f7a7868e486183a3c42f7c1d546190c8142d8dcc6b2cb3fb91901b0f26f64cf49c848a3c5de37407d7cd9150ab0ca737
+  data.tar.gz: 90669a44d5ba16929296b22854a80446ddb88cde6ea2df4e38e96495e25ab61b3e7b38788fefce07ce78d5a55162bf11b9cef99106616f6bd9388da228f68b13

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

@@ -39,7 +39,7 @@ module FacetedSearch
       unless @results
         scope = @model
         list.each do |facet|
-          scope = facet.add_scope(scope)
+          scope = facet.add_scope(scope) unless facet.ignore_scope?
         end
         @results = scope.distinct
       end
@@ -84,6 +84,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/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/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,7 +7,7 @@ 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 %>

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) %>
+<% 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/lib/faceted_search/version.rb

@@ -1,3 +1,3 @@
 module FacetedSearch
-  VERSION = '3.5.3'
+  VERSION = '3.5.4'
 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.4
 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