faceted_search 3.4.5 → 3.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6770117b9a14dfc64240d042bfc17cea9e3b83eddd2cf89c125aecf9399a601
-  data.tar.gz: 1be079b99086cb78c98fa107526c5f28dbd5b248e72d041e56ba83f583bb7971
+  metadata.gz: '04106970c4095477714e7d1a968b62ed26b5d0bd155995c1bb90570fab2e7534'
+  data.tar.gz: 23d62e43c40553664cc941f8e5ec80090c5a7e5a39be72e5c06368427ff1c1cb
 SHA512:
-  metadata.gz: c6422333f3c01441c3cc8421ccf5b76494afcf511d4be8d32b4d328a8a88e02eac59675764a51c2d33a77e297320815f67bb553c36185ecadf5f2535ae350041
-  data.tar.gz: 61b88b0abb2bde9c968aac52b29d0bee547669d0f948817b8a92aa0fe42ca5853fefdeb14b4b3ec35909c4e459e198a18963b4b51a447055b551a9baf9ea7550
+  metadata.gz: cfd6cd87a2b7ba8be6ed284337169a9ea487aba35d5f0ffdbf3b0d662c78b0d05aa611b11e75ee9171030929a63fa4fd1a60e24f7e044ee25c8fb37b5bf2bff1
+  data.tar.gz: a32ca6d1a6c37bd1b84b246b824415bcae8ec712878606f77f115de4a55cf40341afca91273ba2b5c4e1c269114688a1d61e300b85853017c0ef31030012c1f8

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,18 @@ 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|
+          next if current_facet.path_pattern?
+          p += current_facet == facet ? current_facet.path_for(value)
+                                      : current_facet.path
+        end
       end
       p
     end

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

@@ -13,6 +13,18 @@ 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

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

@@ -28,7 +28,7 @@ module FacetedSearch
     def values
       unless @values
         joined_table = facets.model_table_name.to_sym
-        @values = source.all.joins(joined_table).where(joined_table => { id: facets.model }).distinct
+        @values = source.all.joins(joined_table).where(joined_table => { id: facets.results }).distinct
       end
       @values
     end

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

@@ -6,7 +6,10 @@ reset ||= 'Reset'
 <% if facets.has_params? %>
   <ul class="faceted__facets-selected list-inline">
     <% facets.list.each do |facet| %>
-      <% partial = "#{facet.kind.underscore}/selected" %>
+      <%
+      next if facet.path_pattern?
+      partial = "#{facet.kind.underscore}/selected"
+      %>
       <%= render partial, facet: facet %>
     <% end %>
   </ul>
@@ -18,7 +21,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.5'
+  VERSION = '3.5.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faceted_search
 version: !ruby/object:Gem::Version
-  version: 3.4.5
+  version: 3.5.3
 platform: ruby
 authors:
 - Arnaud Levy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -140,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