searchlogic 2.1.11 → 2.1.12

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 2.1.12 released 2009-07-28
+
+* Fixed bug when dealing with scopes that return nil.
+
 == 2.1.11 released 2009-07-28
 
 * Reworked how alias conditions are created on the fly, uses scope(:find) instead of proxy_options to create the scope. This allows using association alias named scopes.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 11
+:patch: 12
 :major: 2
 :minor: 1

data/lib/searchlogic/named_scopes/association_conditions.rb

@@ -131,7 +131,8 @@ module Searchlogic
             
             eval <<-"end_eval"
               searchlogic_lambda(:#{arg_type}) { |#{proc_args.join(",")}|
-                options = association.klass.send(association_condition, #{proc_args.join(",")}).scope(:find)
+                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]}
                 options

data/searchlogic.gemspec

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

@@ -17,6 +17,10 @@ describe "Association Conditions" do
     Company.users_username_has("bjohnson").proxy_options.should == User.username_has("bjohnson").proxy_options.merge(:joins => :users)
   end
   
+  it "should not raise errors for scopes that don't return anything" do
+    Company.users_blank_scope("bjohnson").proxy_options.should == {:joins => :users}
+  end
+  
   it "should ignore polymorphic associations" do
     lambda { Fee.owner_created_at_gt(Time.now) }.should raise_error(NoMethodError)
   end

data/spec/search_spec.rb

@@ -115,6 +115,12 @@ describe "Search" do
       search.users_uname.should == "bjohnson"
     end
     
+    it "should allow setting pre-existing association alias conditions" do
+      search = Company.search
+      search.users_username_has = "bjohnson"
+      search.users_username_has.should == "bjohnson"
+    end
+    
     it "should allow using custom conditions" do
       User.named_scope(:four_year_olds, { :conditions => { :age => 4 } })
       search = User.search

data/spec/spec_helper.rb

@@ -73,6 +73,7 @@ Spec::Runner.configure do |config|
       has_many :orders, :dependent => :destroy
       named_scope :uname, lambda { |value| {:conditions => ["users.username = ?", value]} }
       alias_scope :username_has, lambda { |value| username_like(value) }
+      alias_scope :blank_scope, lambda { |value| }
     end
     
     class Order < ActiveRecord::Base

metadata

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