binarylogic-searchlogic 2.3.2 → 2.3.3

data/CHANGELOG.rdoc

@@ -1,4 +1,8 @@
-== 2.3.2 relased 2009-08-26
+== 2.3.3 released 2009-09-02
+
+* Split out merging scopes with 'or' into a convenient method.
+
+== 2.3.2 released 2009-08-26
 
 * Add in scope_procedure as an alias for alias_scope.
 * Fixed bug with not_blank condition.

data/VERSION.yml

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

data/lib/searchlogic/named_scopes/or_conditions.rb

@@ -96,11 +96,21 @@ module Searchlogic
         
         def create_or_condition(scopes, args)
           named_scope scopes.join("_or_"), lambda { |*args|
-            scopes_options = scopes.collect { |scope| send(scope, *args).proxy_options }
-            conditions = scopes_options.reject { |o| o[:conditions].nil? }.collect { |o| sanitize_sql(o[:conditions]) }
-            scopes.inject(scoped({})) { |scope, scope_name| scope.send(scope_name, *args) }.scope(:find).merge(:conditions => "(" + conditions.join(") OR (") + ")")
+            merge_scopes_with_or(scopes.collect { |scope| [scope, *args] })
           }
         end
+        
+        def merge_scopes_with_or(scopes)
+          scopes_options = scopes.collect { |scope, *args| send(scope, *args).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.scope(:find).merge(:conditions => "(" + conditions.join(") OR (") + ")")
+        end
     end
   end
 end

data/searchlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.3.2"
+  s.version = "2.3.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{2009-08-26}
+  s.date = %q{2009-09-02}
   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: binarylogic-searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 -07:00
+date: 2009-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,7 +66,6 @@ files:
 - spec/spec_helper.rb
 has_rdoc: false
 homepage: http://github.com/binarylogic/searchlogic
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -87,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: searchlogic
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Searchlogic makes using ActiveRecord named scopes easier and less repetitive.