faceted_search 3.3.5 → 3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8f415cc47470632fb1cf5e0938f5ef35878247d3
-  data.tar.gz: 46b2b2cc24d48013a2c8301292a816cf5664cd65
+SHA256:
+  metadata.gz: 750a45430b499e2639fa90170f42bc68290f5a3e6386291a53c01d6b9e050582
+  data.tar.gz: 510369bf8dc3e23b04a5d1c372ed4cb3308c41a06428925626adb1955b616034
 SHA512:
-  metadata.gz: bffff280cf37ca1a0b679ee20c5aeb4d2ceaf183ce2f48b65c15c9ddff254c7ad6f2f7112c724e4f570900fb47e7e149b8162f6303243ab320851cd02679f387
-  data.tar.gz: 3162837059e941f350e04914f205266c6e7047f8c28f4f741d5b143ae0629a7fbd429bcf0c1fa4c1a3cd48f110a1b0bccc1e5fda3b30e201171828f8f3db223b
+  metadata.gz: c8fa78795b10070bce8f247cdab70a9b5c3b664e34d07507981d2d7c84b7e1d7a4ec4591d2254163359b83919818ea28bb93157d191cf0d47baf7c9bc17f3cb7
+  data.tar.gz: f99a7754137baa2fbd7491b643f0604d65ef44ad5875fa5f8376cb4ee3fecab9399d6e1c405c2370c251ee8272c603295acad1d076641ed34b6af3b18c3b1169

data/app/models/faceted_search/facets.rb

@@ -28,11 +28,14 @@ module FacetedSearch
     end
 
     def results
-      scope = @model
-      list.each do |facet|
-        scope = facet.add_scope(scope)
+      unless @results
+        scope = @model
+        list.each do |facet|
+          scope = facet.add_scope(scope)
+        end
+        @results = scope.distinct
       end
-      scope.distinct
+      @results
     end
 
     def model_table_name

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

@@ -2,9 +2,18 @@
 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>
+
 <ul class="faceted__facets list-unstyled">
   <% facets.list.each do |facet| %>
-    <%= render facet.kind.underscore, facet: facet, anchor: anchor %>
+    <% partial = "#{facet.kind.underscore}/all" %>
+    <%= render partial, facet: facet, anchor: anchor %>
   <% end %>
   <li class="faceted__facet__reinit">
     <a href="<%= facets.path%>">

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

@@ -0,0 +1,15 @@
+<li class=" faceted__facet-selected
+            list-inline-item
+            badge
+            badge-light">
+  <%= link_to path do %>
+    <% unless title %>
+      <span class="faceted__facet-selected__title d-none">
+        <%= title %>
+      </span>
+    <% end %>
+    <span class="faceted__facet-selected__value">
+      <%= value %>
+    </span>
+  <% end %>
+</li>

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

@@ -0,0 +1,12 @@
+<% if facet.values.any? %>
+  <% facet.values.each do |value| %>
+    <% identifier = value.send facet.find_by %>
+    <% if facet.value_selected?(identifier) %>
+      <% display_value = facet.display_method.call(value) %>
+      <%= render 'faceted_search/facets/facet-selected',
+                  title: facet.title,
+                  value: display_value,
+                  path: facet.facets.path_for(facet, identifier) %>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,10 @@
+<% if facet.values.any? %>
+  <% facet.values.each do |year| %>
+    <% if facet.value_selected?(year) %>
+      <%= render  'faceted_search/facets/facet-selected',
+                  title: facet.title,
+                  value: year,
+                  path: facet.facets.path_for(facet, year) %>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,5 @@
+<% if facet.values.any? %>
+  <%= render  'faceted_search/facets/full_tree/values-selected',
+              values: facet.values_with_parent(nil),
+              facet: facet %>
+<% end %>

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

@@ -0,0 +1,15 @@
+<% values.each do |value| %>
+  <% identifier = value.send facet.find_by %>
+  <% if facet.value_selected?(identifier) %>
+    <%= render 'faceted_search/facets/facet-selected',
+                title: facet.title,
+                value: facet.display_method.call(value),
+                path: facet.facets.path_for(facet, identifier) %>
+  <% end %>
+  <% child_values = facet.values_with_parent(value.id) %>
+  <% if child_values.any? %>
+    <%= render  'faceted_search/facets/full_tree/values-selected',
+                values: child_values,
+                facet: facet %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,12 @@
+<% if facet.values.any? %>
+  <% facet.values.each do |value| %>
+    <% identifier = value.send facet.find_by %>
+    <% if facet.value_selected?(identifier) %>
+      <% display_value = facet.display_method.call(value) %>
+      <%= render 'faceted_search/facets/facet-selected',
+                  title: facet.title,
+                  value: display_value,
+                  path: facet.facets.path_for(facet, identifier) %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/faceted_search/facets/text/_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/lib/faceted_search/version.rb

@@ -1,3 +1,3 @@
 module FacetedSearch
-  VERSION = '3.3.5'
+  VERSION = '3.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faceted_search
 version: !ruby/object:Gem::Version
-  version: 3.3.5
+  version: '3.4'
 platform: ruby
 authors:
 - Arnaud Levy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2020-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -133,14 +133,23 @@ 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/facets/_checkboxes.html.erb
-- app/views/faceted_search/facets/_date.html.erb
-- app/views/faceted_search/facets/_full_tree.html.erb
-- app/views/faceted_search/facets/_list.html.erb
-- app/views/faceted_search/facets/_primitive_list.html.erb
-- app/views/faceted_search/facets/_text.html.erb
-- app/views/faceted_search/facets/_tree.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
+- app/views/faceted_search/facets/date/_all.html.erb
+- app/views/faceted_search/facets/date/_selected.html.erb
+- app/views/faceted_search/facets/full_tree/_all.html.erb
+- app/views/faceted_search/facets/full_tree/_selected.html.erb
+- app/views/faceted_search/facets/full_tree/_values-selected.html.erb
 - app/views/faceted_search/facets/full_tree/_values.html.erb
+- app/views/faceted_search/facets/list/_all.html.erb
+- 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/text/_all.html.erb
+- app/views/faceted_search/facets/text/_selected.html.erb
+- app/views/faceted_search/facets/tree/_all.html.erb
+- app/views/faceted_search/facets/tree/_selected.html.erb
 - lib/faceted_search.rb
 - lib/faceted_search/engine.rb
 - lib/faceted_search/railtie.rb
@@ -165,8 +174,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.0.3
 signing_key: 
 specification_version: 4
 summary: Faceted search with Active Record