forty_facets 0.1.8 → 0.1.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 914d7f9d2fa6d7db93c59f23553498fac3729beb
-  data.tar.gz: b135c7d3f2792503872fdbc8df95ae0a6010b9ea
+SHA256:
+  metadata.gz: ce24e462cc7ee4e339d052120807239c0e4406faa14c2be784ae41548bcbc18a
+  data.tar.gz: ab5d0fa8bf95ca88d5071ae74084bf56c3baae9c4a9af40dbd10fd5bf6f29132
 SHA512:
-  metadata.gz: 2336fb3607d0aa4d38551451f20b10e38b18936b1f7c0854c0419694d49f5dd0d59f875b58c6949bf51ca67d9c876cf24d67665577627ebb0fa17e7483906b54
-  data.tar.gz: a28eebb1677fc78b32aab48b859dd16ac316be6dda8f7f3d4b770f9fc7cf3c56b59542e9c7af0aa859aee101e963628275e1ab7c103a63037e3666e2dcd29aa8
+  metadata.gz: 3e49b4403a1be6a802f1f9e492ca8753a64ee0d1bc5f39b1c254880b3f75baf7e52448cc81e7f530c37e59a6a5c9e5067fcb537bbe9a7b99fd0f7753c96c90b3
+  data.tar.gz: 585d41f4b4b55c09c8af4a51ac755951174c67e528187910e025d001fa147d2e3dd3752c1e2856d04f66c50ac6c09a7fba888363d2d5b2f456003fb0fb3265db

data/.ruby-version

@@ -1 +1 @@
-2.4.0
+2.5.1

data/lib/forty_facets/facet_search.rb

@@ -117,9 +117,14 @@ module FortyFacets
 
     def result(skip_ordering: false)
       query = @filters.reject(&:empty?).inject(root) do |previous, filter|
+        # p 'PREVIOS'
+        # p previous 
+        # p 'FILTER'
+        # p filter 
+        # p '..........'
         filter.build_scope.call(previous)
       end
-
+      
       if order && !skip_ordering
         query = order.apply(query)
       else

data/lib/forty_facets/filter.rb

@@ -3,7 +3,6 @@ module FortyFacets
   # type of filter. Most FilterDefinitions will have their own Filter subclass
   # to control values for display and rendering to request parameters.
   Filter = Struct.new(:definition, :search_instance, :value) do
-
     FacetValue = Struct.new(:entity, :count, :selected)
 
     def name

data/lib/forty_facets/filter/facet_filter_definition.rb

@@ -86,7 +86,6 @@ module FortyFacets
         old_values << value.to_s
         search_instance.class.new_unwrapped(new_params, search_instance.root)
       end
-
     end
 
     class BelongsToFilter < AssociationFacetFilter

data/lib/forty_facets/filter/scope_filter_definition.rb

@@ -2,23 +2,35 @@ module FortyFacets
   class ScopeFilterDefinition < FilterDefinition
     class ScopeFilter < Filter
       def active?
-        value == '1'
+        definition.options[:pass_value] ? value.present? : '1'
+      end
+
+      def selected 
+        [value]
       end
 
       def build_scope
-        return Proc.new { |base| base } unless active?
-        Proc.new {  |base| base.send(definition.path.first) }
+        return proc { |base| base } unless active?
+
+        proc { |base|
+          if definition.options[:pass_value]
+            base.send(definition.path.first, value)  
+          else
+            base.send(definition.path.first) 
+          end
+        }
       end
 
-      def remove
+      # added value to standardize the API even though it's not used
+      def remove(value = nil)
         new_params = search_instance.params || {}
         new_params.delete(definition.request_param)
         search_instance.class.new_unwrapped(new_params, search_instance.root)
       end
 
-      def add
+      def add(value = nil)
         new_params = search_instance.params || {}
-        new_params[definition.request_param] = '1'
+        new_params[definition.request_param] = value
         search_instance.class.new_unwrapped(new_params, search_instance.root)
       end
     end

data/lib/forty_facets/filter/sql_facet_filter_definition.rb

@@ -6,6 +6,7 @@ module FortyFacets
       @search = search
       @queries = queries
       @path = Array(opts[:path]) if opts[:path].present?
+      @joins = Array(opts[:joins]) if opts[:joins].present?
       @path ||= @queries.keys
       @options = opts
     end
@@ -29,7 +30,7 @@ module FortyFacets
         Proc.new do |base|
           # intersection of values and definition queries
           base.where(selected_queries.values.map do |query|
-            "(#{query})" 
+            "(#{query})"
           end.join(" OR "))
         end
       end
@@ -55,13 +56,14 @@ module FortyFacets
 
       def facet
         query = definition.queries.map do |key, sql_query|
-          "(#{sql_query}) as #{key}" 
+          "(#{sql_query}) as #{key}"
         end.join(", ")
         query += ", count(*) as occurrences"
-
+        
         counts = without.result.reorder("")
           .select(query)
           .group(definition.queries.keys)
+        counts = counts.joins(definition.joins) if definition.joins
         counts.includes_values = []
 
         result = {}

data/lib/forty_facets/version.rb

@@ -1,3 +1,3 @@
 module FortyFacets
-  VERSION = "0.1.8"
+  VERSION = "0.1.8.9"
 end

data/test/fixtures.rb

@@ -89,6 +89,7 @@ class Movie < ActiveRecord::Base
 
   scope :classics, -> { where("year <= ?", 1980) }
   scope :non_classics, -> { where("year > ?", 1980) }
+  scope :year_lte, -> (year) { where("year > ?", year) }
 end
 
 LOREM = %w{Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren}

data/test/smoke_test.rb

@@ -23,17 +23,26 @@ class MovieSearch < FortyFacets::FacetSearch
   facet [:studio, :country], name: 'Country'
   facet [:studio, :status], name: 'Studio status'
   facet [: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'
-  scope :classics, 'Name classics'
+  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' => {}})
+    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)]
+  end
+
   def test_it_finds_all_movies
     search = MovieSearch.new({})
     assert_equal Movie.all.size, search.result.size
@@ -270,10 +279,15 @@ class SmokeTest < Minitest::Test
   end
 
   def test_scope_filter
-    search_with_scope = MovieSearch.new().filter(:classics).add
+    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'
+  end
+
   def test_custom_filter
     search = MovieSearch.new
     new_search = search.filter(:needs_complex_filtering).set('foo')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forty_facets
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.8.9
 platform: ruby
 authors:
 - Axel Tetzlaff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Library for building facet searches for active_record models