faceted_search 3.5.7 → 3.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80006422a406840a486d9c8f5a50e1a2425057b285af095e95ee359021a1c1d7
-  data.tar.gz: 578682f035d0315fe84a4950e78879eb0f9654b5d9ff2582b091672473c517ff
+  metadata.gz: 265734657b1546de2a80bb631adf099b8758bedd7baf5f4af71a3c266cbf2547
+  data.tar.gz: 66f75f2e72f13bb7bb67b94d613c4597a866e8cba1c1f2dc789cbae542f851a8
 SHA512:
-  metadata.gz: ee0870c176285f42f78bb0c244a52783dcc54733b1d0ad1fc5a3db88b069b72d0222bc2c87b6873fd1b503f5d5b2f58f6782c905963d38ece704ded9b5b21c0d
-  data.tar.gz: f0f3ab3e4019737a2d48a364f74b82bc449a1d8d26f94972d3830dcf8334b61b2d473026832cec7d6247ac8bf88eb59e68f0e03237c6e30e54d88a091d199b5b
+  metadata.gz: de25113088db0880b13fa1aef84d86b03fe88572e54f334c7b2c7bcff4e6831a87d253c1cbb14f9483167ca5edc2ad041e34dbb8773aff732fd080ddc56fff58
+  data.tar.gz: e687d54f22dbb7d1b00a897268b07bb5a51de83a7980dbb1f190df105c381733f1f907031490b9da6cf3bd004867f45b9cc70dd42efb3c59cf251e084838b22d

data/app/models/faceted_search/facets.rb

@@ -53,7 +53,12 @@ module FacetedSearch
     end
 
     def has_params?
-      params.values.select(&:present?).any?
+      any = false
+      list.each do |facet|
+        next if facet.hide_in_selected?
+        any = true if facet.params.present?
+      end
+      any
     end
 
     protected

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

@@ -26,7 +26,10 @@ module FacetedSearch
     end
 
     def values
-      @values ||= order == :asc ? source : source.reverse
+      @values ||= begin
+        values = (source | params_array.map(&:to_i)).sort
+        order == :asc ? values : values.reverse
+      end
     end
   end
 end

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

@@ -29,7 +29,8 @@ module FacetedSearch
       @values ||= begin
         joined_table = facets.model_table_name.to_sym
         results = params_array.blank? ? facets.results : facets.results_except(@name)
-        source.all.joins(joined_table).where(joined_table => { id: results }).distinct
+        values = source.all.joins(joined_table)
+        values.where(joined_table => { id: results }).or(values.where(id: params_array)).distinct
       end
     end
 

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

@@ -31,7 +31,7 @@ module FacetedSearch
 
     def values
       @values ||= begin
-        values = source.pluck(field).uniq.reject(&:blank?).sort
+        values = (source.pluck(field).uniq.reject(&:blank?) | params_array.compact).sort
         order == :asc ? values : values.reverse
       end
     end

data/lib/faceted_search/version.rb

@@ -1,3 +1,3 @@
 module FacetedSearch
-  VERSION = '3.5.7'
+  VERSION = '3.5.9'
 end

metadata

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