scoped_search 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8e91bf7d864d576d7020bd56184d9ed7173e5c3
-  data.tar.gz: 502a182f6303fb040a4b3e77f54d984a85d54093
+  metadata.gz: 3291810a245c631791ecafd20c61946c46f7edc1
+  data.tar.gz: cb14f9b463fa22b0537f48fcda37ecdd836302bc
 SHA512:
-  metadata.gz: ce108bace0ec727d852a4e0d9db9d330bab9d157a4dd985d0bb77e88eff186553462451beaee8fc532ac8d0b95361174b60772511ee7e1016be5c6f3640fe16e
-  data.tar.gz: c5dcd4e411820161628a61cf0485bf457121ba4ab8338f12d3723f83d8a2938bb1b85469eab096bce6f96f9b76bfb65af58723973de9d63f8e996692cfa4c3b4
+  metadata.gz: 43d3a5b905d957079ea970b3f7e936fc453200811edd3017f257fc9f0d052cececffc7ea6e1a4a073ddc909df3b5d0d0b34393aea6c24aebefba69cb4e284f20
+  data.tar.gz: 1fe059d3579a6c51bb3c29c977bd956dc0294c6993098bebb4712ece85854ddead8d7d294ff02fb63914db8020cb9e405a1e864ee4b6ee3776b40251b4aa15ea

data/lib/scoped_search/query_builder.rb

@@ -246,6 +246,16 @@ module ScopedSearch
       end
     end
 
+    def find_has_many_through_association(field, through)
+      middle_table_association = nil
+      field.klass.reflect_on_all_associations(:has_many).each do |reflection| 
+        class_name = reflection.options[:class_name].constantize.table_name if reflection.options[:class_name]
+        middle_table_association = reflection.name if class_name == through.to_s 
+        middle_table_association = reflection.plural_name if reflection.plural_name == through.to_s
+      end
+      middle_table_association
+    end
+
     def has_many_through_join(field)
       many_class = field.definition.klass
       through = definition.reflection_by_name(many_class, field.relation).options[:through]
@@ -261,7 +271,8 @@ module ScopedSearch
       condition1 = field.reflection_conditions(definition.reflection_by_name(field.klass, many_table_name))
 
       # primary and foreign keys + optional condition for the endpoint to middle join
-      pk2, fk2   = field.reflection_keys(definition.reflection_by_name(field.klass, middle_table_name))
+      middle_table_association = find_has_many_through_association(field, through) || middle_table_name
+      pk2, fk2   = field.reflection_keys(definition.reflection_by_name(field.klass, middle_table_association))
       condition2 = field.reflection_conditions(definition.reflection_by_name(many_class, field.relation))
 
       <<-SQL

data/lib/scoped_search/version.rb

@@ -1,3 +1,3 @@
 module ScopedSearch
-  VERSION = "3.2.1"
+  VERSION = "3.2.2"
 end

data/spec/integration/relation_querying_spec.rb

@@ -417,7 +417,113 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       it "should find the 3 tags that are related to dogs record" do
         Tag.search_for('baz').length.should == 3
       end
+    end
+
+
+    context 'querying a :has_many => :through relation with alternate name' do
+
+      before do
+
+        # Create some tables
+        ActiveRecord::Migration.create_table(:zaps) { |t| t.integer :moo_id; t.integer :paz_id }
+        ActiveRecord::Migration.create_table(:pazs) { |t| t.string :related }
+        ActiveRecord::Migration.create_table(:moos) { |t| t.string :foo }   
+
+        # The related classes
+        class Zap < ActiveRecord::Base; belongs_to :paz; belongs_to :moo; end
+        class Paz < ActiveRecord::Base; has_many :other_zaps, :class_name => "Zap", :foreign_key => :paz_id; end
+
+        # The class on which to call search_for
+        class Moo < ActiveRecord::Base
+          has_many :zaps
+          has_many :pazs, :through => :zaps
+
+          scoped_search :in => :pazs, :on => :related
+        end
+
+        @moo_1 = Moo.create!(:foo => 'foo')
+        @moo_2 = Moo.create!(:foo => 'foo too')
+        @moo_3 = Moo.create!(:foo => 'foo three')
+
+        @paz_1 = Paz.create(:related => 'paz')
+        @paz_2 = Paz.create(:related => 'paz too!')
+
+        @bar_1 = Zap.create!(:moo => @moo_1, :paz => @paz_1)
+        @bar_2 = Zap.create!(:moo => @moo_1)
+        @bar_3 = Zap.create!(:moo => @moo_2, :paz => @paz_1)
+        @bar_3 = Zap.create!(:moo => @moo_2, :paz => @paz_2)
+        @bar_3 = Zap.create!(:moo => @moo_2, :paz => @paz_2)
+        @bar_4 = Zap.create!(:moo => @moo_3)
+      end
+
+      after do
+        ActiveRecord::Migration.drop_table(:pazs)
+        ActiveRecord::Migration.drop_table(:zaps)
+        ActiveRecord::Migration.drop_table(:moos)
+      end
+
+      it "should find the two records that are related to a paz record" do
+        Moo.search_for('paz').length.should == 2
+      end
+
+      it "should find the one record that is related to two paz records" do
+        Moo.search_for('related=paz AND related="paz too!"').length.should == 1
+      end
+    end
+
+
+    context 'querying a :has_many => :through relation with modules' do
+
+      before do
+
+        # Create some tables with namespaces
+        ActiveRecord::Migration.create_table(:zan_mars) { |t| t.integer :koo_id; t.integer :baz_id }
+        ActiveRecord::Migration.create_table(:zan_bazs) { |t| t.string :related }
+        ActiveRecord::Migration.create_table(:zan_koos) { |t| t.string :foo }   
+
+        # The related classes
+        module Zan; class Mar < ActiveRecord::Base; belongs_to :baz; belongs_to :koo; self.table_name = "zan_mars"; end; end
+        module Zan; class Baz < ActiveRecord::Base; has_many :mars; self.table_name = "zan_bazs"; end; end
+
+        # The class on which to call search_for
+        module Zan
+          class Koo < ActiveRecord::Base
+            has_many :mars, :class_name => "Zan::Mar"
+            has_many :bazs, :through => :mars
+            self.table_name = "zan_koos"
+
+            scoped_search :in => :bazs, :on => :related
+          end
+        end
 
+        @koo_1 = Zan::Koo.create!(:foo => 'foo')
+        @koo_2 = Zan::Koo.create!(:foo => 'foo too')
+        @koo_3 = Zan::Koo.create!(:foo => 'foo three')
+
+        @baz_1 = Zan::Baz.create(:related => 'baz')
+        @baz_2 = Zan::Baz.create(:related => 'baz too!')
+
+        @bar_1 = Zan::Mar.create!(:koo => @koo_1, :baz => @baz_1)
+        @bar_2 = Zan::Mar.create!(:koo => @koo_1)
+        @bar_3 = Zan::Mar.create!(:koo => @koo_2, :baz => @baz_1)
+        @bar_3 = Zan::Mar.create!(:koo => @koo_2, :baz => @baz_2)
+        @bar_3 = Zan::Mar.create!(:koo => @koo_2, :baz => @baz_2)
+        @bar_4 = Zan::Mar.create!(:koo => @koo_3)
+      end
+
+      after do
+        ActiveRecord::Migration.drop_table(:zan_bazs)
+        ActiveRecord::Migration.drop_table(:zan_mars)
+        ActiveRecord::Migration.drop_table(:zan_koos)
+      end
+
+      it "should find the two records that are related to a baz record" do
+        Zan::Koo.search_for('baz').length.should == 2
+      end
+
+      it "should find the one record that is related to two baz records" do
+        Zan::Koo.search_for('related=baz AND related="baz too!"').length.should == 1
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Amos Benari
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord