@@ -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. CHANGELOG.rdoc @@ -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 \ No newline at end of file lib/searchlogic/named_scopes/or_conditions.rb cdd01db6789ae686b58ad2c5f373cf0da36b6b25 binarylogic bjohnson@binarylogic.com http://github.com/binarylogic/searchlogic/commit/357874cc713042f850e34cecd89ecfdaaa375208 357874cc713042f850e34cecd89ecfdaaa375208 2009-09-02T15:49:51-07:00 2009-09-02T15:49:51-07:00 * Split out merging scopes with or into a convenient method. 84fea5f896921481a2bfd412dbb09df61bb0a00d binarylogic bjohnson@binarylogic.com