faceted_search 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe592fdf97691ed7a84615276e1bcbefc462c4909ec022ac3cf9ac91e573cb29
-  data.tar.gz: 016676f7aecb78314f4b35b4db6878594ed0fe10310e298587e10459482571f9
+  metadata.gz: e88e213ff0887cfffb7ecc22d76fb060ddbedd2d037252e8e89695ec83928674
+  data.tar.gz: 74b00464aaa30ec6d50f301f9303027aff7c4754bd813f47e8aa2bf455751b05
 SHA512:
-  metadata.gz: 03d95585dc7d993aad9c3c86bf145a9bfb202c36f22f2016b426f78111ff28d8c23d01bbf97b58e2d03eb3ba651fe78dd68cf0184347134f9f58d3ec244455cc
-  data.tar.gz: 558617b904a86f464411a4a7c5fa376d3289e330852359e7338495ce54472103c85d725a2852ff4acad98086e282699ba839f816349138b040b7a0e35f0cca41
+  metadata.gz: a51c7a17c08a9bc49645803c2ae10b858497308e292532140430e9f1ed71800ff014f25d833a536029bcf3b75060147b9252c8d592feed00977917e8ffb52578
+  data.tar.gz: ef10c7dc53f665136d32eba99f6e04dd10ed88f3111d983fd93f2909c85602c2afcc739ae411820db3b5fc66a88e2bc8452b8242382239e0ee5d9904c5d7e4a3

data/README.md

@@ -26,12 +26,13 @@ $ gem install faceted_search
 Create a model defining your facets:
 
     class Item::Facets < FacetedSearch::Facets
-      def define
-        set_model Item.all
+      def initialize(params)
+        super
+        @model = Item.all
         search :title
-        filter :products, find_by: :title
-        filter :kinds
-        filter :categories
+        filter :products, find_by: :title, habtm: true
+        filter :kinds, habtm: true
+        filter :categories, habtm: true
       end
     end
 
@@ -60,9 +61,5 @@ In your view, do something like that (with bootstrap):
       </div>
     </div>
 
-
-## Contributing
-Contribution directions go here.
-
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

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

@@ -12,19 +12,36 @@ module FacetedSearch
       value.to_s.in? params_array
     end
 
+    def results_with(value)
+      scope = @facets.model
+      @facets.list.each do |facet|
+        scope = facet == self ? add_scope_with_value(scope, value)
+                              : facet.add_scope(scope)
+      end
+      scope
+    end
+
     def params_array
       @params_array ||= @params.to_s.split(',')
     end
 
     # Adds a scope corresponding to this facet
     # to the scope sent as an argument
-    # and return the modified scope 
+    # 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)
     end
 
+    # Adds a scope corresponding to this facet
+    # to the scope sent as an argument with specific value
+    # and return the modified scope
+    def add_scope_with_value(scope, value)
+      @habtm  ? scope.joins(name).where(name => { find_by => value })
+              : scope.where(name => value)
+    end
+
     # Show all values that have corresponding results.
     # This is a regular SQL inner join.
     def values

data/app/views/faceted_search/_facets.html.erb

@@ -1,9 +1,9 @@
 <ul class="faceted__facets list-unstyled">
   <% @facets.list.each do |facet| %>
-    <li class="mb-3">
+    <li>
       <b><%= facet.title %></b>
       <%= render facet.kind.underscore, facet: facet %>
     </li>
   <% end %>
-  <li><a href="<%= @facets.path%>"><i class="fas fa-backspace"></i></a></li>
-</ul>
+  <li class="faceted__facet__reinit"><a href="<%= @facets.path%>"><i class="fas fa-backspace"></i></a></li>
+</ul>

data/app/views/faceted_search/facets/_filter.html.erb

@@ -1,12 +1,14 @@
-<ul class="faceted__facet--filter list-unstyled">
+<ul class="faceted__facet__filter list-unstyled">
   <% facet.values.each do |value| %>
     <%
     identifier = value.send facet.find_by
     selected = facet.selected? identifier
+    results_count = facet.results_with(value).count
+    next if results_count.zero?
     %>
     <li>
       <% if selected %><b><% end %>
-      <%= link_to value, @facets.path_for(facet, identifier) %>
+      <%= link_to "#{value} (#{results_count})", @facets.path_for(facet, identifier) %>
       <% if selected %></b><% end %>
     </li>
   <% end %>

data/app/views/faceted_search/facets/_search.html.erb

@@ -1,5 +1,5 @@
 <% value = params[:facets][facet.name] if params[:facets] && params[:facets].has_key?(facet.name) %>
-<form action="" class="faceted__facet--search form-inline"">
+<form action="" class="faceted__facet__search form-inline">
   <% facet.facets.list.each do |f| %>
     <% next if f == facet %>
     <% next if f.params.blank? %>

data/lib/faceted_search/version.rb

@@ -1,3 +1,3 @@
 module FacetedSearch
-  VERSION = '1.1.1'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: faceted_search
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Arnaud Levy
+- Sébastien Gaya
+- Sébastien Moulène
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,9 +96,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: All you need to create a faceted search, as simply as possible
+description: All you need to create a faceted search, as simple as possible
 email:
 - alevy@lespoupees.paris
+- sebastien.gaya@gmail.com
+- sebousan@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []