forty_facets 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ebaa1971ee0830ae8723e8eec222fa2f4ea9227
-  data.tar.gz: c6d056a6e4714b5aa21715fed17587cc467129fb
+  metadata.gz: c197c09ed3710813587e8fe9c937a581290470bd
+  data.tar.gz: 5b26596384c560a48a4bd823f2895afcf540582d
 SHA512:
-  metadata.gz: 1fd1e8a57e598c2c5216a77a81824514c4a56e3bae3b54223b8cab467b60ed3eb63cf9b3e2cf4b979ad2bcff6a800fa5616f6eb78a0e1be7bb8c069325605c5f
-  data.tar.gz: d960db30251ddbd60848c5dbba003631790018b4c3d24eddff4357f8ef32a7da7628550a2327a59ebef9cbe6b3b85bf4010c1ee2a5e4f2a8bbd0321a93276117
+  metadata.gz: 2ed2ec2abcd495e4bd0c0984f94be6164bc1f196907f07ae71e00ef28e836c43e8175ff65bf5bb1d82aa67fd65c9f6195e41489897784f05a0fa56049650fec9
+  data.tar.gz: 3b6f68acb231546772f9cc886e651178929b72cdd42dfb0623203a9eddd1f29b62a78103724933d7db3e843fe4dce01a14c67bd0dab7f2d13cb78fe1b9e69e15

data/README.md

@@ -38,7 +38,7 @@ Or install it yourself as:
 
 You can clone a working example at https://github.com/fortytools/forty_facets_demo
 
-If you have Movies with a textual title, categotized by genre, studio and year ..
+If you have Movies with a textual title, categotized by genre, studio and year with studios belonging to a country...
 
     class Movie < ActiveRecord::Base
       belongs_to :year
@@ -58,6 +58,7 @@ class HomeController < ApplicationController
     facet :year, name: 'Releaseyear', order: :year # additionally order values in the year field
     facet :studio, name: 'Studio', order: :name
     facet :genres, name: 'Genre' # generate a filter with all values of 'genre' occuring in the result
+    facet [:studio, :country], name: 'Country' # generate a filter several belongs_to 'hops' away
 
     orders 'Title' => :title,
            'price, cheap first' => "price asc",

data/lib/forty_facets/facet_search.rb

@@ -32,15 +32,19 @@ module FortyFacets
       end
 
       def facet(model_field, opts = {})
-        reflection = self.root_class.reflect_on_association(model_field)
-        if reflection
-          if reflection.macro == :belongs_to
-            definitions << BelongsToFilterDefinition.new(self, model_field, opts)
+        if model_field.is_a? Array
+          definitions << BelongsToChainFilterDefinition.new(self, model_field, opts)
+        else
+          reflection = self.root_class.reflect_on_association(model_field)
+          if reflection
+            if reflection.macro == :belongs_to
+              definitions << BelongsToFilterDefinition.new(self, model_field, opts)
+            else
+              definitions << HasManyFilterDefinition.new(self, model_field, opts)
+            end
           else
-            definitions << HasManyFilterDefinition.new(self, model_field, opts)
+            definitions << AttributeFilterDefinition.new(self, model_field, opts)
           end
-        else
-          definitions << AttributeFilterDefinition.new(self, model_field, opts)
         end
       end
 
@@ -93,7 +97,7 @@ module FortyFacets
 
     def filter(filter_name)
       filter = @filters.find { |f| f.filter_definition.model_field == filter_name }
-      raise "unknown filter #{filter_name}" unless filter
+      raise "Unknown filter #{filter_name}" unless filter
       filter
     end
 

data/lib/forty_facets/filter/belongs_to_chain_filter_definition.rb

@@ -0,0 +1,79 @@
+module FortyFacets
+  class BelongsToChainFilterDefinition < FilterDefinition
+    class BelongsToChainFilter < FacetFilter
+      def association
+        current_association = nil
+        current_class = filter_definition.search.root_class
+
+        filter_definition.model_field.each do |field|
+          current_association = current_class.reflect_on_association(field)
+          current_class = current_association.klass
+        end
+
+        current_association
+      end
+
+      # class objects in this filter
+      def klass
+        association.klass
+      end
+
+      def selected
+        @selected ||= klass.find(values)
+      end
+
+      def joins
+        fields = filter_definition.model_field
+        fields.reverse.drop(1).inject(fields.last) { |a, n| { n => a } }
+      end
+
+      def build_scope
+        return Proc.new { |base| base } if empty?
+
+        Proc.new do |base|
+          condition = {association.klass.table_name => {id: values}}
+          base.joins(joins).where(condition)
+        end
+      end
+
+      def facet
+        my_column = association.association_foreign_key
+        counts = without.result.reorder('').joins(joins).select("#{my_column} AS foreign_id, count(#{my_column}) AS occurrences").group(my_column)
+        entities_by_id = klass.find(counts.map(&:foreign_id)).group_by(&:id)
+
+        facet = counts.map do |count|
+          facet_entity = entities_by_id[count.foreign_id].first
+          is_selected = selected.include?(facet_entity)
+          FacetValue.new(facet_entity, count.occurrences, is_selected)
+        end
+
+        order_facet!(facet)
+      end
+
+      def remove(entity)
+        new_params = search_instance.params || {}
+        old_values = new_params[filter_definition.request_param]
+        old_values.delete(entity.id.to_s)
+        new_params.delete(filter_definition.request_param) if old_values.empty?
+        search_instance.class.new_unwrapped(new_params, search_instance.root)
+      end
+
+      def add(entity)
+        new_params = search_instance.params || {}
+        old_values = new_params[filter_definition.request_param] ||= []
+        old_values << entity.id.to_s
+        search_instance.class.new_unwrapped(new_params, search_instance.root)
+      end
+
+    end
+
+    def build_filter(search_instance, param_value)
+      BelongsToChainFilter.new(self, search_instance, param_value)
+    end
+
+    def request_param
+      model_field.join('-')
+    end
+
+  end
+end

data/lib/forty_facets/version.rb

@@ -1,3 +1,3 @@
 module FortyFacets
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/forty_facets.rb

@@ -8,6 +8,7 @@ require "forty_facets/order"
 require "forty_facets/filter"
 require "forty_facets/filter_definition"
 require "forty_facets/filter/belongs_to_filter_definition"
+require "forty_facets/filter/belongs_to_chain_filter_definition"
 require "forty_facets/filter/has_many_filter_definition"
 require "forty_facets/filter/range_filter_definition"
 require "forty_facets/filter/text_filter_definition"

data/test/fixtures.rb

@@ -5,8 +5,12 @@ ActiveRecord::Base.logger = Logger.new(nil)
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 
 ActiveRecord::Schema.define do
+  create_table :countries do |t|
+    t.string :name
+  end
 
   create_table :studios do |t|
+    t.integer :country_id
     t.string :name
   end
 
@@ -55,7 +59,11 @@ end
 class Genre < ActiveRecord::Base
 end
 
+class Country < ActiveRecord::Base
+end
+
 class Studio < ActiveRecord::Base
+  belongs_to :country
 end
 
 class Movie < ActiveRecord::Base
@@ -65,9 +73,14 @@ class Movie < ActiveRecord::Base
   has_and_belongs_to_many :writers
 end
 
+countries = []
+%w{US UK}.each do |code|
+  countries << Country.create!(name: code)
+end
+
 studios = []
-%w{A B C D}.each do |suffix|
-  studios << Studio.create!(name: "Studio #{suffix}")
+%w{A B C D}.each_with_index do |suffix, index|
+  studios << Studio.create!(name: "Studio #{suffix}", country: countries[index % countries.length])
 end
 
 genres = []

data/test/smoke_test.rb

@@ -20,6 +20,7 @@ class MovieSearch < FortyFacets::FacetSearch
   facet :actors, name: 'Actor'
   range :price, name: 'Price'
   facet :writers, name: 'Writer'
+  facet [:studio, :country], name: 'Country'
 end
 
 class SmokeTest < Minitest::Test
@@ -43,6 +44,24 @@ class SmokeTest < Minitest::Test
     assert_equal Movie.count, facet.map(&:count).sum
   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
+    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
+    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])
+    assert_equal [Country.first], filter.selected
+
+    assert_equal Movie.count / 2, filter.facet.reject(&:selected).first.count
+  end
+
   def test_year_add_remove_filter
 
     search = MovieSearch.new()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forty_facets
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Axel Tetzlaff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,6 +116,7 @@ files:
 - lib/forty_facets/facet_search.rb
 - lib/forty_facets/filter.rb
 - lib/forty_facets/filter/attribute_filter_definition.rb
+- lib/forty_facets/filter/belongs_to_chain_filter_definition.rb
 - lib/forty_facets/filter/belongs_to_filter_definition.rb
 - lib/forty_facets/filter/has_many_filter_definition.rb
 - lib/forty_facets/filter/range_filter_definition.rb