searchlogic 2.5.1 → 2.5.2

data/VERSION.yml

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

data/lib/searchlogic/named_scopes/column_conditions.rb

@@ -159,11 +159,13 @@ module Searchlogic
         # Kepp in mind that the lambdas get cached in a method, so you want to keep the contents of the lambdas as
         # fast as possible, which is why I didn't do the case statement inside of the lambda.
         def scope_options(condition, column, sql, options = {})
+          equals = !(condition.to_s =~ /^equals/).nil?
+          does_not_equal = !(condition.to_s =~ /^does_not_equal/).nil?
+
           case condition.to_s
           when /_(any|all)$/
             any = $1 == "any"
             join_word = any ? " OR " : " AND "
-            equals = condition.to_s =~ /^equals_/
             searchlogic_lambda(column.type, :skip_conversion => options[:skip_conversion]) { |*values|
               unless values.empty?
                 if equals && any
@@ -194,6 +196,12 @@ module Searchlogic
             searchlogic_lambda(column.type, :skip_conversion => options[:skip_conversion]) { |*values|
               values.collect! { |value| value_with_modifier(value, options[:value_modifier]) }
 
+              if does_not_equal && values == [nil]
+                sql.gsub!('!=', 'IS NOT')
+              elsif equals && values == [nil]
+                sql.gsub!('=', 'IS')
+              end
+
               {:conditions => [sql, *values]}
             }
           end

data/searchlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.5.1"
+  s.version = "2.5.2"
 
   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-07}
+  s.date = %q{2011-03-08}
   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/column_conditions_spec.rb

@@ -18,7 +18,9 @@ describe Searchlogic::NamedScopes::ColumnConditions do
   context "comparison conditions" do
     it "should have equals" do
       (5..7).each { |age| User.create(:age => age) }
+      nil_user = User.create
       User.age_equals(6).all.should == User.find_all_by_age(6)
+      User.age_equals(nil).all.should == User.find_all_by_age(nil)
     end
     
     it "should have does not equal" do

metadata

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