faceted_search 3.6.1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf6eb515ded15419dfe734adabf061401175de3e53282913e3fed8d34925bed0
-  data.tar.gz: '0668e4c8c20ece2f177cf517dadb120f3662dafaa66948f2c311a903f6ff8983'
+  metadata.gz: 4633222e5bf581e90266ca8760dc45b829ead22a1ead7ec2b2bf618184c62f0f
+  data.tar.gz: db09d9655daaf66365dcacf7f886cca41ca82b789c46a6f15303a7b7504d2ef2
 SHA512:
-  metadata.gz: 889bac63c9c66f13e3f17a811a2468a53511b7626bb69b8872bae1582ff5a3cde8d7c96c41e2bb3d2a09be3452b08a0562faeadd6173dbf41c6a8fbc5472c228
-  data.tar.gz: 9f0519609d363702df936afe08ead0603257ecdd63466cd970f54eeb895455728416f31884341f8dc69c7e3f5059abe29ae2bdf975383102191ffaaeca18f9e8
+  metadata.gz: 660f10b2f9945c85a9a6b1ba298ff7a2ec1e9d092007bab2922773f31f005fd017ea270631026240006260089af083f2f66ff344d1682f6cd39ba6f9bb90fe1d
+  data.tar.gz: 9e72bb6ac253c60bce9527c649c5f598c6e14e4921f28b2a41b2e0ea0f868082d22238c49f883131a6e65ae4349263186c7d7cc6ec994211f302c504f77ea081

data/README.md

@@ -43,6 +43,9 @@ Create a model defining your facets:
         filter_with_list :kinds, {
           habtm: true
         }
+        filter_with_list :style, {
+          habtm: false
+        }
         filter_with_tree :categories, {
           habtm: true,
           children_scope: Proc.new { |children|

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

@@ -18,15 +18,19 @@ module FacetedSearch
     # and return the modified scope
     def add_scope(scope)
       return scope if params_array.blank?
-      habtm?  ? add_scope_with_habtm_true(scope)
-              : add_scope_with_habtm_false(scope)
+      habtm?  ? scope.joins(name).where(name => { find_by => params_array })
+              : 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
-      @values ||= habtm?  ? values_with_habtm_true
-                          : values_with_habtm_false
+      @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
     end
 
     def value_selected?(value)
@@ -43,31 +47,6 @@ 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.1'
+  VERSION = '3.6.2'
 end

metadata

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