faceted_search 3.4.2 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b750942971f7fbdc2396c41aca5c1cc755591d7f
-  data.tar.gz: f98b703d9583718a542af64a9b1817e14652a1c7
+SHA256:
+  metadata.gz: 7ae2e8a71d88402a509dfb5ddd82c7de29a8c18ede7d0af7a9523aa8f2eb0482
+  data.tar.gz: cc36ce38efdd3f1f9737a08b7a3255743f3733453ef043b4d99f15878d8aa3b8
 SHA512:
-  metadata.gz: c4a78168975ef2706de57d3828c29c47e9595b62dc9dc00a4055a909641e4f87904c62837ae287cf26a9b64632392194c8a9d3ac8cb02a6cb5ff9eac1796010d
-  data.tar.gz: 62c726d3f857c6da83328c44077e78e0f7f75d65a2d75fa16f5fa900fd1e539866cad10f95300bc0d59a70ad2b96edc5e5c5c63bfdb9dce77ed997244afa78eb
+  metadata.gz: 531b6d13e425b5bb81a44c20086fa83194cca9a1477c0959f3cc2d1fc6a2f2cc3f49a82f72ff25a5157240fac7ce21cd5c8ee4477e629f6e10e553bca09762c0
+  data.tar.gz: a451b716afbf7726bb9437a947e23ec2a84acd440de7b48da2a71c8225195acba8620c3e8c6ce91ef4f8bfeb8cca52d648a0cd847ece7449f4d3b910d7112190

data/README.md

@@ -56,6 +56,15 @@ Create a model defining your facets:
         #     children.order(:title)
         #   }
         # }
+
+        # Other option, with searchable (SEO) categories
+        filter_with_full_tree :categories, {
+          habtm: true,
+          searchable: true,
+          path_pattern: Proc.new { |category_id|
+            Rails.application.routes.url_helpers.category_path(category_id)
+          }
+        }
       end
     end
 

data/app/models/faceted_search/facets.rb

@@ -19,10 +19,17 @@ module FacetedSearch
     end
 
     def path_for(facet, value)
-      p = path
-      list.each do |current_facet|
-        p += current_facet == facet ? current_facet.path_for(value)
-                                    : current_facet.path
+      if facet.path_pattern?
+        p = "#{facet.path_pattern.call(value)}#{path}"
+        list.each do |current_facet|
+          p += current_facet.path if current_facet != facet
+        end
+      else
+        p = path
+        list.each do |current_facet|
+          p += current_facet == facet ? current_facet.path_for(value)
+                                      : current_facet.path
+        end
       end
       p
     end
@@ -42,6 +49,10 @@ module FacetedSearch
       @model.table_name
     end
 
+    def has_params?
+      params.values.select(&:present?).any?
+    end
+
     protected
 
     def filter_with_text(value, options = {})

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

@@ -13,12 +13,24 @@ module FacetedSearch
       @options[:title] || name.to_s.humanize.titleize
     end
 
+    def searchable
+      @options[:searchable] || false
+    end
+
+    def path_pattern
+      @options[:path_pattern] || false
+    end
+
+    def path_pattern?
+      @options.has_key? :path_pattern
+    end
+
     def kind
       self.class.to_s
     end
 
     def path_for(value)
-      "&facets[#{name}]=#{value}"
+      path(value)
     end
 
     def add_scope(scope)

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

@@ -3,12 +3,14 @@ anchor ||= ''
 reset ||= 'Reset'
 %>
 
-<ul class="faceted__facets-selected list-inline">
-  <% facets.list.each do |facet| %>
-    <% partial = "#{facet.kind.underscore}/selected" %>
-    <%= render partial, facet: facet %>
-  <% end %>
-</ul>
+<% if facets.has_params? %>
+  <ul class="faceted__facets-selected list-inline">
+    <% facets.list.each do |facet| %>
+      <% partial = "#{facet.kind.underscore}/selected" %>
+      <%= render partial, facet: facet %>
+    <% end %>
+  </ul>
+<% end %>
 
 <ul class="faceted__facets list-unstyled">
   <% facets.list.each do |facet| %>
@@ -16,7 +18,7 @@ reset ||= 'Reset'
     <%= render partial, facet: facet, anchor: anchor %>
   <% end %>
   <li class="faceted__facet__reinit">
-    <a href="<%= facets.path%>">
+    <a href="<%= facets.path %>" rel="nofollow">
       <i class="fas fa-ban"></i>
       <%= reset %>
     </a>

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

@@ -0,0 +1,5 @@
+<% if searchable %>
+  <%= link_to display_value, path %>
+<% else %>
+  <%= link_to display_value, path, rel: 'nofollow' %>
+<% end %>

data/app/views/faceted_search/facets/_facet-selected.html.erb

@@ -1,6 +1,6 @@
 <li class=" faceted__facet-selected
             list-inline-item">
-  <%= link_to path, class: 'badge badge-light' do %>
+  <%= link_to path, class: 'badge badge-light', rel: 'nofollow' do %>
     <% unless title %>
       <span class="faceted__facet-selected__title d-none">
         <%= title %>

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

@@ -14,9 +14,12 @@
                   onclick="window.location.href='<%= path %>'"
                   <%= 'checked' if selected %>
                   />
-          <%= link_to name, path %>
+          <%= render 'faceted_search/link',
+                      display_value: name,
+                      path: path,
+                      searchable: facet.searchable %>
         </li>
       <% end %>
     </ul>
   </li>
-<% end %>
+<% end %>

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

@@ -4,9 +4,12 @@
     <ol class="faceted__facet__date list-unstyled">
       <% facet.values.each do |year| %>
         <li class="faceted__facet__date__value <%= 'faceted__facet__date__value--selected' if facet.value_selected?(year) %>">
-          <%= link_to year, facet.facets.path_for(facet, year) + anchor %>
+          <%= render 'faceted_search/link',
+                     display_value: year,
+                     path: facet.facets.path_for(facet, year) + anchor,
+                     searchable: facet.searchable %>
         </li>
       <% end %>
     </ol>
   </li>
-<% end %>
+<% end %>

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

@@ -1,11 +1,10 @@
 <% values.each do |value| %>
-  <%
-  display_value = facet.display_method.call(value)
-  identifier = value.send facet.find_by
-  path = facet.facets.path_for(facet, identifier)
-  %>
+  <% 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) %>">
-    <%= link_to display_value, path %>
+    <%= render 'faceted_search/link',
+                display_value: facet.display_method.call(value),
+                path: facet.facets.path_for(facet, identifier),
+                searchable: facet.searchable %>
     <% child_values = facet.values_with_parent(value.id) %>
     <% if child_values.any? %>
       <ol class="dd-list">

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

@@ -8,9 +8,12 @@
         display_value = facet.display_method.call(value)
         %>
         <li class="faceted__facet__list__value <%= 'faceted__facet__list__value--selected' if facet.value_selected?(identifier) %>">
-          <%= link_to display_value, facet.facets.path_for(facet, identifier) + anchor %>
+          <%= render 'faceted_search/link',
+                     display_value: display_value,
+                     path: facet.facets.path_for(facet, identifier) + anchor,
+                     searchable: facet.searchable %>
         </li>
       <% end %>
     </ol>
   </li>
-<% end %>
+<% end %>

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

@@ -12,7 +12,10 @@
                   onclick="window.location.href='<%= path %>'"
                   <%= 'checked' if selected %>
                   />
-          <%= link_to identifier, path %>
+          <%= render 'faceted_search/link',
+                     display_value: identifier,
+                     path: path,
+                     searchable: facet.searchable %>
         </li>
       <% end %>
     </ul>

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

@@ -9,7 +9,7 @@
         path = facet.facets.path_for(facet, identifier)
         %>
         <div class="faceted__facet__tree__back">
-          <%= link_to path do %>
+          <%= link_to path, rel: 'nofollow' do %>
             <i class="fas fa-arrow-left"></i> <%= display_value %>
           <% end %>
         </div>
@@ -23,10 +23,13 @@
           path = facet.facets.path_for(facet, identifier)
           %>
           <li class="faceted__facet__tree__value">
-            <%= link_to display_value, path %>
+            <%= render 'faceted_search/link',
+                       display_value: display_value,
+                       path: path,
+                       searchable: facet.searchable %>
           </li>
         <% end %>
       </ol>
     </div>
   </li>
-<% end %>
+<% end %>

data/lib/faceted_search/version.rb

@@ -1,3 +1,3 @@
 module FacetedSearch
-  VERSION = '3.4.2'
+  VERSION = '3.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faceted_search
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.5.0
 platform: ruby
 authors:
 - Arnaud Levy
@@ -10,22 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: font-awesome-sass
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +140,7 @@ files:
 - app/models/faceted_search/facets/text.rb
 - app/models/faceted_search/facets/tree.rb
 - app/views/faceted_search/_facets.html.erb
+- app/views/faceted_search/_link.html.erb
 - app/views/faceted_search/facets/_facet-selected.html.erb
 - app/views/faceted_search/facets/checkboxes/_all.html.erb
 - app/views/faceted_search/facets/checkboxes/_selected.html.erb
@@ -175,8 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Faceted search with Active Record