faceted_search 3.4.3 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 314f7d56f3cee1eddd975b931bf6597a784260d705213b7f29d203729e19a72d
-  data.tar.gz: 99322fc2a4ffe57cec1616676d31c741b5b55f4cdbb77fedf8c9b7043f2e7709
+  metadata.gz: bfe8502d648871cd220f592bdc95bc3f954ec25c0ac7efb9ed752bcbcb9e3c94
+  data.tar.gz: 34b17bd5ec9c4578a5940171c0fdcf37448856b82ecdba29f2c5d7fbc7a3af87
 SHA512:
-  metadata.gz: f5733de35afb7c21be39278fdfca4ad9673ad0d25a4b4e2b02a1e6df288132be23cd2def72c2185412442c2b27fd33f7408d498ce575f17ba6e5505f43f82b62
-  data.tar.gz: 014defbd9336684eef1c2be946a820355fd01daf63b0f0fb9b91790e21b2d279feaf4745b1d454d1161990b93be73d26a49e5e5a64a7a73a978015122e0f5ec0
+  metadata.gz: '09e691bd306610760539e6f252302b1d6a2da4fea4935cba36d3d01833a092d328e73f7290d376d42243cbf7c6f230d1c5dcea17c4a88663e963481920d6d611'
+  data.tar.gz: 050f629a5708c6fead7af49e8e3a655451b5fe0a4d15015f090a46f2749a2323e4864805dd008a468f92ff2a8bcea13f8cdb66d6434e9d7d5556d0a632184aee

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,11 +19,19 @@ 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.delete_suffix!(path) if p.end_with?(path)
       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/views/faceted_search/_facets.html.erb

@@ -18,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.3'
+  VERSION = '3.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faceted_search
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.5.1
 platform: ruby
 authors:
 - Arnaud Levy
@@ -10,22 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-27 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,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Faceted search with Active Record