scoped_search 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed2cb536ff3e9eb2ae79adb69c0d16deded93503
-  data.tar.gz: d71fcf06f4526cca6f0f74c674b700c63cc53710
+  metadata.gz: 31cbd8d30fd85c320926ca1ee4719f98e2860211
+  data.tar.gz: c502bfc5ef2f14ad4aec19b253b6e9942d316236
 SHA512:
-  metadata.gz: 574ce08bfd3a7e6910c52b814c5c0b977e6de7675a80dc53b971915e2fe4619a9e82453dcdafa547d66ff9a6464737a0b26e935ebd4f2f78121ff0061a5096b2
-  data.tar.gz: 0adcf62f38857c13dd4e49c835b4cfe33821ddf273f5e190ccd557b279ca49512d35700a05549ca9b8eb2c332e73c0ae501daa7fbbccb10da4b5b8720f30429a
+  metadata.gz: 018d005d707959d03cabee90cca7c17450e719fe0e6a32124d153e21f709980b7aae8f98be22a2620531d3c07ebacc32e8de8889ef13165e98de4c9162ef9cf0
+  data.tar.gz: 4b6997024cb1e5ee01d3c7bc41a34b1ac31f77eae6e09ce885087645f5b530f264baeab5fd74c302ac7a42b38c45fc2740f81741ad03f6cc0ee39adda9cc89bd

data/CHANGELOG.rdoc

@@ -8,6 +8,10 @@ Please add an entry to the "Unreleased changes" section in your pull requests.
 
 *Nothing yet*
 
+=== Version 4.1.2
+
+- Bugfix related to using polymorphic relations introduced in 4.1.1 (#170)
+
 === Version 4.1.1
 
 - Bugfix related to quoting when building autocomplete queries for date fields (#167)

data/lib/scoped_search/query_builder.rb

@@ -262,17 +262,22 @@ module ScopedSearch
     def has_many_through_join(field)
       many_class = field.definition.klass
       through = definition.reflection_by_name(many_class, field.relation).options[:through]
+      through_class = definition.reflection_by_name(many_class, through).klass
 
       connection = many_class.connection
 
       # table names
       endpoint_table_name = field.klass.table_name
       many_table_name = many_class.table_name
-      middle_table_name = definition.reflection_by_name(many_class, through).klass.table_name
+      middle_table_name = through_class.table_name
 
       # primary and foreign keys + optional conditions for the joins
       pk1, fk1   = field.reflection_keys(definition.reflection_by_name(many_class, through))
-      condition_many_to_middle = field.reflection_conditions(definition.reflection_by_name(field.klass, many_table_name))
+      condition_many_to_middle = if with_polymorphism?(many_class, field.klass, through, through_class)
+                                   field.reflection_conditions(definition.reflection_by_name(field.klass, many_table_name))
+                                 else
+                                   ''
+                                 end
       condition_middle_to_end = field.reflection_conditions(definition.reflection_by_name(field.klass, middle_table_name))
 
       # primary and foreign keys + optional condition for the endpoint to middle join
@@ -289,6 +294,13 @@ module ScopedSearch
       SQL
     end
 
+    def with_polymorphism?(many_class, endpoint_class, through, through_class)
+      reflections = [definition.reflection_by_name(endpoint_class, through), definition.reflection_by_name(many_class, through)].compact
+      as = reflections.map(&:options).compact.map { |opt| opt[:as] }.compact
+      return false if as.empty?
+      definition.reflection_by_name(through_class, as.first).options[:polymorphic]
+    end
+
     # This module gets included into the Field class to add SQL generation.
     module Field
 

data/lib/scoped_search/version.rb

@@ -1,3 +1,3 @@
 module ScopedSearch
-  VERSION = "4.1.1"
+  VERSION = "4.1.2"
 end

data/spec/integration/relation_querying_spec.rb

@@ -479,11 +479,11 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         ActiveRecord::Migration.create_table(:user_groups) { |t| t.integer :user_id; t.integer :group_id }
         ActiveRecord::Migration.create_table(:conflicts) { |t| t.integer :group_id; t.integer :user_id }
         ActiveRecord::Migration.create_table(:groups) { |t| t.string :related; t.integer :user_id }
-        ActiveRecord::Migration.create_table(:users) { |t| t.string :foo; t.string :user_type }
+        ActiveRecord::Migration.create_table(:users) { |t| t.string :foo }
 
         # The related classes
         class UserGroup < ActiveRecord::Base; belongs_to :user; belongs_to :group; end
-        class Conflict < ActiveRecord::Base; belongs_to :user, :polymorphic => true; belongs_to :group; end
+        class Conflict < ActiveRecord::Base; belongs_to :user; belongs_to :group; end
         class Group < ActiveRecord::Base
           has_many :user_groups
           has_many :users, :through => :conflicts, :source_type => 'User', :source => :user
@@ -497,9 +497,9 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
           scoped_search :relation => :groups, :on => :related
         end
 
-        @user_1 = User.create!(:foo => 'foo', :user_type => 'User')
-        @user_2 = User.create!(:foo => 'foo too', :user_type => 'User')
-        @user_3 = User.create!(:foo => 'foo three',  :user_type => 'User')
+        @user_1 = User.create!(:foo => 'foo')
+        @user_2 = User.create!(:foo => 'foo too')
+        @user_3 = User.create!(:foo => 'foo three')
 
         @group_1 = Group.create(:related => 'value')
         @group_2 = Group.create(:related => 'value too!')
@@ -581,16 +581,29 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
     context 'querying a :has_many => :through with polymorphism' do
       before do
         ActiveRecord::Migration.create_table(:subnets) { |t| t.string :name }
+        ActiveRecord::Migration.create_table(:domains) { |t| t.string :name }
         ActiveRecord::Migration.create_table(:taxable_taxonomies) { |t| t.integer :taxable_id; t.integer :taxonomy_id; t.string :taxable_type }
         ActiveRecord::Migration.create_table(:taxonomies) { |t| t.string :type; t.string :name }
 
+        module Taxonomix
+          def self.included(base)
+            base.class_eval do
+              has_many :taxable_taxonomies, :as => :taxable
+              has_many :locations, -> { where(:type => 'Location') }, :through => :taxable_taxonomies, :source => :taxonomy
+              has_many :organizations, -> { where(:type => 'Organization') }, :through => :taxable_taxonomies, :source => :taxonomy
+
+              scoped_search :relation => :locations, :on => :id, :rename => :location_id
+              scoped_search :relation => :organizations, :on => :id, :rename => :organization_id
+            end
+          end
+        end
+
         class Subnet < ActiveRecord::Base
-          has_many :taxable_taxonomies, :as => :taxable
-          has_many :locations, -> { where(:type => 'Location') }, :through => :taxable_taxonomies, :source => :taxonomy
-          has_many :organizations, -> { where(:type => 'Organization') }, :through => :taxable_taxonomies, :source => :taxonomy
+          include Taxonomix
+        end
 
-          scoped_search :relation => :locations, :on => :id, :rename => :location_id
-          scoped_search :relation => :organizations, :on => :id, :rename => :organization_id
+        class Domain < ActiveRecord::Base
+          include Taxonomix
         end
 
         class TaxableTaxonomy < ActiveRecord::Base
@@ -614,15 +627,23 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         @subnet_a = Subnet.create!(:name => 'Subnet A')
         @subnet_b = Subnet.create!(:name => 'Subnet B')
 
+        @domain_a = Domain.create!(:name => 'Domain A')
+        @domain_b = Domain.create!(:name => 'Domain B')
 
         TaxableTaxonomy.create!(:taxable_id => @subnet_a.id, :taxonomy_id => @loc_a.id, :taxable_type => 'Subnet')
         TaxableTaxonomy.create!(:taxable_id => @subnet_b.id, :taxonomy_id => @loc_b.id, :taxable_type => 'Subnet')
         TaxableTaxonomy.create!(:taxable_id => @subnet_a.id, :taxonomy_id => @org_a.id, :taxable_type => 'Subnet')
-        TaxableTaxonomy.create!(:taxable_id => @subnet_b.id, :taxonomy_id => @loc_b.id, :taxable_type => 'Subnet')
+        TaxableTaxonomy.create!(:taxable_id => @subnet_b.id, :taxonomy_id => @org_b.id, :taxable_type => 'Subnet')
+
+        TaxableTaxonomy.create!(:taxable_id => @domain_a.id, :taxonomy_id => @loc_a.id, :taxable_type => 'Domain')
+        TaxableTaxonomy.create!(:taxable_id => @domain_b.id, :taxonomy_id => @loc_b.id, :taxable_type => 'Domain')
+        TaxableTaxonomy.create!(:taxable_id => @domain_a.id, :taxonomy_id => @org_a.id, :taxable_type => 'Domain')
+        TaxableTaxonomy.create!(:taxable_id => @domain_b.id, :taxonomy_id => @org_b.id, :taxable_type => 'Domain')
       end
 
       after do
         ActiveRecord::Migration.drop_table :subnets
+        ActiveRecord::Migration.drop_table :domains
         ActiveRecord::Migration.drop_table :taxable_taxonomies
         ActiveRecord::Migration.drop_table :taxonomies
       end
@@ -635,5 +656,69 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         Subnet.search_for("organization_id = #{@org_a.id}").length.should == 1
       end
     end
+
+    context 'querying with multiple :has_many => :through and polymorphism' do
+      before do
+        ActiveRecord::Migration.create_table(:usergroups) { |t| t.string :name }
+        ActiveRecord::Migration.create_table(:usergroup_members) { |t| t.integer :usergroup_id; t.integer :member_id; t.string :member_type }
+        ActiveRecord::Migration.create_table(:usermats) { |t| t.string :username }
+        ActiveRecord::Migration.create_table(:cached_usergroup_members) { |t| t.integer :usergroup_id; t.integer :usermat_id }
+
+        class Usergroup < ActiveRecord::Base
+          has_many :usergroup_members
+          has_many :usermats, :through => :usergroup_members, :source => :member, :source_type => 'Usermat'
+          has_many :usergroups, :through => :usergroup_members, :source => :member, :source_type => 'Usergroup'
+
+          has_many :cached_usergroup_members
+          has_many :cached_usergroups, :through => :cached_usergroup_members, :source => :usergroup
+          has_many :cached_usergroup_members, :foreign_key => 'usergroup_id'
+        end
+
+        class UsergroupMember < ActiveRecord::Base
+          belongs_to :member, :polymorphic => true
+          belongs_to :usergroup
+        end
+
+        class Usermat < ActiveRecord::Base
+          has_many :usergroup_member, :as => :member
+          has_many :cached_usergroup_members
+          has_many :cached_usergroups, :through => :cached_usergroup_members, :source => :usergroup
+
+          scoped_search :relation => :cached_usergroups, :on => :name, :rename => :usergroup_name
+        end
+
+        class CachedUsergroupMember < ActiveRecord::Base
+          belongs_to :usermat
+          belongs_to :usergroup
+        end
+
+        @group_1 = Usergroup.create!(:name => 'first')
+        @group_2 = Usergroup.create!(:name => 'second')
+        @group_3 = Usergroup.create!(:name => 'third')
+        @group_4 = Usergroup.create!(:name => 'fourth')
+
+        @usermat_1 = Usermat.create(:username => 'user A')
+        @usermat_2 = Usermat.create(:username => 'user B')
+
+        UsergroupMember.create!(:usergroup_id => @group_2.id, :member_id => @group_3.id, :member_type => 'Usergroup')
+        UsergroupMember.create!(:usergroup_id => @group_1.id, :member_id => @usermat_2, :member_type => 'Usermat')
+        UsergroupMember.create!(:usergroup_id => @group_4.id, :member_id => @usermat_1, :member_type => 'Usermat')
+
+        CachedUsergroupMember.create!(:usergroup_id => @group_1.id, :usermat_id => @usermat_1.id)
+      end
+
+      after do
+        ActiveRecord::Migration.drop_table :usergroups
+        ActiveRecord::Migration.drop_table :usergroup_members
+        ActiveRecord::Migration.drop_table :usermats
+        ActiveRecord::Migration.drop_table :cached_usergroup_members
+      end
+
+      it "should find the usermat when searching on usergroup" do
+        result = Usermat.search_for("usergroup_name = #{@group_1.name}")
+        result.length.should == 1
+        result.first.username.should == @usermat_1.username
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Amos Benari
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord