forty_facets 0.1.9.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad48e8c4f2338a87b29236fd94806a15f82da882ab7c754407cdb1795f608d15
-  data.tar.gz: e19407ae762c613e784f8ebfb9e802d4398aa38520ef3b942016d50926cf70ca
+  metadata.gz: b199beee6e5f6cb3ce5024427b3d21b3458c2f8b94e362e02132d30bf89e0b56
+  data.tar.gz: 8e4f12b0498ecd4f307b916615f32d1f22602757484f396bdac9e6545ea62a53
 SHA512:
-  metadata.gz: 9165e142d34aac61ce38eaac7efa70db5172496494e48082b5a9882345ba113850f2bda7ff066c2d7df76557555e59acf0b7286dd6f1e5d6b1e4d2eeb4473ee1
-  data.tar.gz: 005ef2414ddcadcf8c53d176f887386c17de905cf6f27a2ca03b9b90f5b326020cfce26fb062475ffdddf62c6f1a30e4ab79924f36c474fd47e308042a2d9ca7
+  metadata.gz: 297c5f1d5dcef25897f877e9af20bf35af4e4642dc73c145ac42c6e3de2b1cfb6a504f70f46221853f32b38fbca0bbe66315f0fb06a9f40861b200a75c92b513
+  data.tar.gz: b484abb4c5ee26c000cdc97da161a515a73f3321d2191b8ff45961962c2f01c7f4dd50b38b266023c83bd9dbc627c1f7b240db0ae881297e7a97c5ae436cc37d

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+3.1.2

data/CHANGELOG

@@ -0,0 +1,12 @@
+# CHANGELOG
+
+## 0.2.1
+
+- added "ORDER" to Range query to fix integration with Postgres
+
+## 0.2
+
+- introduction of CHANGELOG
+- upgraded to Ruby 3.1
+- upgraded to ActiveRecrd/Rails 7
+- merged #27

data/forty_facets.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "activerecord", "~> 5.0"
+  spec.add_development_dependency "activerecord", "~> 7.0"
   spec.add_development_dependency "byebug" # travis doenst like byebug
 end

data/lib/forty_facets/filter/facet_filter_definition.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module FortyFacets
   class FacetFilterDefinition < FilterDefinition
-
     class FacetFilter < Filter
       def values
         @values ||= Array.wrap(value).sort.uniq
@@ -12,12 +13,12 @@ module FortyFacets
         order_accessor = definition.options[:order]
         if order_accessor
           if order_accessor.is_a?(Proc)
-            facet.sort_by!{|facet_value| order_accessor.call(facet_value.entity) }
+            facet.sort_by! { |facet_value| order_accessor.call(facet_value.entity) }
           else
-            facet.sort_by!{|facet_value| facet_value.entity.send(order_accessor) }
+            facet.sort_by! { |facet_value| facet_value.entity.send(order_accessor) }
           end
         else
-          facet.sort_by!{|facet_value| -facet_value.count }
+          facet.sort_by! { |facet_value| -facet_value.count }
         end
         facet
       end
@@ -25,7 +26,7 @@ module FortyFacets
 
     class AssociationFacetFilter < FacetFilter
       def selected
-        @selected ||= definition.association.klass.find(Array.wrap(values).reject(&:blank?))
+        @selected ||= definition.association.klass.unscoped.find(Array.wrap(values).reject(&:blank?))
       end
 
       def remove(entity)
@@ -49,12 +50,14 @@ module FortyFacets
       def selected
         entity = definition.origin_class
         column = entity.columns_hash[definition.attribute.to_s]
-        values.map{|v| entity.connection.type_cast(v, column)}
+        type = entity.connection.lookup_cast_type_from_column(column)
+        values.map { |value| type.serialize(value) }
       end
 
       def build_scope
-        return Proc.new { |base| base } if empty?
-        Proc.new do |base|
+        return proc { |base| base } if empty?
+
+        proc do |base|
           base.joins(definition.joins).where(definition.qualified_column_name => value)
         end
       end
@@ -90,8 +93,9 @@ module FortyFacets
 
     class BelongsToFilter < AssociationFacetFilter
       def build_scope
-        return Proc.new { |base| base } if empty?
-        Proc.new do |base|
+        return proc { |base| base } if empty?
+
+        proc do |base|
           base.joins(definition.joins).where(definition.qualified_column_name => values)
         end
       end
@@ -101,7 +105,7 @@ module FortyFacets
         query = "#{my_column} AS foreign_id, count(#{my_column}) AS occurrences"
         counts = without.result(skip_ordering: true).distinct.joins(definition.joins).select(query).group(my_column)
         counts.includes_values = []
-        entities_by_id = definition.association.klass.find(counts.map(&:foreign_id)).group_by(&:id)
+        entities_by_id = definition.association.klass.unscoped.find(counts.map(&:foreign_id)).group_by(&:id)
 
         facet = counts.map do |count|
           facet_entity = entities_by_id[count.foreign_id].first
@@ -115,8 +119,9 @@ module FortyFacets
 
     class HasManyFilter < AssociationFacetFilter
       def build_scope
-        return Proc.new { |base| base } if empty?
-        Proc.new do |base|
+        return proc { |base| base } if empty?
+
+        proc do |base|
           base_table = definition.origin_class.table_name
 
           primary_key_column = "#{base_table}.#{definition.origin_class.primary_key}"
@@ -130,15 +135,15 @@ module FortyFacets
       def facet
         base_table = definition.search.root_class.table_name
         join_name =  [definition.association.name.to_s, base_table.to_s].sort.join('_')
-        foreign_id_col = definition.association.name.to_s.singularize + '_id'
-        my_column = join_name + '.' + foreign_id_col
+        foreign_id_col = "#{definition.association.name.to_s.singularize}_id"
+        my_column = "#{join_name}.#{foreign_id_col}"
         counts = without.result(skip_ordering: true)
-                  .distinct
-                  .joins(definition.joins)
-                  .select("#{my_column} as foreign_id, count(#{my_column}) as occurrences")
-                  .group(my_column)
+                        .distinct
+                        .joins(definition.joins)
+                        .select("#{my_column} as foreign_id, count(#{my_column}) as occurrences")
+                        .group(my_column)
         counts.includes_values = []
-        entities_by_id = definition.association.klass.find(counts.map(&:foreign_id)).group_by(&:id)
+        entities_by_id = definition.association.klass.unscoped.find(counts.map(&:foreign_id)).group_by(&:id)
 
         facet = counts.map do |count|
           facet_entity = entities_by_id[count.foreign_id].first
@@ -152,11 +157,12 @@ module FortyFacets
 
     def build_filter(search_instance, param_value)
       if association
-        if association.macro == :belongs_to
+        case association.macro
+        when :belongs_to
           BelongsToFilter.new(self, search_instance, param_value)
-        elsif association.macro == :has_many
+        when :has_many
           HasManyFilter.new(self, search_instance, param_value)
-        elsif association.macro == :has_and_belongs_to_many
+        when :has_and_belongs_to_many
           HasManyFilter.new(self, search_instance, param_value)
         else
           raise "Unsupported association type: #{association.macro}"

data/lib/forty_facets/filter/range_filter_definition.rb

@@ -1,27 +1,39 @@
+# frozen_string_literal: true
+
 module FortyFacets
   class RangeFilterDefinition < FilterDefinition
     class RangeFilter < Filter
+      RANGE_REGEX = /(\d*) - (\d*)/
+
       def build_scope
-        return Proc.new { |base| base } if empty?
+        return proc { |base| base } if empty?
 
-        Proc.new do |base|
-          base.joins(definition.joins)
-            .where("#{definition.qualified_column_name} >= ? AND #{definition.qualified_column_name} <= ? ", min_value, max_value ) 
+        proc do |base|
+          scope = base.joins(definition.joins)
+          scope = scope.where("#{definition.qualified_column_name} >= ?", min_value) if min_value.present?
+          scope = scope.where("#{definition.qualified_column_name} <= ?", max_value) if max_value.present?
+          scope
         end
       end
 
       def min_value
-        return nil if empty?
-        value.split(' - ').first
+        min, _max = range_values
+        min
       end
 
       def max_value
-        return nil if empty?
-        value.split(' - ').last
+        _min, max = range_values
+        max
       end
 
       def absolute_interval
-        @abosultes ||= without.result.reorder('').select("min(#{definition.qualified_column_name}) AS min, max(#{definition.qualified_column_name}) as max").first
+        @abosultes ||=
+          without
+          .result
+          .reorder('')
+          .select("min(#{definition.qualified_column_name}) AS min, max(#{definition.qualified_column_name}) as max")
+          .order("min(#{definition.qualified_column_name})")
+          .first
       end
 
       def absolute_min
@@ -32,6 +44,11 @@ module FortyFacets
         absolute_interval.max
       end
 
+      private
+
+      def range_values
+        value&.match(RANGE_REGEX)&.captures
+      end
     end
 
     def build_filter(search_instance, value)

data/lib/forty_facets/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FortyFacets
-  VERSION = "0.1.9.0"
+  VERSION = '0.2.1'
 end

data/test/fixtures.rb

@@ -14,6 +14,7 @@ ActiveRecord::Schema.define do
     t.string :status
     t.string :name
     t.string :description
+    t.datetime :deleted_at
   end
 
   create_table :producers do |t|
@@ -79,10 +80,13 @@ end
 class Studio < ActiveRecord::Base
   belongs_to :country
   has_and_belongs_to_many :producers
+
+  default_scope ->{ where(deleted_at: nil) }
+  scope :with_deleted, ->{ unscope(where: :deleted_at) }
 end
 
 class Movie < ActiveRecord::Base
-  belongs_to :studio
+  belongs_to :studio, ->{ with_deleted }
   has_and_belongs_to_many :genres
   has_and_belongs_to_many :actors
   has_and_belongs_to_many :writers

data/test/smoke_test.rb

@@ -1,46 +1,49 @@
+# frozen_string_literal: true
+
 require 'coveralls'
 Coveralls.wear!
 
-require "minitest/autorun"
+require 'minitest/autorun'
+require 'test_helper'
 require 'logger'
-#require 'byebug'# travis doenst like byebug
+# require 'byebug'# travis doenst like byebug
 require_relative '../lib/forty_facets'
 
-#silence_warnings do
+# silence_warnings do
 require_relative 'fixtures'
-#end
+# end
 
 class MovieSearch < FortyFacets::FacetSearch
   model 'Movie'
 
   text :title, name: 'Title'
   facet :studio, name: 'Studio'
-  facet :year, order: Proc.new {|year| -year}
+  facet :year, order: proc { |year| -year }
   facet :genres, name: 'Genre'
   facet :actors, name: 'Actor'
   range :price, name: 'Price'
   facet :writers, name: 'Writer'
-  facet [:studio, :country], name: 'Country'
-  facet [:studio, :status], name: 'Studio status'
-  facet [:studio, :producers], name: 'Producers'
+  facet %i[studio country], name: 'Country'
+  facet %i[studio status], name: 'Studio status'
+  facet %i[studio producers], name: 'Producers'
   sql_facet({ uschis: "studios.name = 'Uschi'", non_uschis: "studios.name != 'USCHI'" },
-            { name: "Uschis", path: [:studio, :uschis], joins: [:studio] })
-  sql_facet({ classic: "year <= 1980", non_classic: "year > 1980" },
-            { name: "Classic", path: :classic })
-  sql_facet({ classic: "year <= 1980", non_classic: "year > 1980" },
-            { name: "Classic" })
-  text [:studio, :description], name: 'Studio Description'
+            { name: 'Uschis', path: %i[studio uschis], joins: [:studio] })
+  sql_facet({ classic: 'year <= 1980', non_classic: 'year > 1980' },
+            { name: 'Classic', path: :classic })
+  sql_facet({ classic: 'year <= 1980', non_classic: 'year > 1980' },
+            { name: 'Classic' })
+  text %i[studio description], name: 'Studio Description'
   scope :classics, name: 'Name classics'
   scope :year_lte, name: 'Year less than or equal', pass_value: true
   custom :needs_complex_filtering
 end
 
 class SmokeTest < Minitest::Test
-
   def test_sql_facet_with_belongs_to
-    search = MovieSearch.new({'studio-uschis' => {}})
+    search = MovieSearch.new({ 'studio-uschis' => {} })
     assert_equal Movie.count, search.result.size
-    assert_equal search.filter([:studio, :uschis]).facet, [FortyFacets::FacetValue.new(:uschis, 0, false), FortyFacets::FacetValue.new(:non_uschis, 40, false)]
+    assert_equal search.filter(%i[studio uschis]).facet,
+                 [FortyFacets::FacetValue.new(:uschis, 0, false), FortyFacets::FacetValue.new(:non_uschis, 40, false)]
   end
 
   def test_it_finds_all_movies
@@ -49,57 +52,57 @@ class SmokeTest < Minitest::Test
   end
 
   def test_scope_filter
-    search = MovieSearch.new("search" => {})
+    search = MovieSearch.new('search' => {})
     assert_equal 40, search.result.size
     assert search.filter(:classic).facet.include? FortyFacets::FacetValue.new(:classic, 6, false)
     assert search.filter(:classic).facet.include? FortyFacets::FacetValue.new(:non_classic, 34, false)
 
-    search = MovieSearch.new("search" => { "classic" => "classic" })
+    search = MovieSearch.new('search' => { 'classic' => 'classic' })
     assert_equal 6, search.result.size
     assert search.filter(:classic).facet.include? FortyFacets::FacetValue.new(:classic, 6, true)
     assert search.filter(:classic).facet.include? FortyFacets::FacetValue.new(:non_classic, 34, false)
 
-    search = MovieSearch.new("search" => { "classic" => "non_classic" })
+    search = MovieSearch.new('search' => { 'classic' => 'non_classic' })
     assert_equal 34, search.result.size
     assert search.filter(:classic).facet.include? FortyFacets::FacetValue.new(:classic, 6, false)
     assert search.filter(:classic).facet.include? FortyFacets::FacetValue.new(:non_classic, 34, true)
 
-    search = MovieSearch.new("search" => { "classic" => ["non_classic", "classic"] })
+    search = MovieSearch.new('search' => { 'classic' => %w[non_classic classic] })
     assert_equal 40, search.result.size
     assert search.filter(:classic).facet.include? FortyFacets::FacetValue.new(:classic, 6, true)
     assert search.filter(:classic).facet.include? FortyFacets::FacetValue.new(:non_classic, 34, true)
   end
 
   def test_scope_filter_without_path
-    search = MovieSearch.new("search" => {})
+    search = MovieSearch.new('search' => {})
     assert_equal 40, search.result.size
-    assert search.filter([:classic, :non_classic]).facet.include? FortyFacets::FacetValue.new(:classic, 6, false)
-    assert search.filter([:classic, :non_classic]).facet.include? FortyFacets::FacetValue.new(:non_classic, 34, false)
+    assert search.filter(%i[classic non_classic]).facet.include? FortyFacets::FacetValue.new(:classic, 6, false)
+    assert search.filter(%i[classic non_classic]).facet.include? FortyFacets::FacetValue.new(:non_classic, 34, false)
 
-    search = MovieSearch.new("search" => { "classic-non_classic" => "classic" })
+    search = MovieSearch.new('search' => { 'classic-non_classic' => 'classic' })
     assert_equal 6, search.result.size
-    assert search.filter([:classic, :non_classic]).facet.include? FortyFacets::FacetValue.new(:classic, 6, true)
-    assert search.filter([:classic, :non_classic]).facet.include? FortyFacets::FacetValue.new(:non_classic, 34, false)
+    assert search.filter(%i[classic non_classic]).facet.include? FortyFacets::FacetValue.new(:classic, 6, true)
+    assert search.filter(%i[classic non_classic]).facet.include? FortyFacets::FacetValue.new(:non_classic, 34, false)
 
-    search = MovieSearch.new("search" => { "classic-non_classic" => "non_classic" })
+    search = MovieSearch.new('search' => { 'classic-non_classic' => 'non_classic' })
     assert_equal 34, search.result.size
-    assert search.filter([:classic, :non_classic]).facet.include? FortyFacets::FacetValue.new(:classic, 6, false)
-    assert search.filter([:classic, :non_classic]).facet.include? FortyFacets::FacetValue.new(:non_classic, 34, true)
+    assert search.filter(%i[classic non_classic]).facet.include? FortyFacets::FacetValue.new(:classic, 6, false)
+    assert search.filter(%i[classic non_classic]).facet.include? FortyFacets::FacetValue.new(:non_classic, 34, true)
 
-    search = MovieSearch.new("search" => { "classic-non_classic" => ["non_classic", "classic"] })
+    search = MovieSearch.new('search' => { 'classic-non_classic' => %w[non_classic classic] })
     assert_equal 40, search.result.size
-    assert search.filter([:classic, :non_classic]).facet.include? FortyFacets::FacetValue.new(:classic, 6, true)
-    assert search.filter([:classic, :non_classic]).facet.include? FortyFacets::FacetValue.new(:non_classic, 34, true)
+    assert search.filter(%i[classic non_classic]).facet.include? FortyFacets::FacetValue.new(:classic, 6, true)
+    assert search.filter(%i[classic non_classic]).facet.include? FortyFacets::FacetValue.new(:non_classic, 34, true)
   end
 
   def test_text_filter
-    search = MovieSearch.new({'search' => { 'title' => 'ipsum' }})
+    search = MovieSearch.new({ 'search' => { 'title' => 'ipsum' } })
     assert_equal 1, search.result.size
     assert_equal 'ipsum', search.result.first.title
   end
 
   def test_year_filter
-    search = MovieSearch.new({'search' => { 'year' => '2011' }})
+    search = MovieSearch.new({ 'search' => { 'year' => '2011' } })
     assert_equal [2011], search.result.map(&:year).uniq
 
     facet = search.filter(:year).facet
@@ -107,34 +110,43 @@ class SmokeTest < Minitest::Test
   end
 
   def test_range_filter
-    search = MovieSearch.new({'search' => {'price' => '0 - 20'}})
+    search = MovieSearch.new({ 'search' => { 'price' => '0 - 20' } })
     assert_equal Movie.count, search.result.size
 
-    search = MovieSearch.new({'search' => {'price' => '0 - 10'}})
-    assert_equal Movie.all.reject{|m| m.price > 10}.size, search.result.size
+    search = MovieSearch.new({ 'search' => { 'price' => '5 - 10' } })
+    assert_equal Movie.where('price >= ? AND price <= ?', 5, 10).count, search.result.size
+
+    search = MovieSearch.new({ 'search' => { 'price' => '5 - ' } })
+    assert_equal Movie.where('price >= ?', 5).count, search.result.size
+
+    search = MovieSearch.new({ 'search' => { 'price' => ' - 5' } })
+    assert_equal Movie.where('price <= ?', 5).count, search.result.size
+
+    search = MovieSearch.new({ 'search' => { 'price' => '' } })
+    assert_equal Movie.count, search.result.size
   end
 
   def test_text_filter_via_belongs_to
     description = Studio.first.description
-    search = MovieSearch.new({'search' => { 'studio-description' => description }})
+    search = MovieSearch.new({ 'search' => { 'studio-description' => description } })
 
-    assert_equal Movie.all.reject{|m| m.studio.description != description}.size, search.result.size
+    assert_equal Movie.all.select { |m| m.studio.description == description }.size, search.result.size
     assert_equal description, search.result.first.studio.description
   end
 
   def test_country_filter
-    search = MovieSearch.new('search' => { 'studio-country' => Country.first.id.to_s})
-    assert_equal [Country.first], search.result.map{|m| m.studio.country}.uniq
+    search = MovieSearch.new('search' => { 'studio-country' => Country.first.id.to_s })
+    assert_equal [Country.first], search.result.map { |m| m.studio.country }.uniq
     assert_equal Movie.count / 2, search.result.count
 
-    search = MovieSearch.new('search' => { 'studio-country' => Country.last.id.to_s})
-    assert_equal [Country.last], search.result.map{|m| m.studio.country}.uniq
+    search = MovieSearch.new('search' => { 'studio-country' => Country.last.id.to_s })
+    assert_equal [Country.last], search.result.map { |m| m.studio.country }.uniq
     assert_equal Movie.count / 2, search.result.count
   end
 
   def test_selected_country_filter
-    search = MovieSearch.new('search' => { 'studio-country' => Country.first.id.to_s})
-    filter = search.filter([:studio, :country])
+    search = MovieSearch.new('search' => { 'studio-country' => Country.first.id.to_s })
+    filter = search.filter(%i[studio country])
     assert_equal FortyFacets::FacetFilterDefinition::BelongsToFilter, filter.class
     assert_equal [Country.first], filter.selected
 
@@ -142,17 +154,16 @@ class SmokeTest < Minitest::Test
   end
 
   def test_studio_status_filter
-    search = MovieSearch.new('search' => { 'studio-status' => 'active'})
-    assert_equal ['active'], search.result.map{|m| m.studio.status}.uniq
+    search = MovieSearch.new('search' => { 'studio-status' => 'active' })
+    assert_equal ['active'], search.result.map { |m| m.studio.status }.uniq
     assert_equal Movie.count / 2, search.result.count
 
-    filter = search.filter([:studio, :status])
+    filter = search.filter(%i[studio status])
     assert_equal ['active'], filter.selected
   end
 
   def test_year_add_remove_filter
-
-    search = MovieSearch.new()
+    search = MovieSearch.new
 
     search = search.filter(:year).add(2010)
     assert_equal Movie.where(year: 2010).count, search.result.count
@@ -165,7 +176,7 @@ class SmokeTest < Minitest::Test
   end
 
   def test_selected_year_filter
-    search = MovieSearch.new()
+    search = MovieSearch.new
 
     search = search.filter(:year).add(2010)
     assert_equal [2010], search.filter(:year).selected
@@ -174,9 +185,9 @@ class SmokeTest < Minitest::Test
     assert_equal [2010, 2011], search.filter(:year).selected
 
     facet = search.filter(:year).facet
-    assert facet.find{|fv| fv.entity == 2010}.selected
-    assert facet.find{|fv| fv.entity == 2011}.selected
-    assert !facet.find{|fv| fv.entity == 2012}.selected
+    assert facet.find { |fv| fv.entity == 2010 }.selected
+    assert facet.find { |fv| fv.entity == 2011 }.selected
+    assert !facet.find { |fv| fv.entity == 2012 }.selected
   end
 
   def test_belongs_to_filter
@@ -185,13 +196,27 @@ class SmokeTest < Minitest::Test
     studio = first_facet_value.entity
     assert_kind_of Studio, studio
 
-    movies_with_studio = Movie.where(studio: studio)
+    movies_with_studio = Movie.where(studio:)
     search_with_studio = blank_search.filter(:studio).add(studio)
 
     assert_equal movies_with_studio.size, search_with_studio.result.size
     assert_equal movies_with_studio.size, first_facet_value.count
   end
 
+  def test_belongs_to_filter_with_default_scope
+    wrap_in_db_transaction do
+      deleted_studio = Studio.create!(name: 'Deleted studio', status: 'active')
+      Movie.create!(studio: deleted_studio)
+      deleted_studio.update!(deleted_at: Time.now)
+
+      blank_search = MovieSearch.new
+
+      assert_equal(
+        5, blank_search.filter(:studio).facet.length
+      )
+    end
+  end
+
   def test_sort_by_proc
     blank_search = MovieSearch.new
     facet_entities = blank_search.filter(:year).facet.map(&:entity)
@@ -201,7 +226,7 @@ class SmokeTest < Minitest::Test
   def test_has_many
     blank_search = MovieSearch.new
     genre = Genre.first
-    expected = Movie.order(:id).select{|m| m.genres.include?(genre)}
+    expected = Movie.order(:id).select { |m| m.genres.include?(genre) }
     assert blank_search.filter(:genres).is_a?(FortyFacets::FacetFilterDefinition::HasManyFilter)
     search = blank_search.filter(:genres).add(genre)
     actual = search.result
@@ -212,9 +237,9 @@ class SmokeTest < Minitest::Test
   def test_hast_many_via_belongs_to
     blank_search = MovieSearch.new
     producer = Producer.first
-    expected = Movie.order(:id).select{|m| m.studio.producers.include? producer}
-    assert blank_search.filter([:studio, :producers]).is_a?(FortyFacets::FacetFilterDefinition::HasManyFilter)
-    search = blank_search.filter([:studio, :producers]).add(producer)
+    expected = Movie.order(:id).select { |m| m.studio.producers.include? producer }
+    assert blank_search.filter(%i[studio producers]).is_a?(FortyFacets::FacetFilterDefinition::HasManyFilter)
+    search = blank_search.filter(%i[studio producers]).add(producer)
     actual = search.result
 
     assert_equal expected.size, actual.size
@@ -223,7 +248,7 @@ class SmokeTest < Minitest::Test
   def test_has_many_writers
     blank_search = MovieSearch.new
     writer = Writer.first
-    expected = Movie.order(:id).select{|m| m.writers.include?(writer)}
+    expected = Movie.order(:id).select { |m| m.writers.include?(writer) }
     assert blank_search.filter(:writers).is_a?(FortyFacets::FacetFilterDefinition::HasManyFilter)
     search = blank_search.filter(:writers).add(writer)
     actual = search.result
@@ -236,8 +261,8 @@ class SmokeTest < Minitest::Test
     genre = Genre.first
     actor = Actor.first
     expected = Movie.order(:id)
-                .select{|m| m.genres.include?(genre)}
-                .select{|m| m.actors.include?(actor)}
+                    .select { |m| m.genres.include?(genre) }
+                    .select { |m| m.actors.include?(actor) }
     assert blank_search.filter(:genres).is_a?(FortyFacets::FacetFilterDefinition::HasManyFilter)
     search_with_genre = blank_search.filter(:genres).add(genre)
     search_with_genre_and_actor = search_with_genre.filter(:actors).add(actor)
@@ -252,11 +277,11 @@ class SmokeTest < Minitest::Test
 
     search.filter(:writers).facet.each do |facet_value|
       writer = facet_value.entity
-      expected = Movie.order(:id).select{|m| m.writers.include?(writer)}.count
-      assert_equal expected, facet_value.count, "The amount of movies for a writer should match the number indicated in the facet"
+      expected = Movie.order(:id).select { |m| m.writers.include?(writer) }.count
+      assert_equal expected, facet_value.count,
+                   'The amount of movies for a writer should match the number indicated in the facet'
       assert_equal writer.id == selected_writer.id, facet_value.selected
     end
-
   end
 
   def test_has_many_facet_values_genres
@@ -265,11 +290,11 @@ class SmokeTest < Minitest::Test
 
     search.filter(:genres).facet.each do |facet_value|
       genre = facet_value.entity
-      expected = Movie.order(:id).select{|m| m.genres.include?(genre)}.count
-      assert_equal expected, facet_value.count, "The amount of movies for a genre should match the number indicated in the facet"
+      expected = Movie.order(:id).select { |m| m.genres.include?(genre) }.count
+      assert_equal expected, facet_value.count,
+                   'The amount of movies for a genre should match the number indicated in the facet'
       assert_equal genre.id == selected_genre.id, facet_value.selected
     end
-
   end
 
   def test_includes_does_not_blow_up
@@ -278,14 +303,15 @@ class SmokeTest < Minitest::Test
     search.filter(:studio).facet.reject(&:selected).to_a
   end
 
-  def test_scope_filter
-    search_with_scope = MovieSearch.new().filter(:classics).add('1')
+  def test_activating_scope_filter
+    search_with_scope = MovieSearch.new.filter(:classics).add('1')
     assert search_with_scope.result.count < Movie.count, 'Activating the scope should yield a smaller set of movies'
   end
 
   def test_scope_filter_with_params
-    search_with_scope = MovieSearch.new().filter(:year_lte).add(1980)
-    assert search_with_scope.result.count < Movie.count, 'Activating the scope with filter should yield a smaller set of movies'
+    search_with_scope = MovieSearch.new.filter(:year_lte).add(1980)
+    assert search_with_scope.result.count < Movie.count,
+           'Activating the scope with filter should yield a smaller set of movies'
   end
 
   def test_custom_filter
@@ -294,5 +320,4 @@ class SmokeTest < Minitest::Test
 
     assert_equal 'foo', new_search.filter(:needs_complex_filtering).value
   end
-
 end

data/test/test_helper.rb

@@ -0,0 +1,8 @@
+class Minitest::Test
+  def wrap_in_db_transaction(&block)
+    ActiveRecord::Base.transaction do
+      yield
+      raise ActiveRecord::Rollback
+    end
+  end
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: forty_facets
 version: !ruby/object:Gem::Version
-  version: 0.1.9.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Axel Tetzlaff
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +121,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -146,7 +147,7 @@ homepage: https://github.com/fortytools/forty_facets
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -161,9 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Library for building facet searches for active_record models
 test_files: