faceted_search 3.5.16 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cd10cd89d2ea082ea27d55ffdc5063487d03c9682cf7bfcb05b1609244738fc
-  data.tar.gz: adf343649365ab7d49c763362db083dc4d9a5420b793c41e12d061fc58fc8eb7
+  metadata.gz: cf6eb515ded15419dfe734adabf061401175de3e53282913e3fed8d34925bed0
+  data.tar.gz: '0668e4c8c20ece2f177cf517dadb120f3662dafaa66948f2c311a903f6ff8983'
 SHA512:
-  metadata.gz: 6e207f0b79d30adea678c56fe99d5b337b9d0f8c73043dd809ed7ad20187dbacd2073155579bff89915be5bb1d2dd57c9547a3dfe7e588c74e27c0b109e70bab
-  data.tar.gz: 802f00e9a008d836e5cd341d524aedc23e67fe6f31fa92574da40b663484529f723eb94e2f81c2d23e17361e81835f55c5955ed60d669959d7e0d962dffbb213
+  metadata.gz: 889bac63c9c66f13e3f17a811a2468a53511b7626bb69b8872bae1582ff5a3cde8d7c96c41e2bb3d2a09be3452b08a0562faeadd6173dbf41c6a8fbc5472c228
+  data.tar.gz: 9f0519609d363702df936afe08ead0603257ecdd63466cd970f54eeb895455728416f31884341f8dc69c7e3f5059abe29ae2bdf975383102191ffaaeca18f9e8

data/README.md

@@ -49,6 +49,7 @@ Create a model defining your facets:
             children.order(:title)
           }
         }
+        filter_with_boolean :active
         # Other tree option, shows all values
         # filter_with_full_tree :categories, {
         #   habtm: true,

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

@@ -0,0 +1,14 @@
+module FacetedSearch
+  class Facets::Boolean < Facets::Default
+
+    def selected?
+      params == "true"
+    end
+
+    def add_scope(scope)
+      selected? ? scope.where(name => true)
+                : scope
+    end
+
+  end
+end

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/app/models/faceted_search/facets.rb

@@ -95,6 +95,10 @@ module FacetedSearch
       add_facet Range, value, options
     end
 
+    def filter_with_boolean(value, options = {})
+      add_facet Boolean, value, options
+    end
+
     def params_for(value, options)
       param_name = (options[:param_name] || value).to_sym
       @params[param_name] if @params.has_key? param_name

data/app/views/faceted_search/facets/boolean/_all.html.erb

@@ -0,0 +1,15 @@
+<% 
+anchor ||= ''
+selected = facet.selected?
+target = !selected
+path = facet.facets.path_for(facet, target) + anchor
+%>
+<li>
+  <label>
+    <input  type="checkbox"
+            onclick="window.location.href='<%= path %>'"
+            <%= 'checked' if facet.selected? %>
+          />
+    <%= facet.title %>
+  </label>
+</li>

data/app/views/faceted_search/facets/boolean/_selected.html.erb

@@ -0,0 +1,8 @@
+<% anchor ||= '' %>
+<% value = params[:facets][facet.param_name] if params[:facets] && params[:facets].has_key?(facet.param_name) %>
+<% unless value.blank? %>
+  <%= render 'faceted_search/facets/facet-selected',
+              title: facet.title,
+              value: facet.title,
+              path: facet.facets.path_for(facet, nil) + anchor %>
+<% end %>

data/lib/faceted_search/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faceted_search
 version: !ruby/object:Gem::Version
-  version: 3.5.16
+  version: 3.6.1
 platform: ruby
 authors:
 - Arnaud Levy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2023-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -112,7 +112,7 @@ dependencies:
         version: '0'
 description: All you need to create a faceted search, as simple as possible
 email:
-- alevy@lespoupees.paris
+- arnaud.levy@noesya.coop
 - sebastien.gaya@gmail.com
 - sebousan@gmail.com
 executables: []
@@ -124,6 +124,7 @@ files:
 - Rakefile
 - app/assets/stylesheets/faceted_search.sass
 - app/models/faceted_search/facets.rb
+- app/models/faceted_search/facets/boolean.rb
 - app/models/faceted_search/facets/checkboxes.rb
 - app/models/faceted_search/facets/date.rb
 - app/models/faceted_search/facets/default.rb
@@ -137,6 +138,8 @@ files:
 - app/views/faceted_search/_facets.html.erb
 - app/views/faceted_search/_link.html.erb
 - app/views/faceted_search/facets/_facet-selected.html.erb
+- app/views/faceted_search/facets/boolean/_all.html.erb
+- app/views/faceted_search/facets/boolean/_selected.html.erb
 - app/views/faceted_search/facets/checkboxes/_all.html.erb
 - app/views/faceted_search/facets/checkboxes/_selected.html.erb
 - app/views/faceted_search/facets/date/_all.html.erb
@@ -160,7 +163,7 @@ files:
 - lib/faceted_search/railtie.rb
 - lib/faceted_search/version.rb
 - lib/tasks/faceted_search_tasks.rake
-homepage: http://github.com/lespoupeesrusses/faceted_search
+homepage: http://github.com/noesya/faceted_search
 licenses:
 - MIT
 metadata: {}
@@ -179,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