scoped_search 2.6.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37c27d6c6a3311a013c5bcaa5558f3d91f7c4443
-  data.tar.gz: f0d713611729611a6d2f0f990982873dad65bb82
+  metadata.gz: 06da166bed055eddce7ceffc6866cf09f339e881
+  data.tar.gz: 50ef26f62b672dd9fc887c47386c43caa6585f77
 SHA512:
-  metadata.gz: 5826b9fe779a5c48da50101a6dc7c52ba756bed745f99d463adeada1f23a1484e127d36ea122a9249f85050597133748655db51900d40160bf9c81a154975ae2
-  data.tar.gz: 6a0a37aeb76ca59e10c07c3e57ac51480dc34e7ef52586026d9db75741da70619fd327061b459ed527e206725b68e47fb0b4c5b012464f13aea8c48a1a053e90
+  metadata.gz: 156b20573d8e35001ca7272a48f756a787b03b1845c002379a73a2f0298823eccd5a58e4395f22ef07aec00626e2184484164d890f301a72f7affc3b1f9d9819
+  data.tar.gz: 4ddf5b25a5fe7b5a3daad3e1d0ff7cddb5f1e309689953b2f7acc53edfd63364461d89e7a179bd3b93c49055ae7885ebaf0a51d9f6a5dddd57f0264454f9af9c

data/lib/scoped_search/query_builder.rb

@@ -356,7 +356,7 @@ module ScopedSearch
       def reflection_conditions(reflection)
         return unless reflection
         conditions = reflection.options[:conditions]
-        conditions ||= "#{reflection.options[:source]}_type = '#{reflection.klass}'" if reflection.options[:source]
+        conditions ||= "#{reflection.options[:source]}_type = '#{reflection.options[:source_type]}'" if reflection.options[:source] && reflection.options[:source_type]
         conditions ||= "#{reflection.try(:foreign_type)} = '#{reflection.klass}'" if  reflection.options[:polymorphic]
         " AND #{conditions}" if conditions
       end

data/lib/scoped_search/version.rb

@@ -1,3 +1,3 @@
 module ScopedSearch
-  VERSION = "2.6.2"
+  VERSION = "2.6.3"
 end

data/spec/integration/relation_querying_spec.rb

@@ -240,7 +240,10 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         # The class on which to call search_for
         class Koo < ActiveRecord::Base
           has_many :mars
-          has_many :bazs, :through => :mars
+          # having the source option here is not needed for the statement correctness.
+          # It is here to fail the code introduced in 2.6.2 that wrongly detected source instead of source_type
+          # as an indication for a polymorphic relation.
+          has_many :bazs, :through => :mars, :source => :baz
 
           scoped_search :in => :bazs, :on => :related
         end
@@ -282,48 +285,72 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         # Create some tables
         ActiveRecord::Migration.create_table(:taggables) { |t| t.integer :taggable_id; t.string :taggable_type; t.integer :tag_id }
         ActiveRecord::Migration.create_table(:dogs) { |t| t.string :related }
+        ActiveRecord::Migration.create_table(:cats) { |t| t.string :related }
         ActiveRecord::Migration.create_table(:tags) { |t| t.string :foo }
 
         # The related classes
         class Taggable < ActiveRecord::Base; belongs_to :tag; belongs_to :taggable, :polymorphic => true; end
-        class Tag < ActiveRecord::Base; has_many :taggables; end
+
+        class Tag < ActiveRecord::Base
+          has_many :taggables
+          has_many :dogs, :through => :taggables, :source => :taggable, :source_type => 'Dog'
+
+          scoped_search :in => :dogs, :on => :related, :rename => :dog
+        end
 
         # The class on which to call search_for
         class Dog < ActiveRecord::Base
-          has_many :taggable, :as => :taggable
-          has_many :tags, :through => :taggable
+          has_many :taggables, :as => :taggable
+          has_many :tags, :through => :taggables
 
           scoped_search :in => :tags, :on => :foo
         end
 
+        class Cat < ActiveRecord::Base
+          has_many :taggables, :as => :taggable
+          has_many :tags, :through => :taggables
+        end
+
         @tag_1 = Tag.create!(:foo => 'foo')
         @tag_2 = Tag.create!(:foo => 'foo too')
         @tag_3 = Tag.create!(:foo => 'foo three')
 
-        @taggable_1 = Dog.create(:related => 'baz')
-        @taggable_2 = Dog.create(:related => 'baz too!')
+        @dog_1 = Dog.create(:related => 'baz')
+        @dog_2 = Dog.create(:related => 'baz too!')
+        @cat_1 = Cat.create(:related => 'mitzi')
 
-        @bar_1 = Taggable.create!(:tag => @tag_1, :taggable => @taggable_1, :taggable_type => 'Dog' )
-        @bar_2 = Taggable.create!(:tag => @tag_1)
-        @bar_3 = Taggable.create!(:tag => @tag_2, :taggable => @taggable_1 , :taggable_type => 'Dog')
-        @bar_3 = Taggable.create!(:tag => @tag_2, :taggable => @taggable_2 , :taggable_type => 'Dog')
-        @bar_3 = Taggable.create!(:tag => @tag_2, :taggable => @taggable_2 , :taggable_type => 'Dog')
-        @bar_4 = Taggable.create!(:tag => @tag_3)
+        Taggable.create!(:tag => @tag_1, :taggable => @dog_1, :taggable_type => 'Dog' )
+        Taggable.create!(:tag => @tag_1)
+        Taggable.create!(:tag => @tag_2, :taggable => @dog_1 , :taggable_type => 'Dog')
+        Taggable.create!(:tag => @tag_2, :taggable => @dog_2 , :taggable_type => 'Dog')
+        Taggable.create!(:tag => @tag_3, :taggable => @dog_2 , :taggable_type => 'Dog')
+        Taggable.create!(:tag => @tag_2, :taggable => @cat_1 , :taggable_type => 'Cat')
+        Taggable.create!(:tag => @tag_3)
       end
 
       after do
         ActiveRecord::Migration.drop_table(:dogs)
         ActiveRecord::Migration.drop_table(:taggables)
         ActiveRecord::Migration.drop_table(:tags)
+        ActiveRecord::Migration.drop_table(:cats)
       end
 
-      it "should find the two records that are related to a baz record" do
+      it "should find the two records that are related to a tag that contains foo record" do
         Dog.search_for('foo').should have(2).items
       end
 
-      it "should find the two records that are related to a baz record" do
+      it "should find one records that is related to both tags" do
         Dog.search_for('foo=foo AND foo="foo too"').should have(1).items
       end
+
+      it "should find the two tags that are related to a dog record" do
+        Tag.search_for('dog=baz').should have(2).items
+      end
+
+      it "should find the 3 tags that are related to dogs record" do
+        Tag.search_for('baz').should have(3).items
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.3
 platform: ruby
 authors:
 - Amos Benari
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord