searchlogic 2.2.2 → 2.2.3

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 2.2.3 released 2009-07-31
+
+* Fixed bug when an associations named scope joins is a string or an array of strings, the joins we add in automatically should also be a string, not a symbol.
+
 == 2.2.2 released 2009-07-31
 
 * Fix bug to give priority to local columns.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 2
+:patch: 3
 :major: 2
 :minor: 2

data/lib/searchlogic/named_scopes/association_conditions.rb

@@ -61,8 +61,7 @@ module Searchlogic
             # The underlying condition doesn't require any parameters, so let's just create a simple
             # named scope that is based on a hash.
             options = scope.scope(:find)
-            options.delete(:readonly)
-            options[:joins] = options[:joins].blank? ? association.name : {association.name => options[:joins]}
+            prepare_named_scope_options(options, association)
             options
           else
             # The underlying condition requires parameters, let's match the parameters it requires
@@ -88,13 +87,22 @@ module Searchlogic
               searchlogic_lambda(:#{arg_type}) { |#{proc_args.join(",")}|
                 scope = association.klass.send(association_condition, #{proc_args.join(",")})
                 options = scope ? scope.scope(:find) : {}
-                options.delete(:readonly)
-                options[:joins] = options[:joins].blank? ? association.name : {association.name => options[:joins]}
+                prepare_named_scope_options(options, association)
                 options
               }
             end_eval
           end
         end
+        
+        def prepare_named_scope_options(options, association)
+          options.delete(:readonly)
+          
+          if options[:joins].is_a?(String) || array_of_strings?(options[:joins])
+            options[:joins] = [inner_joins(association.name), options[:joins]].flatten
+          else
+            options[:joins] = options[:joins].blank? ? association.name : {association.name => options[:joins]}
+          end
+        end
     end
   end
 end

data/searchlogic.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.2.2"
+  s.version = "2.2.3"
 
   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

@@ -125,4 +125,9 @@ describe "Association Conditions" do
     order = user.orders.create(:total => 20, :taxes => 3)
     Company.users_orders_taxes_lt(50).ascend_by_users_orders_total.all(:include => {:users => :orders}).should == Company.all
   end
+  
+  it "should automatically add string joins if the association condition is using strings" do
+    User.named_scope(:orders_big_id, :joins => User.inner_joins(:orders))
+    Company.users_orders_big_id.proxy_options.should == {:joins=>[" INNER JOIN \"users\" ON users.company_id = companies.id ", " INNER JOIN \"orders\" ON orders.user_id = users.id "]}
+  end
 end

metadata

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