scoped_search 2.6.1 → 2.6.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzUyZjNjZjdmMDY2MTgzNzJkYjExNWI2NzY5MjMyYmMwNWEzMzUwNQ==
-  data.tar.gz: !binary |-
-    MDc4ZmFjZTRlYmMyZDRhZjljYzg2NzFmYWM1OWJkNDllOGQwMmUzOQ==
+SHA1:
+  metadata.gz: 37c27d6c6a3311a013c5bcaa5558f3d91f7c4443
+  data.tar.gz: f0d713611729611a6d2f0f990982873dad65bb82
 SHA512:
-  metadata.gz: !binary |-
-    YzE3ZjUwNmJlZjc4YTMyM2Q1YmM4NmI3MmI2ZGY1MzUxY2RiZDExZThiMDYw
-    ZjBhMmI2YmZlNGNlYTBmNzBmMmZjMjg0Y2NjN2YzZjgwOTA5NjJmMDhlYzg4
-    ODI0MmEyYTI0NGZiN2NjYzBiN2ZlNzA1ZGY1ZDM0Y2FkZDcyMzg=
-  data.tar.gz: !binary |-
-    NmU5N2UwN2FiOWE1MGI2NDNjNWZkMWEyNGI5YTk2MzIxM2Q5ZTc5YjIwOGQ5
-    N2UzMTg0ODlhMTljZDQ5NDAxNGZiNTMwMDhkODg5MmQ3Yzc3NzNhMGU1Y2I0
-    NTlmMDEwODgxMTk3ZWNiZjI5NjU5N2RjNzE3MzBjMDYwZDk0NzM=
+  metadata.gz: 5826b9fe779a5c48da50101a6dc7c52ba756bed745f99d463adeada1f23a1484e127d36ea122a9249f85050597133748655db51900d40160bf9c81a154975ae2
+  data.tar.gz: 6a0a37aeb76ca59e10c07c3e57ac51480dc34e7ef52586026d9db75741da70619fd327061b459ed527e206725b68e47fb0b4c5b012464f13aea8c48a1a053e90

data/lib/scoped_search/query_builder.rb

@@ -240,16 +240,25 @@ module ScopedSearch
     end
 
     def has_many_through_join(field)
+      many_class = field.definition.klass
+      through = many_class.reflections[field.relation].options[:through]
+      #table names
       endpoint_table_name = field.klass.table_name
-      middle_table = field.definition.klass.reflections[field.relation].options[:through]
-      middle_table_name = field.definition.klass.reflections[middle_table].klass.table_name
+      many_table_name = many_class.table_name
+      middle_table_name = many_class.reflections[through].klass.table_name
+      #primary and foreign keys + optional condition for the many to middle join
+      pk1, fk1 = field.reflection_keys(many_class.reflections[through])
+      condition1 = field.reflection_conditions(field.klass.reflections[many_table_name.to_sym])
+      #primary and foreign keys + optional condition for the endpoint to middle join
+      pk2, fk2 =    field.reflection_keys(field.klass.reflections[middle_table_name.to_sym])
+      condition2 = field.reflection_conditions(many_class.reflections[field.relation])
 
       <<-SQL
-        #{field.definition.klass.table_name}
+        #{many_table_name}
         INNER JOIN #{middle_table_name}
-        ON #{field.definition.klass.table_name}.id = #{middle_table_name}.#{field.reflection_keys(field.definition.klass.reflections[middle_table])[1]}
+        ON #{many_table_name}.#{pk1} = #{middle_table_name}.#{fk1} #{condition1}
         INNER JOIN #{endpoint_table_name}
-        ON #{middle_table_name}.#{field.reflection_keys(field.klass.reflections[middle_table])[1]} = #{endpoint_table_name}.id
+        ON #{middle_table_name}.#{fk2} = #{endpoint_table_name}.#{pk2} #{condition2}
       SQL
     end
 
@@ -336,14 +345,22 @@ module ScopedSearch
         return join_sql
       end
 
-      def reflection_keys reflection
+      def reflection_keys(reflection)
         pk = reflection.klass.primary_key
         fk = reflection.options[:foreign_key]
         # activerecord prior to 3.1 doesn't respond to foreign_key method and hold the key name in the reflection primary key
-        fk = fk || reflection.respond_to?(:foreign_key) ? reflection.foreign_key : reflection.primary_key_name
+        fk ||= reflection.respond_to?(:foreign_key) ? reflection.foreign_key : reflection.primary_key_name
         [pk, fk]
       end
 
+      def reflection_conditions(reflection)
+        return unless reflection
+        conditions = reflection.options[:conditions]
+        conditions ||= "#{reflection.options[:source]}_type = '#{reflection.klass}'" if reflection.options[:source]
+        conditions ||= "#{reflection.try(:foreign_type)} = '#{reflection.klass}'" if  reflection.options[:polymorphic]
+        " AND #{conditions}" if conditions
+      end
+
       def to_ext_method_sql(key, operator, value, &block)
         raise ScopedSearch::QueryNotSupported, "'#{definition.klass}' doesn't respond to '#{ext_method}'" unless definition.klass.respond_to?(ext_method)
         conditions = definition.klass.send(ext_method.to_sym,key, operator, value) rescue {}

data/lib/scoped_search/version.rb

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

data/spec/integration/relation_querying_spec.rb

@@ -274,5 +274,56 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         Koo.search_for('related=baz AND related="baz too!"').should have(1).items
       end
     end
+
+    context 'querying a :has_many => :through :polymorphic relation' do
+
+      before do
+
+        # 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(: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
+
+        # The class on which to call search_for
+        class Dog < ActiveRecord::Base
+          has_many :taggable, :as => :taggable
+          has_many :tags, :through => :taggable
+
+          scoped_search :in => :tags, :on => :foo
+        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!')
+
+        @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)
+      end
+
+      after do
+        ActiveRecord::Migration.drop_table(:dogs)
+        ActiveRecord::Migration.drop_table(:taggables)
+        ActiveRecord::Migration.drop_table(:tags)
+      end
+
+      it "should find the two records that are related to a baz 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
+        Dog.search_for('foo=foo AND foo="foo too"').should have(1).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.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Amos Benari
@@ -10,20 +10,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
@@ -44,27 +44,27 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "    Scoped search makes it easy to search your ActiveRecord-based
-  models.\n    \n    It will create a named scope :search_for that can be called with
-  a query string. It will build an SQL query using\n    the provided query string
-  and a definition that specifies on what fields to search. Because the functionality
-  is\n    built on named_scope, the result of the search_for call can be used like
-  any other named_scope, so it can be\n    chained with another scope or combined
-  with will_paginate.\n    \n    Because it uses standard SQL, it does not require
-  any setup, indexers or daemons. This makes scoped_search\n    suitable to quickly
-  add basic search functionality to your application with little hassle. On the other
-  hand,\n    it may not be the best choice if it is going to be used on very large
-  datasets or by a large user base.\n"
+description: "    Scoped search makes it easy to search your ActiveRecord-based models.\n
+  \   \n    It will create a named scope :search_for that can be called with a query
+  string. It will build an SQL query using\n    the provided query string and a definition
+  that specifies on what fields to search. Because the functionality is\n    built
+  on named_scope, the result of the search_for call can be used like any other named_scope,
+  so it can be\n    chained with another scope or combined with will_paginate.\n    \n
+  \   Because it uses standard SQL, it does not require any setup, indexers or daemons.
+  This makes scoped_search\n    suitable to quickly add basic search functionality
+  to your application with little hassle. On the other hand,\n    it may not be the
+  best choice if it is going to be used on very large datasets or by a large user
+  base.\n"
 email:
 - abenari@redhat.com
 - willem@railsdoctors.com
@@ -136,17 +136,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Easily search you ActiveRecord models with a simple query language using