forty_facets 0.0.14 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45710d05be44d2f782e28be3b437560bd1719854
-  data.tar.gz: d26a2f029858f02ac4f2420843330119f715cbe7
+  metadata.gz: 2775c3dbeacb02d6a306671c1f46306f03baaa7c
+  data.tar.gz: 007b804dc78ebe61b1aff29a41f276f2986d62ed
 SHA512:
-  metadata.gz: 84d1706a3e43d31733b6cc3d47eb10e6e07b1e4b259f37e1430d682e0ef8ed629752f52b160d01cebac6d34e5124599d7ab0a919a48f031ce8205738a087ada2
-  data.tar.gz: 999adefbe1effdfebf2035c0e417f7e8707adcdd44f7e9cec294d8d4e0638d969be3063295935e953242a3190829ca09e925af8e924816cdbb9252dd4b8bb25d
+  metadata.gz: 86d860f3463b9c264010489f2520cf4ac8e216f7f2cfe94ba0e1a5839439e1d799275ccc88281636e5b6a1f0911f26744a826e0a9ca93929eb6c0fb68082800b
+  data.tar.gz: 51c6d45ef8c18c8185d142baac5cbb7bccc1cd54888fb2453f7157d9559657b86d151fc72b5da83bf0cb708c456f2691a593b66210b8e63b2f39392a9507489f

data/forty_facets.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "activerecord", "= 4.1.0"
-  # spec.add_development_dependency "byebug" # travis doenst like byebug
+  #spec.add_development_dependency "byebug" # travis doenst like byebug
 end

data/lib/forty_facets/facet_search.rb

@@ -40,6 +40,10 @@ module FortyFacets
         definitions << FacetFilterDefinition.new(self, path, opts)
       end
 
+      def sql_facet(queries, opts = {})
+        definitions << SqlFacetFilterDefinition.new(self, queries, opts)
+      end
+
       def orders(name_and_order_options)
         @order_definitions = name_and_order_options.to_a.inject([]) {|ods, no| ods << OrderDefinition.new(no.first, no.last)}
       end

data/lib/forty_facets/filter/sql_facet_filter_definition.rb

@@ -0,0 +1,94 @@
+module FortyFacets
+  class SqlFacetFilterDefinition < FilterDefinition
+    attr_reader(:queries)
+
+    def initialize(search, queries, opts)
+      @search = search
+      @queries = queries
+      @path = Array(opts[:path]) if opts[:path].present?
+      @path ||= @queries.keys
+      @options = opts
+    end
+
+    def request_param
+      path.join("-")
+    end
+
+    def build_filter(search_instance, param_value)
+      ScopeFacetFilter.new(self, search_instance, param_value)
+    end
+
+    class ScopeFacetFilter < Filter
+      def values
+        @values ||= Array.wrap(value).sort.uniq
+      end
+
+      def build_scope
+        return Proc.new { |base| base } if empty?
+
+        Proc.new do |base|
+          # intersection of values and definition queries
+          base.where(selected_queries.values.map do |query|
+            "(#{query})" 
+          end.join(" OR "))
+        end
+      end
+
+      def selected
+        values
+      end
+
+      def remove(value)
+        new_params = search_instance.params || {}
+        old_values = new_params[definition.request_param]
+        old_values.delete(value.to_s)
+        new_params.delete(definition.request_param) if old_values.empty?
+        search_instance.class.new_unwrapped(new_params, search_instance.root)
+      end
+
+      def add(value)
+        new_params = search_instance.params || {}
+        old_values = new_params[definition.request_param] ||= []
+        old_values << value.to_s
+        search_instance.class.new_unwrapped(new_params, search_instance.root)
+      end
+
+      def facet
+        query = definition.queries.map do |key, sql_query|
+          "(#{sql_query}) as #{key}" 
+        end.join(", ")
+        query += ", count(*) as occurrences"
+
+        counts = without.result.reorder("")
+          .select(query)
+          .group(definition.queries.keys)
+        counts.includes_values = []
+
+        result = {}
+
+        counts.map do |count|
+          definition.queries.each do |key, _|
+            result[key] ||= 0
+            if [1, "1", true].include?(count[key])
+              result[key] += count.occurrences
+            end
+          end
+        end
+
+        result.map do |key, count|
+          key = key.to_sym
+          is_selected = selected_queries.keys.include?(key)
+          FacetValue.new(key, count, is_selected)
+        end
+      end
+
+      private
+
+      def selected_queries
+        @selected_queries ||= definition.queries.select do |key, _|
+          values.map(&:to_sym).include? key
+        end
+      end
+    end
+  end
+end

data/lib/forty_facets/version.rb

@@ -1,3 +1,3 @@
 module FortyFacets
-  VERSION = "0.0.14"
+  VERSION = "0.1.0"
 end

data/lib/forty_facets.rb

@@ -10,4 +10,5 @@ require "forty_facets/filter_definition"
 require "forty_facets/filter/range_filter_definition"
 require "forty_facets/filter/text_filter_definition"
 require "forty_facets/filter/facet_filter_definition"
+require "forty_facets/filter/sql_facet_filter_definition"
 require "forty_facets/facet_search"

data/test/fixtures.rb

@@ -86,6 +86,9 @@ class Movie < ActiveRecord::Base
   has_and_belongs_to_many :genres
   has_and_belongs_to_many :actors
   has_and_belongs_to_many :writers
+
+  scope :classics, -> { where("year <= ?", 1980) }
+  scope :non_classics, -> { where("year > ?", 1980) }
 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}
@@ -133,7 +136,8 @@ end
 
 rand = Random.new
 LOREM.each_with_index do |title, index|
-  m = Movie.create!(title: title, studio: studios[index % studios.length], price: rand.rand(20.0), year: (index%3 + 2010) )
+  m = Movie.create!(title: title, studio: studios[index % studios.length],
+                    price: rand.rand(20.0), year: (index + 1975))
   3.times do
     actor = actors[rand(actors.length)]
     unless m.actors.include? actor

data/test/smoke_test.rb

@@ -23,6 +23,10 @@ class MovieSearch < FortyFacets::FacetSearch
   facet [:studio, :country], name: 'Country'
   facet [:studio, :status], name: 'Studio status'
   facet [:studio, :producers], name: 'Producers'
+  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'
 end
 
@@ -33,6 +37,50 @@ class SmokeTest < Minitest::Test
     assert_equal Movie.all.size, search.result.size
   end
 
+  def test_scope_filter
+    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" })
+    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" })
+    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"] })
+    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" => {})
+    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)
+
+    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)
+
+    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)
+
+    search = MovieSearch.new("search" => { "classic-non_classic" => ["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)
+  end
+
   def test_text_filter
     search = MovieSearch.new({'search' => { 'title' => 'ipsum' }})
     assert_equal 1, search.result.size

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forty_facets
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.1.0
 platform: ruby
 authors:
 - Axel Tetzlaff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,6 +117,7 @@ files:
 - lib/forty_facets/filter.rb
 - lib/forty_facets/filter/facet_filter_definition.rb
 - lib/forty_facets/filter/range_filter_definition.rb
+- lib/forty_facets/filter/sql_facet_filter_definition.rb
 - lib/forty_facets/filter/text_filter_definition.rb
 - lib/forty_facets/filter_definition.rb
 - lib/forty_facets/order.rb