searchlogic 2.3.4 → 2.3.5

data/VERSION.yml

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

data/lib/searchlogic/active_record/consistency.rb

@@ -17,7 +17,7 @@ module Searchlogic
         joins = merge_joins_without_searchlogic(*args)
         joins = joins.collect { |j| j.is_a?(String) ? j.split("  ") : j }.flatten.uniq
         joins = joins.collect do |j|
-          if j.is_a?(String)
+          if j.is_a?(String) && !j =~ / (AND|OR) /i
             j.gsub(/(.*) ON (.*) = (.*)/) do |m|
               sorted = [$2,$3].sort
               "#{$1} ON #{sorted[0]} = #{sorted[1]}"

data/searchlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.3.4"
+  s.version = "2.3.5"
 
   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{2009-09-12}
+  s.date = %q{2009-09-13}
   s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-12 00:00:00 -04:00
+date: 2009-09-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency