forty_facets 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b54d204cd2d065b23eb81feaffc7e44b7939caf8
-  data.tar.gz: 20cd3b0ecfa3d99190d86188405c385e0b20c1fa
+  metadata.gz: d0157fd29f68efb12148913e676a698b97cb7893
+  data.tar.gz: b93043b78dd717e0c0d42315931d287a06e16670
 SHA512:
-  metadata.gz: 8766e626bcc171d0d1ca27f8e138b2cf98ea5852dc6fcbca58349060aa27941caa2888c343ed102dbc797da664a2e7bfbf86dc92c96dcc1534a4e0401880c7c6
-  data.tar.gz: 4b9220bd040166462ba4ad4ae684908b71a6b8af46c0b9eec6d5a916b2781cd87be12a709294e7ad1bde506a85f983dd08248d704056879c2dce58511604bc6f
+  metadata.gz: b683cffff5b2154881af6d062bebb88e75f7f7c7d21dd07119645bb8a91067e37de4b20ad499f55132cf01a5a2fe785c73ab4b4f47795f1ed6d65c9a9b471848
+  data.tar.gz: 6c47c65896b8920c463e23438a335cc43d2c662718a613825987e261f57302ea3dd7767e0f36eb0f318c08f2b6ff7d903f093c55f417a780f56cc14b1cc033ca

data/lib/forty_facets/facet_search.rb

@@ -115,11 +115,16 @@ module FortyFacets
       @orders.find(&:active)
     end
 
-    def result
-      query = @filters.inject(root) do |previous, filter|
+    def result(skip_ordering: false)
+      query = @filters.reject(&:empty?).inject(root) do |previous, filter|
         filter.build_scope.call(previous)
       end
-      query = query.order(order.definition.clause) if order
+
+      if order && !skip_ordering
+        query = order.apply(query)
+      else
+        query = query.distinct
+      end
       query
     end
 

data/lib/forty_facets/filter/facet_filter_definition.rb

@@ -27,7 +27,7 @@ module FortyFacets
 
     class AssociationFacetFilter < FacetFilter
       def selected
-        @selected ||= definition.association.klass.find(values)
+        @selected ||= definition.association.klass.find(Array.wrap(values).reject(&:blank?))
       end
 
       def remove(entity)
@@ -57,19 +57,14 @@ module FortyFacets
       def build_scope
         return Proc.new { |base| base } if empty?
         Proc.new do |base|
-          result = base.joins(definition.joins).where(definition.qualified_column_name => value)
-          if definition.joins
-            result = result.distinct
-          end
-
-          result
+          base.joins(definition.joins).where(definition.qualified_column_name => value)
         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 = without.result(skip_ordering: true).distinct.joins(definition.joins).select(query).group(my_column)
         counts.includes_values = []
         facet = counts.map do |c|
           is_selected = selected.include?(c.facet_value)
@@ -100,19 +95,14 @@ module FortyFacets
       def build_scope
         return Proc.new { |base| base } if empty?
         Proc.new do |base|
-          result = base.joins(definition.joins).where(definition.qualified_column_name => values)
-          if definition.joins
-            result = result.distinct
-          end
-
-          result
+          base.joins(definition.joins).where(definition.qualified_column_name => values)
         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 = 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)
 
@@ -136,7 +126,7 @@ module FortyFacets
 
           matches_from_facet = base.joins(definition.joins).where("#{definition.association.klass.table_name}.#{definition.association.klass.primary_key}" => values).select(primary_key_column)
 
-          base.joins(definition.joins).where(primary_key_column => matches_from_facet).distinct
+          base.joins(definition.joins).where(primary_key_column => matches_from_facet)
         end
       end
 
@@ -145,8 +135,8 @@ module FortyFacets
         join_name =  [definition.association.name.to_s, base_table.to_s].sort.join('_')
         foreign_id_col = definition.association.name.to_s.singularize + '_id'
         my_column = join_name + '.' + foreign_id_col
-        counts = without.result
-                  .reorder('')
+        counts = without.result(skip_ordering: true)
+                  .distinct
                   .joins(definition.joins)
                   .select("#{my_column} as foreign_id, count(#{my_column}) as occurrences")
                   .group(my_column)

data/lib/forty_facets/order.rb

@@ -11,6 +11,38 @@ module FortyFacets
       new_params[:order] = definition.request_value
       search.class.new_unwrapped(new_params, search.root)
     end
+
+    def apply(query)
+      if [Symbol, String, Hash].include? definition.clause.class
+        query.order(definition.clause)
+      elsif definition.clause.is_a? Array # [:person, :first_name]
+        # new and unelegant handling of ordering by columns from joined tables
+        root_table = search.class.root_class.table_name
+        primary_key = search.class.root_class.primary_key
+        just_ids = query.select("#{root_table}.#{primary_key}")
+        path_to_order_property = definition.clause
+        order_class = path_to_order_property
+                      .take(path_to_order_property.length - 1)
+                      .inject(search.class.root_class) do |prev_class, assoc_name|
+                        prev_class.reflect_on_association(assoc_name).klass
+                      end
+        joins = path_to_order_property
+                  .reverse
+                  .drop(1)
+                  .inject(nil) do |sum, elem|
+                    if sum
+                      {elem => sum}
+                    else
+                      elem
+                    end
+                  end
+        search.root
+          .joins(joins)
+          .where(search.class.root_class.primary_key => just_ids)
+          .order("#{order_class.table_name}.#{path_to_order_property.last}")
+      end
+
+    end
   end
 end
 

data/lib/forty_facets/version.rb

@@ -1,3 +1,3 @@
 module FortyFacets
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forty_facets
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Axel Tetzlaff