searchlogic 2.3.14 → 2.3.15

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 2
 :minor: 3
 :build: 
-:patch: 14
+:patch: 15

data/lib/searchlogic/named_scopes/association_conditions.rb

@@ -91,6 +91,8 @@ module Searchlogic
         def prepare_named_scope_options(options, association)
           options.delete(:readonly) # AR likes to set :readonly to true when using the :joins option, we don't want that
           
+          options[:conditions] = sanitize_sql_for_conditions(options[:conditions]) if options[:conditions].is_a?(Hash)
+          
           if options[:joins].is_a?(String) || array_of_strings?(options[:joins])
             options[:joins] = [inner_joins(association.name), options[:joins]].flatten
           else

data/searchlogic.gemspec

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

@@ -137,5 +137,9 @@ describe "Association Conditions" do
     user = company.users.create(:company_id => company.id)
     company.users.company_id_eq(company.id).should == [user]
   end
-
+  
+  it "should sanitize the scope on a foreign model instead of passing the raw options back to the original" do
+    Company.named_scope(:users_count_10, :conditions => {:users_count => 10})
+    User.company_users_count_10.proxy_options.should == {:conditions => "\"users\".\"users_count\" = 10", :joins => :company}
+  end
 end

metadata

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