searchlogic 2.4.31 → 2.4.32

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 2
 :minor: 4
-:patch: 31
+:patch: 32
 :build: 

data/lib/searchlogic/active_record/association_proxy.rb

@@ -7,13 +7,13 @@ module Searchlogic
         end
       end
 
-      def send_with_searchlogic(method, *args)
+      def send_with_searchlogic(method, *args, &block)
         # create the scope if it doesn't exist yet, then delegate back to the original method
         if !proxy_respond_to?(method) && proxy_reflection.macro != :belongs_to && !proxy_reflection.options[:polymorphic] && proxy_reflection.klass.condition?(method)
-          proxy_reflection.klass.send(method, *args)
+          proxy_reflection.klass.send(method, *args, &block)
         end
 
-        send_without_searchlogic(method, *args)
+        send_without_searchlogic(method, *args, &block)
       end
     end
   end

data/lib/searchlogic/named_scopes/conditions.rb

@@ -157,9 +157,17 @@ module Searchlogic
             searchlogic_lambda(column.type, :skip_conversion => options[:skip_conversion]) { |*values|
               unless values.empty?
                 if equals && any
-                  values = values.flatten
-                  r = attribute_condition("#{table_name}.#{column.name}", values)
-                  {:conditions => [r, values]}
+                  has_nil = values.include?(nil)
+                  values = values.flatten.compact
+                  sql = attribute_condition("#{table_name}.#{column.name}", values)
+                  subs = [values]
+
+                  if has_nil
+                    sql += " OR " + attribute_condition("#{table_name}.#{column.name}", nil)
+                    subs << nil
+                  end
+
+                  {:conditions => [sql, *subs]}
                 else
                   values.flatten!
                   values.collect! { |value| value_with_modifier(value, options[:value_modifier]) }

data/searchlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.4.31"
+  s.version = "2.4.32"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]
-  s.date = %q{2011-03-03}
+  s.date = %q{2011-03-07}
   s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [

data/spec/searchlogic/named_scopes/conditions_spec.rb

@@ -126,6 +126,12 @@ describe Searchlogic::NamedScopes::Conditions do
       User.username_equals_any("bjohnson", "thunt").all.should == User.find_all_by_username(["bjohnson", "thunt"])
     end
     
+    # PostgreSQL does not allow null in "in" statements
+    it "should have equals any and handle nils" do
+      %w(bjohnson thunt dgainor).each { |username| User.create(:username => username) }
+      User.username_equals_any("bjohnson", "thunt", nil).proxy_options.should == {:conditions=>["users.username IN (?) OR users.username IS ?", ["bjohnson", "thunt"], nil]}
+    end
+    
     it "should have equals all" do
       %w(bjohnson thunt dainor).each { |username| User.create(:username => username) }
       User.username_equals_all("bjohnson", "thunt").all.should == []

metadata

@@ -2,7 +2,7 @@
 name: searchlogic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.4.31
+  version: 2.4.32
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -05:00
+date: 2011-03-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1771332641975741077
+      hash: -3829860769572842136
       segments: 
       - 0
       version: "0"