searchlogic 2.4.0 → 2.4.1

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 2
 :minor: 4
 :build: 
-:patch: 0
+:patch: 1

data/lib/searchlogic/named_scopes/association_conditions.rb

@@ -114,7 +114,7 @@ module Searchlogic
           if options[:joins].is_a?(String) || array_of_strings?(options[:joins])
             options[:joins] = [poly_class ? poly_join : inner_joins(association.name), options[:joins]].flatten
           elsif poly_class
-            options[:joins] = options[:joins].blank? ? poly_join : [poly_join, inner_joins(options[:joins])]
+            options[:joins] = options[:joins].blank? ? poly_join : ([poly_join] + klass.inner_joins(options[:joins]))
           else
             options[:joins] = options[:joins].blank? ? association.name : {association.name => options[:joins]}
           end

data/searchlogic.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.4.0"
+  s.version = "2.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]

data/spec/named_scopes/association_conditions_spec.rb

@@ -143,10 +143,17 @@ describe "Association Conditions" do
     User.company_users_count_10.proxy_options.should == {:conditions => "\"companies\".\"users_count\" = 10", :joins => :company}
   end
   
-  it "should polymorph" do
+  it "should delegate to polymorphic relationships" do
     Audit.auditable_user_type_name_like("ben").proxy_options.should == {
       :conditions => ["users.name LIKE ?", "%ben%"],
       :joins => "INNER JOIN \"users\" ON \"users\".id = \"audits\".auditable_id AND \"audits\".auditable_type = 'User'"
     }
   end
+  
+  it "should deep delegate to polymorphic relationships" do
+    Audit.auditable_user_type_company_name_like("company").proxy_options.should == {
+      :conditions => ["companies.name LIKE ?", "%company%"],
+      :joins => ["INNER JOIN \"users\" ON \"users\".id = \"audits\".auditable_id AND \"audits\".auditable_type = 'User'", " INNER JOIN \"companies\" ON \"companies\".id = \"users\".company_id "]
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic