searchlogic 2.3.12 → 2.3.13

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 2
 :minor: 3
 :build: 
-:patch: 12
+:patch: 13

data/lib/searchlogic/named_scopes/or_conditions.rb

@@ -123,19 +123,14 @@ module Searchlogic
           scope = named_scope_options(scopes.first)
           column_type = scope.respond_to?(:searchlogic_arg_type) ? scope.searchlogic_arg_type : :string
           named_scope scopes.join("_or_"), searchlogic_lambda(column_type) { |*args|
-            merge_scopes_with_or(scopes.collect { |scope| [scope, *args] })
+            merge_scopes_with_or(scopes.collect { |scope| send(scope, *args) })
           }
         end
         
         def merge_scopes_with_or(scopes)
-          scopes_options = scopes.collect { |scope, *args| send(scope, *args).proxy_options }
+          scopes_options = scopes.collect { |scope| scope.proxy_options }
           conditions = scopes_options.reject { |o| o[:conditions].nil? }.collect { |o| sanitize_sql(o[:conditions]) }
-          
-          scope = scopes.inject(scoped({})) do |scope, info|
-            scope_name, *args = info
-            scope.send(scope_name, *args)
-          end
-          
+          scope = scopes_options.inject(scoped({})) { |current_scope, options| current_scope.scoped(options) }
           options = scope.scope(:find)
           options.delete(:readonly) unless scope.proxy_options.key?(:readonly)
           options.merge(:conditions => "(" + conditions.join(") OR (") + ")")

data/searchlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.3.12"
+  s.version = "2.3.13"
 
   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{2010-01-19}
+  s.date = %q{2010-01-22}
   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.12
+  version: 2.3.13
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 -05:00
+date: 2010-01-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency