forty_facets 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07d361e3522f559519b319bbf9ab5a2cb6fee8c4
-  data.tar.gz: 6a6f27bfd267c8b8a21c9e1ec5b77a2883356995
+  metadata.gz: ac056d5510aee76abee5c3eb5f277b3c8ff2c366
+  data.tar.gz: 55eb83dcb730ba5bbccd72b39bbc78eb2277c584
 SHA512:
-  metadata.gz: 2655be1f82d5586732b1621e870583b5411c58858094f55b80ee5162ebfe17174ee94cafd2c2be0cc13beb974c4190c2bfa643381eea9175059b51bbda75e17c
-  data.tar.gz: 2df7bce842612f53ac3fa3f3b5e33c36c9dbc21e8747cd1e0d526afc80249a7f2c6c797f25cb4f057c2cb0123a231c6419f95bc45b1fe2a9136949906a5d321f
+  metadata.gz: f55aa94c15b85cef3f8450b21f53fa3597942969c6d9c1585e05e46c3ff9645d120114eba9b7b52ddd0bdac309420a9c69c53d4f98062f120f1427ed69c05c86
+  data.tar.gz: 7c62c3913a5f53c7bc5de3f0dc68338b96176821396adc26b83798989ff8f80eb2a80fea3153be199c76ea926a92b46e86705ffc2af76a70a55da0811b490181

data/README.md

@@ -1,12 +1,13 @@
 [![Build Status](https://travis-ci.org/fortytools/forty_facets.svg)](https://travis-ci.org/fortytools/forty_facets)
 [![Coverage Status](https://coveralls.io/repos/fortytools/forty_facets/badge.png?branch=master)](https://coveralls.io/r/fortytools/forty_facets?branch=master)
 [![Code Climate](https://codeclimate.com/github/fortytools/forty_facets.png)](https://codeclimate.com/github/fortytools/forty_facets)
+[![forty_facets API Documentation](https://www.omniref.com/ruby/gems/forty_facets.png)](https://www.omniref.com/ruby/gems/forty_facets)
 
 # FortyFacets
 
 FortyFacets lets you easily build explorative search interfaces based on fields of your ActiveRecord models.
 
-![demo](demo.gif)
+![demo](https://raw.githubusercontent.com/fortytools/forty_facets/master/demo.gif)
 
 See it implemented in a [example rails application](https://github.com/fortytools/forty_facets_demo) or
 try a [working demo](http://forty-facets-demo.herokuapp.com/ "Testinstallation on heroku")!

data/lib/forty_facets/facet_search.rb

@@ -12,7 +12,8 @@ module FortyFacets
   #
   #     orders 'Title' => :title,
   #            'price, cheap first' => "price asc",
-  #            'price, expensive first' => {price: :desc, title: :desc}
+  #            'price, expensive first' => {price: :desc, title: :desc},
+  #            'Title, reverse' => {order: "title desc", default: true}
   #
   #   end
   class FacetSearch
@@ -78,6 +79,11 @@ module FortyFacets
         orders << definition.build(self, params[:order])
       end
 
+      unless @orders.find(&:active)
+        default_order = @orders.find {|o| o.definition.default}
+        default_order.active = true if default_order
+      end
+
       @root = root
     end
 
@@ -100,7 +106,7 @@ module FortyFacets
         filter.build_scope.call(previous)
       end
       query = query.order(order.definition.clause) if order
-      query.uniq
+      query
     end
 
     def wrapped_params
@@ -117,7 +123,7 @@ module FortyFacets
     end
 
     def path
-      unfiltered? ? '?' : '?' + wrapped_params.to_param
+      '?' + wrapped_params.to_param
     end
 
     def unfiltered?
@@ -128,6 +134,10 @@ module FortyFacets
       @root || self.class.root_scope
     end
 
+    def change_root new_root
+      @root = new_root
+    end
+
     private
 
     def request_to_search_params(request_params)

data/lib/forty_facets/filter/facet_filter_definition.rb

@@ -54,13 +54,21 @@ module FortyFacets
 
       def build_scope
         return Proc.new { |base| base } if empty?
-        Proc.new {  |base| base.joins(definition.joins).where(definition.qualified_column_name => value) }
+        Proc.new do |base|
+          result = base.joins(definition.joins).where(definition.qualified_column_name => value)
+          if definition.joins
+            result = result.distinct
+          end
+
+          result
+        end
       end
 
       def facet
         my_column = definition.qualified_column_name
         query = "#{my_column} AS facet_value, count(#{my_column}) AS occurrences"
         counts = without.result.reorder('').joins(definition.joins).select(query).group(my_column)
+        counts.includes_values = []
         facet = counts.map do |c|
           is_selected = selected.include?(c.facet_value)
           FacetValue.new(c.facet_value, c.occurrences, is_selected)
@@ -89,13 +97,21 @@ module FortyFacets
     class BelongsToFilter < AssociationFacetFilter
       def build_scope
         return Proc.new { |base| base } if empty?
-        Proc.new {  |base| base.joins(definition.joins).where(definition.qualified_column_name => values) }
+        Proc.new do |base|
+          result = base.joins(definition.joins).where(definition.qualified_column_name => values)
+          if definition.joins
+            result = result.distinct
+          end
+
+          result
+        end
       end
 
       def facet
         my_column = definition.qualified_column_name
         query = "#{my_column} AS foreign_id, count(#{my_column}) AS occurrences"
         counts = without.result.reorder('').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)
 
         facet = counts.map do |count|
@@ -120,7 +136,7 @@ module FortyFacets
           subquery = base.joins(definition.joins).select(primary_key_column)
             .where("#{join_name}.#{definition.association.foreign_key}" => values).uniq
 
-          base.joins(definition.joins).where(primary_key_column => subquery.select(primary_key_column)).uniq
+          base.joins(definition.joins).where(primary_key_column => subquery.select(primary_key_column)).distinct
         end
       end
 
@@ -134,6 +150,7 @@ module FortyFacets
                   .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)
 
         facet = counts.map do |count|

data/lib/forty_facets/order_definition.rb

@@ -1,6 +1,21 @@
 module FortyFacets
   # Stores the parameters of a order criteria for a search.
-  OrderDefinition = Struct.new(:title, :clause) do
+  class OrderDefinition
+    attr(:title, :clause, :default)
+
+    def initialize title, clause
+      @title = title
+      @clause = clause
+      @default = false
+
+      if clause.is_a? Hash
+        if clause[:order] && clause[:default]
+          @clause = clause[:order]
+          @default = clause[:default]
+        end
+      end
+    end
+
     def build(search, order_param)
       Order.new(search, self, order_param == title.to_s)
     end

data/lib/forty_facets/version.rb

@@ -1,3 +1,3 @@
 module FortyFacets
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/test/smoke_test.rb

@@ -213,4 +213,10 @@ class SmokeTest < Minitest::Test
 
   end
 
+  def test_includes_does_not_blow_up
+    selected_genre = Genre.first
+    search = MovieSearch.new({}, Movie.all.includes(:studio)).filter(:genres).add(selected_genre)
+    search.filter(:studio).facet.reject(&:selected).to_a
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forty_facets
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Axel Tetzlaff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler