faceted_search 3.3.5 → 3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 8f415cc47470632fb1cf5e0938f5ef35878247d3
4
- data.tar.gz: 46b2b2cc24d48013a2c8301292a816cf5664cd65
2
+ SHA256:
3
+ metadata.gz: 750a45430b499e2639fa90170f42bc68290f5a3e6386291a53c01d6b9e050582
4
+ data.tar.gz: 510369bf8dc3e23b04a5d1c372ed4cb3308c41a06428925626adb1955b616034
5
5
  SHA512:
6
- metadata.gz: bffff280cf37ca1a0b679ee20c5aeb4d2ceaf183ce2f48b65c15c9ddff254c7ad6f2f7112c724e4f570900fb47e7e149b8162f6303243ab320851cd02679f387
7
- data.tar.gz: 3162837059e941f350e04914f205266c6e7047f8c28f4f741d5b143ae0629a7fbd429bcf0c1fa4c1a3cd48f110a1b0bccc1e5fda3b30e201171828f8f3db223b
6
+ metadata.gz: c8fa78795b10070bce8f247cdab70a9b5c3b664e34d07507981d2d7c84b7e1d7a4ec4591d2254163359b83919818ea28bb93157d191cf0d47baf7c9bc17f3cb7
7
+ data.tar.gz: f99a7754137baa2fbd7491b643f0604d65ef44ad5875fa5f8376cb4ee3fecab9399d6e1c405c2370c251ee8272c603295acad1d076641ed34b6af3b18c3b1169
@@ -28,11 +28,14 @@ module FacetedSearch
28
28
  end
29
29
 
30
30
  def results
31
- scope = @model
32
- list.each do |facet|
33
- scope = facet.add_scope(scope)
31
+ unless @results
32
+ scope = @model
33
+ list.each do |facet|
34
+ scope = facet.add_scope(scope)
35
+ end
36
+ @results = scope.distinct
34
37
  end
35
- scope.distinct
38
+ @results
36
39
  end
37
40
 
38
41
  def model_table_name
@@ -2,9 +2,18 @@
2
2
  anchor ||= ''
3
3
  reset ||= 'Reset'
4
4
  %>
5
+
6
+ <ul class="faceted__facets-selected list-inline">
7
+ <% facets.list.each do |facet| %>
8
+ <% partial = "#{facet.kind.underscore}/selected" %>
9
+ <%= render partial, facet: facet %>
10
+ <% end %>
11
+ </ul>
12
+
5
13
  <ul class="faceted__facets list-unstyled">
6
14
  <% facets.list.each do |facet| %>
7
- <%= render facet.kind.underscore, facet: facet, anchor: anchor %>
15
+ <% partial = "#{facet.kind.underscore}/all" %>
16
+ <%= render partial, facet: facet, anchor: anchor %>
8
17
  <% end %>
9
18
  <li class="faceted__facet__reinit">
10
19
  <a href="<%= facets.path%>">
@@ -0,0 +1,15 @@
1
+ <li class=" faceted__facet-selected
2
+ list-inline-item
3
+ badge
4
+ badge-light">
5
+ <%= link_to path do %>
6
+ <% unless title %>
7
+ <span class="faceted__facet-selected__title d-none">
8
+ <%= title %>
9
+ </span>
10
+ <% end %>
11
+ <span class="faceted__facet-selected__value">
12
+ <%= value %>
13
+ </span>
14
+ <% end %>
15
+ </li>
@@ -0,0 +1,12 @@
1
+ <% if facet.values.any? %>
2
+ <% facet.values.each do |value| %>
3
+ <% identifier = value.send facet.find_by %>
4
+ <% if facet.value_selected?(identifier) %>
5
+ <% display_value = facet.display_method.call(value) %>
6
+ <%= render 'faceted_search/facets/facet-selected',
7
+ title: facet.title,
8
+ value: display_value,
9
+ path: facet.facets.path_for(facet, identifier) %>
10
+ <% end %>
11
+ <% end %>
12
+ <% end %>
@@ -0,0 +1,10 @@
1
+ <% if facet.values.any? %>
2
+ <% facet.values.each do |year| %>
3
+ <% if facet.value_selected?(year) %>
4
+ <%= render 'faceted_search/facets/facet-selected',
5
+ title: facet.title,
6
+ value: year,
7
+ path: facet.facets.path_for(facet, year) %>
8
+ <% end %>
9
+ <% end %>
10
+ <% end %>
@@ -0,0 +1,5 @@
1
+ <% if facet.values.any? %>
2
+ <%= render 'faceted_search/facets/full_tree/values-selected',
3
+ values: facet.values_with_parent(nil),
4
+ facet: facet %>
5
+ <% end %>
@@ -0,0 +1,15 @@
1
+ <% values.each do |value| %>
2
+ <% identifier = value.send facet.find_by %>
3
+ <% if facet.value_selected?(identifier) %>
4
+ <%= render 'faceted_search/facets/facet-selected',
5
+ title: facet.title,
6
+ value: facet.display_method.call(value),
7
+ path: facet.facets.path_for(facet, identifier) %>
8
+ <% end %>
9
+ <% child_values = facet.values_with_parent(value.id) %>
10
+ <% if child_values.any? %>
11
+ <%= render 'faceted_search/facets/full_tree/values-selected',
12
+ values: child_values,
13
+ facet: facet %>
14
+ <% end %>
15
+ <% end %>
@@ -0,0 +1,12 @@
1
+ <% if facet.values.any? %>
2
+ <% facet.values.each do |value| %>
3
+ <% identifier = value.send facet.find_by %>
4
+ <% if facet.value_selected?(identifier) %>
5
+ <% display_value = facet.display_method.call(value) %>
6
+ <%= render 'faceted_search/facets/facet-selected',
7
+ title: facet.title,
8
+ value: display_value,
9
+ path: facet.facets.path_for(facet, identifier) %>
10
+ <% end %>
11
+ <% end %>
12
+ <% end %>
@@ -0,0 +1,7 @@
1
+ <% value = params[:facets][facet.name] if params[:facets] && params[:facets].has_key?(facet.name) %>
2
+ <% unless value.blank? %>
3
+ <%= render 'faceted_search/facets/facet-selected',
4
+ title: facet.title,
5
+ value: value,
6
+ path: facet.facets.path_for(facet, nil) %>
7
+ <% end %>
@@ -1,3 +1,3 @@
1
1
  module FacetedSearch
2
- VERSION = '3.3.5'
2
+ VERSION = '3.4'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: faceted_search
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.5
4
+ version: '3.4'
5
5
  platform: ruby
6
6
  authors:
7
7
  - Arnaud Levy
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2019-09-11 00:00:00.000000000 Z
13
+ date: 2020-01-03 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
@@ -133,14 +133,23 @@ files:
133
133
  - app/models/faceted_search/facets/text.rb
134
134
  - app/models/faceted_search/facets/tree.rb
135
135
  - app/views/faceted_search/_facets.html.erb
136
- - app/views/faceted_search/facets/_checkboxes.html.erb
137
- - app/views/faceted_search/facets/_date.html.erb
138
- - app/views/faceted_search/facets/_full_tree.html.erb
139
- - app/views/faceted_search/facets/_list.html.erb
140
- - app/views/faceted_search/facets/_primitive_list.html.erb
141
- - app/views/faceted_search/facets/_text.html.erb
142
- - app/views/faceted_search/facets/_tree.html.erb
136
+ - app/views/faceted_search/facets/_facet-selected.html.erb
137
+ - app/views/faceted_search/facets/checkboxes/_all.html.erb
138
+ - app/views/faceted_search/facets/checkboxes/_selected.html.erb
139
+ - app/views/faceted_search/facets/date/_all.html.erb
140
+ - app/views/faceted_search/facets/date/_selected.html.erb
141
+ - app/views/faceted_search/facets/full_tree/_all.html.erb
142
+ - app/views/faceted_search/facets/full_tree/_selected.html.erb
143
+ - app/views/faceted_search/facets/full_tree/_values-selected.html.erb
143
144
  - app/views/faceted_search/facets/full_tree/_values.html.erb
145
+ - app/views/faceted_search/facets/list/_all.html.erb
146
+ - app/views/faceted_search/facets/list/_selected.html.erb
147
+ - app/views/faceted_search/facets/primitive_list/_all.html.erb
148
+ - app/views/faceted_search/facets/primitive_list/_selected.html.erb
149
+ - app/views/faceted_search/facets/text/_all.html.erb
150
+ - app/views/faceted_search/facets/text/_selected.html.erb
151
+ - app/views/faceted_search/facets/tree/_all.html.erb
152
+ - app/views/faceted_search/facets/tree/_selected.html.erb
144
153
  - lib/faceted_search.rb
145
154
  - lib/faceted_search/engine.rb
146
155
  - lib/faceted_search/railtie.rb
@@ -165,8 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
165
174
  - !ruby/object:Gem::Version
166
175
  version: '0'
167
176
  requirements: []
168
- rubyforge_project:
169
- rubygems_version: 2.6.11
177
+ rubygems_version: 3.0.3
170
178
  signing_key:
171
179
  specification_version: 4
172
180
  summary: Faceted search with Active Record