searchlogic 2.5.2 → 2.5.3

data/VERSION.yml

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

data/lib/searchlogic/named_scopes/column_conditions.rb

@@ -196,13 +196,15 @@ 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')
+              new_sql = if does_not_equal && values == [nil]
+                sql.gsub('!=', 'IS NOT')
               elsif equals && values == [nil]
-                sql.gsub!('=', 'IS')
+                sql.gsub('=', 'IS')
+              else
+                sql
               end
 
-              {:conditions => [sql, *values]}
+              {:conditions => [new_sql, *values]}
             }
           end
         end

data/searchlogic.gemspec

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

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe "Searchlogic::ActiveRecord::AssociationProxy" do
   it "should call location conditions" do

data/spec/searchlogic/active_record/consistency_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe Searchlogic::ActiveRecord::Consistency do
   it "should merge joins with consistent conditions" do

data/spec/searchlogic/core_ext/object_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe Searchlogic::CoreExt::Object do
   it "should accept and pass the argument to the searchlogic_options" do

data/spec/searchlogic/core_ext/proc_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe Searchlogic::CoreExt::Proc do
   it "should have a searchlogic_options accessor" do

data/spec/searchlogic/named_scopes/alias_scope_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe Searchlogic::NamedScopes::AliasScope do
   before(:each) do

data/spec/searchlogic/named_scopes/association_conditions_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe Searchlogic::NamedScopes::AssociationConditions do
   it "should create a named scope" do

data/spec/searchlogic/named_scopes/association_ordering_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe Searchlogic::NamedScopes::Ordering do
   it "should allow ascending" do

data/spec/searchlogic/named_scopes/column_conditions_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe Searchlogic::NamedScopes::ColumnConditions do
   it "should be dynamically created and then cached" do

data/spec/searchlogic/named_scopes/or_conditions_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe Searchlogic::NamedScopes::OrConditions do
   it "should define a scope by the exact same name as requested by the code" do

data/spec/searchlogic/named_scopes/ordering_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe Searchlogic::NamedScopes::Ordering do
   it "should have ascending" do

metadata

@@ -2,7 +2,7 @@
 name: searchlogic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.5.2
+  version: 2.5.3
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 -05:00
+date: 2011-03-09 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: -2121447102080969670
+      hash: -3818165968683800774
       segments: 
       - 0
       version: "0"