faceted_search 3.5.5 → 3.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 553d3617dd9ce61d6c40ee05bbb892fe015d92154858d8d94b9b1f17fa3c0bbe
-  data.tar.gz: 23c554467eea8e4495d8bcc4e3b32bbd7a9770be3eb19e27d10c13503b4bb9d3
+  metadata.gz: 109687180e0ee8bc369a74c9884430021f167fd43694b7ee43a4cdd486846af6
+  data.tar.gz: ec7bd149ecbdb47adb470f7b88da290f59247544034de5fb1184104426c95aac
 SHA512:
-  metadata.gz: 7f030a78d48278f60d0a9c6f2c45663d4089d4745ef5fc212a10d8d41e21f5680529ca2c41447f8db0027fd23e60ecde3a3a606070d25887b9e8315a6d21c885
-  data.tar.gz: 29a04e3c793429cd53d1496da956f954f73ad9049cdf7866cae122e54a2695b5d3578cffded28ba0a3b04a25ea50aab18765c7cce1f9dfc85f9bd52ac113829a
+  metadata.gz: 0a1cd9a1f7ad2ce69a778b7cef0c826ad97b277b6700f5973e5a7479c23c9a35d11fd64938bf1b21a389233520c84b974478ac33ae3c2a52cb5287fdde35dc0b
+  data.tar.gz: 7a9f15c607f02534ea00ddd6ad59122af8a765ba7cf4aa16459bfe207b6d07ab982250f3a0d23ebf1d3a765073b150a4aa2d26b2530cf3d4ed0206683d7060f1

data/app/models/faceted_search/facets.rb

@@ -36,14 +36,16 @@ module FacetedSearch
     end
 
     def results
-      unless @results
-        scope = @model
-        list.each do |facet|
-          scope = facet.add_scope(scope) unless facet.ignore_scope?
-        end
-        @results = scope.distinct
+      @results ||= results_except []
+    end
+
+    def results_except(*facet_names)
+      scope = @model
+      list.each do |facet|
+        next if facet_names.include?(facet.name) || facet.ignore_scope?
+        scope = facet.add_scope(scope)
       end
-      @results
+      scope.distinct
     end
 
     def model_table_name

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

@@ -2,7 +2,11 @@ module FacetedSearch
   class Facets::Date < Facets::DefaultList
 
     def source
-      @options[:source] || @facets.model.send(:all).pluck(name).compact.map(&:year).uniq.sort
+      @source ||= begin
+        next @options[:source] if @options[:source].present?
+        results = params_array.blank? ? facets.results : facets.results_except(@name)
+        results.send(:all).pluck(name).compact.map(&:year).uniq.sort
+      end
     end
 
     def order
@@ -19,11 +23,7 @@ module FacetedSearch
     end
 
     def values
-      unless @values
-        @values = source
-        @values.reverse! unless order == :asc
-      end
-      @values
+      @values ||= order == :asc ? source : source.reverse
     end
   end
 end

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

@@ -26,11 +26,11 @@ module FacetedSearch
     # Show all values that have corresponding results with the current params.
     # This is a regular SQL inner join.
     def values
-      unless @values
+      @values ||= begin
         joined_table = facets.model_table_name.to_sym
-        @values = source.all.joins(joined_table).where(joined_table => { id: facets.results }).distinct
+        results = params_array.blank? ? facets.results : facets.results_except(@name)
+        source.all.joins(joined_table).where(joined_table => { id: results }).distinct
       end
-      @values
     end
 
     def value_selected?(value)

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

@@ -2,6 +2,11 @@ module FacetedSearch
   class Facets::PrimitiveList < Facets::DefaultList
 
     def source
+      @source ||= begin
+        next @options[:source] if @options[:source].present?
+        results = params_array.compact.blank? ? facets.results : facets.results_except(@name)
+        results.send(:all).where("#{field} IS NOT NULL")
+      end
       @options[:source].where("#{field} IS NOT NULL")
     end
 
@@ -22,11 +27,10 @@ module FacetedSearch
     end
 
     def values
-      unless @values
-        @values = source.pluck(field).uniq.reject(&:empty?).sort
-        @values.reverse! unless order == :asc
+      @values ||= begin
+        values = source.pluck(field).uniq.reject(&:blank?).sort
+        order == :asc ? values : values.reverse
       end
-      @values
     end
   end
 end

data/lib/faceted_search/version.rb

@@ -1,3 +1,3 @@
 module FacetedSearch
-  VERSION = '3.5.5'
+  VERSION = '3.5.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faceted_search
 version: !ruby/object:Gem::Version
-  version: 3.5.5
+  version: 3.5.6
 platform: ruby
 authors:
 - Arnaud Levy