forty_facets 0.1.9.0 → 0.1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad48e8c4f2338a87b29236fd94806a15f82da882ab7c754407cdb1795f608d15
-  data.tar.gz: e19407ae762c613e784f8ebfb9e802d4398aa38520ef3b942016d50926cf70ca
+  metadata.gz: 69545229909e0d3d59609f54cd23590099dc656eb9c0450e38ec28ea23001edd
+  data.tar.gz: c883ef1c6c6744a0066d006bed2ffe9810e32fadb0f0677f5b98d66564bd1e0e
 SHA512:
-  metadata.gz: 9165e142d34aac61ce38eaac7efa70db5172496494e48082b5a9882345ba113850f2bda7ff066c2d7df76557555e59acf0b7286dd6f1e5d6b1e4d2eeb4473ee1
-  data.tar.gz: 005ef2414ddcadcf8c53d176f887386c17de905cf6f27a2ca03b9b90f5b326020cfce26fb062475ffdddf62c6f1a30e4ab79924f36c474fd47e308042a2d9ca7
+  metadata.gz: 669f899ed5ec16ada4907272603db2c9bbcd6a27b42555a80aaafc841c2eed0863452905ae72753b35652159a40a4fdd5c42931e780ed04a58f4dd9a0fdd975a
+  data.tar.gz: 3af3637c333eafe0723e8f695abcb0c1385c37bb089ac285375ea38b4975f7f1bec3e6381b1cfc53b53f280462d0aa4f52e23928b7ca47b199a22861b5ea1c2e

data/lib/forty_facets/filter/facet_filter_definition.rb

@@ -25,7 +25,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)
@@ -101,7 +101,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
@@ -138,7 +138,7 @@ module FortyFacets
                   .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

data/lib/forty_facets/version.rb

@@ -1,3 +1,3 @@
 module FortyFacets
-  VERSION = "0.1.9.0"
+  VERSION = "0.1.9.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

@@ -2,8 +2,9 @@ require 'coveralls'
 Coveralls.wear!
 
 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
@@ -192,6 +193,20 @@ class SmokeTest < Minitest::Test
     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 = 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)

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forty_facets
 version: !ruby/object:Gem::Version
-  version: 0.1.9.0
+  version: 0.1.9.1
 platform: ruby
 authors:
 - Axel Tetzlaff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,8 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Library for building facet searches for active_record models