forty_facets 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a30dbb47b5ea99fedba57a1acc3efd37824e872
-  data.tar.gz: 24b3f40035d9b2ed970c4b1d3146c8d2ee4d8f69
+  metadata.gz: b54d204cd2d065b23eb81feaffc7e44b7939caf8
+  data.tar.gz: 20cd3b0ecfa3d99190d86188405c385e0b20c1fa
 SHA512:
-  metadata.gz: 42450b984c4313fe080c21b305a85686274b695ea06added6dfd99701eba6483afa808f506307cd0a8aea12a44787b362e1206eb98d6067f6f32ae48fdccf99a
-  data.tar.gz: 7c8a314aeb5a6848ffad73c929fd857b39cd4c68b7558142e5b4b6689890fc6173286800d8dc6d00dc63f249e87e9eb342179ea390ae1fd14a4e3011ea9cb247
+  metadata.gz: 8766e626bcc171d0d1ca27f8e138b2cf98ea5852dc6fcbca58349060aa27941caa2888c343ed102dbc797da664a2e7bfbf86dc92c96dcc1534a4e0401880c7c6
+  data.tar.gz: 4b9220bd040166462ba4ad4ae684908b71a6b8af46c0b9eec6d5a916b2781cd87be12a709294e7ad1bde506a85f983dd08248d704056879c2dce58511604bc6f

data/forty_facets.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
   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 "activerecord", "~> 5.0"
+  spec.add_development_dependency "byebug" # travis doenst like byebug
 end

data/lib/forty_facets/filter/facet_filter_definition.rb

@@ -1,3 +1,5 @@
+require 'byebug'
+
 module FortyFacets
   class FacetFilterDefinition < FilterDefinition
 
@@ -129,14 +131,12 @@ module FortyFacets
         return Proc.new { |base| base } if empty?
         Proc.new do |base|
           base_table = definition.origin_class.table_name
-          join_name =  [definition.association.name.to_s, base_table.to_s].sort.join('_')
 
           primary_key_column = "#{base_table}.#{definition.origin_class.primary_key}"
 
-          subquery = base.joins(definition.joins).select(primary_key_column)
-            .where("#{join_name}.#{definition.association.foreign_key}" => values).uniq
+          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 => subquery.select(primary_key_column)).distinct
+          base.joins(definition.joins).where(primary_key_column => matches_from_facet).distinct
         end
       end
 

data/lib/forty_facets/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forty_facets
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Axel Tetzlaff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,30 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: FortyFacets lets you easily build explorative search interfaces based
   on fields of your active_record models.
 email: