faceted_search 3.0.6 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f00683190fb978c192c5688ba87bd5434b1153d30daa2e97d37c008017321166
-  data.tar.gz: 56e0f73cc1f2e0fe3ae074877b64de6408a06ef78420f6953bd4c8b99dcfdd59
+  metadata.gz: fba3eb583446e16d41d10394bdfce26f8ba0737e17f009756ba9588f702c2888
+  data.tar.gz: c0620ca3b64d7aaa40c07aac0a95ebcf133673e50616601a43e7689f2a0d66cd
 SHA512:
-  metadata.gz: 2ec5d568a256317a881ba0db80431799b941ecaf4d3d5c04a62dfd94ced00f372726074c55e4b4fae88272acec2e323a224346a16e987cdfa5b70573da7de656
-  data.tar.gz: 54c24998826728ee99fd8fe63216b7c06d74909204a439e5fe91391d4d11169fa97fc049e052683813e59e6973c5d83dd5759a2307494d1a2b1861d41629a19e
+  metadata.gz: 35ef9e7e9fe73eba37d5878c54fcdc2f1a3a307433a1f5d1ce4b54cbed02efc3617ce3ff56c80601012a0b1dd7dd5f1561e27933d364c3500a3a14c8d42995d8
+  data.tar.gz: 77f001b3b318ffd5f85b1e00634f92c2194d0c9dcfeb1d0986c829f4b8a5c9ea9a55b196e2b1d79b998d1bbac1c817ed21a62b382072a16e3bad2193a5fe613a

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

@@ -23,6 +23,16 @@ module FacetedSearch
               : scope.where(name => params_array)
     end
 
+    # Show all values that have corresponding results with the current params.
+    # This is a regular SQL inner join.
+    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
+      end
+      @values
+    end
+
     def value_selected?(value)
       value.to_s.in? params_array
     end

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

@@ -1,22 +1,7 @@
 module FacetedSearch
   class Facets::FullTree < Facets::DefaultList
-    def children_scope
-      @options[:children_scope] ||= Proc.new { |children| children }
-    end
-
-    def child_values(value)
-      filtered children_scope.call(value.children)
-    end
-
-    def values
-      filtered source.root
-    end
-
-    protected
-
-    def filtered(list)
-      joined_table = facets.model_table_name.to_sym
-      list.joins(joined_table).where(joined_table => { id: facets.results }).distinct
+    def values_with_parent(parent_id)
+      values.where(parent_id: parent_id)
     end
   end
 end

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

@@ -1,14 +1,5 @@
 module FacetedSearch
   class Facets::List < Facets::DefaultList
 
-    # Show all values that have corresponding results with the current params.
-    # This is a regular SQL inner join.
-    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
-      end
-      @values
-    end
   end
 end

data/app/views/faceted_search/facets/_full_tree.html.erb

@@ -4,7 +4,7 @@
     <div class="static-nestable-list">
       <div class="dd">
         <ol class="faceted__facet__full_tree list-unstyled dd-list">
-          <%= render 'faceted_search/facets/full_tree/values', values: facet.values, facet: facet %>
+          <%= render 'faceted_search/facets/full_tree/values', values: facet.values_with_parent(nil), facet: facet %>
         </ol>
       </div>
     </div>

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

@@ -6,7 +6,7 @@
   %>
   <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 %>
-    <% child_values = facet.child_values(value) %>
+    <% child_values = facet.values_with_parent(value.id) %>
     <% if child_values.any? %>
       <ol class="dd-list">
         <%= render 'faceted_search/facets/full_tree/values', values: child_values, facet: facet %>

data/lib/faceted_search/version.rb

@@ -1,3 +1,3 @@
 module FacetedSearch
-  VERSION = '3.0.6'
+  VERSION = '3.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faceted_search
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.1.0
 platform: ruby
 authors:
 - Arnaud Levy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails