faceted_search 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f3a631dcd6d16b556a25e2db756808ce7173708ccd02a23fc6854c5e8c30f01
-  data.tar.gz: ea0745c3ed87fd105f497dadd007a8417a01c1cc6f2925e0c93fe0aaa3e208d9
+  metadata.gz: cf6eb515ded15419dfe734adabf061401175de3e53282913e3fed8d34925bed0
+  data.tar.gz: '0668e4c8c20ece2f177cf517dadb120f3662dafaa66948f2c311a903f6ff8983'
 SHA512:
-  metadata.gz: dbe3a9ae5256ba40b72fd9d7cd2568d41bcfa96c13c999652e3dfc55894c4eb5dd6fbf1b580e98bb79183243d9798f303e2122de481b3d47d0582ab18c1c0800
-  data.tar.gz: d8eb1931049507e9f175c9c08c1e92ed883d87e1f29d21c039a80f50483158e55a75e6453b5c10cb8048af07867abc3e46a379423b42d832487b0a5bf8380b4c
+  metadata.gz: 889bac63c9c66f13e3f17a811a2468a53511b7626bb69b8872bae1582ff5a3cde8d7c96c41e2bb3d2a09be3452b08a0562faeadd6173dbf41c6a8fbc5472c228
+  data.tar.gz: 9f0519609d363702df936afe08ead0603257ecdd63466cd970f54eeb895455728416f31884341f8dc69c7e3f5059abe29ae2bdf975383102191ffaaeca18f9e8

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

@@ -18,20 +18,15 @@ module FacetedSearch
     # and return the modified scope
     def add_scope(scope)
       return scope if params_array.blank?
-
-      habtm?  ? scope.joins(name).where(name => { find_by => params_array })
-              : scope.where(name => params_array)
+      habtm?  ? add_scope_with_habtm_true(scope)
+              : add_scope_with_habtm_false(scope)
     end
 
     # Show all values that have corresponding results with the current params.
     # This is a regular SQL inner join.
     def values
-      @values ||= begin
-        joined_table = facets.model_table_name.to_sym
-        results = params_array.blank? ? facets.results : facets.results_except(param_name)
-        values = source.all.joins(joined_table)
-        values.where(joined_table => { id: results }).or(values.where(id: params_array)).distinct
-      end
+      @values ||= habtm?  ? values_with_habtm_true
+                          : values_with_habtm_false
     end
 
     def value_selected?(value)
@@ -48,6 +43,31 @@ module FacetedSearch
 
     protected
 
+    def add_scope_with_habtm_true(scope)
+      scope.joins(name).where(name => { find_by => params_array })
+    end
+
+    def add_scope_with_habtm_false(scope)
+      scope.where(name => params_array)
+    end
+
+    def results
+      params_array.blank? ? facets.results : facets.results_except(param_name)
+    end
+
+    def values_with_habtm_true
+      joined_table = facets.model_table_name.to_sym
+      values = source.all.joins(joined_table)
+      values.where(joined_table => { id: results }).or(values.where(id: params_array)).distinct
+    rescue
+    end
+
+    def values_with_habtm_false
+      property = "#{name}_id"
+      ids = results.pluck property
+      source.where(id: ids)
+    end
+
     def params_array
       @params_array ||= @params.to_s.split(',')
     end

data/lib/faceted_search/version.rb

@@ -1,3 +1,3 @@
 module FacetedSearch
-  VERSION = '3.6.0'
+  VERSION = '3.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faceted_search
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Arnaud Levy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Faceted search with Active Record