binarylogic-searchlogic 2.3.4 → 2.3.5

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,4 +1,4 @@
1
1
  ---
2
- :patch: 4
2
+ :patch: 5
3
3
  :major: 2
4
4
  :minor: 3
@@ -17,7 +17,7 @@ module Searchlogic
17
17
  joins = merge_joins_without_searchlogic(*args)
18
18
  joins = joins.collect { |j| j.is_a?(String) ? j.split(" ") : j }.flatten.uniq
19
19
  joins = joins.collect do |j|
20
- if j.is_a?(String)
20
+ if j.is_a?(String) && !j =~ / (AND|OR) /i
21
21
  j.gsub(/(.*) ON (.*) = (.*)/) do |m|
22
22
  sorted = [$2,$3].sort
23
23
  "#{$1} ON #{sorted[0]} = #{sorted[1]}"
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{searchlogic}
8
- s.version = "2.3.4"
8
+ s.version = "2.3.5"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Ben Johnson of Binary Logic"]
12
- s.date = %q{2009-09-12}
12
+ s.date = %q{2009-09-13}
13
13
  s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
14
14
  s.email = %q{bjohnson@binarylogic.com}
15
15
  s.extra_rdoc_files = [
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: binarylogic-searchlogic
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.4
4
+ version: 2.3.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-09-12 00:00:00 -07:00
12
+ date: 2009-09-13 00:00:00 -07:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -66,7 +66,6 @@ files:
66
66
  - spec/spec_helper.rb
67
67
  has_rdoc: false
68
68
  homepage: http://github.com/binarylogic/searchlogic
69
- licenses:
70
69
  post_install_message:
71
70
  rdoc_options:
72
71
  - --charset=UTF-8
@@ -87,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
87
86
  requirements: []
88
87
 
89
88
  rubyforge_project: searchlogic
90
- rubygems_version: 1.3.5
89
+ rubygems_version: 1.2.0
91
90
  signing_key:
92
91
  specification_version: 3
93
92
  summary: Searchlogic makes using ActiveRecord named scopes easier and less repetitive.