searchlogic 2.3.13 → 2.3.14

data/VERSION.yml

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

data/lib/searchlogic/named_scopes/or_conditions.rb

@@ -123,16 +123,16 @@ 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| send(scope, *args) })
+            merge_scopes_with_or(scopes.collect { |scope| clone.send(scope, *args) })
           }
         end
         
         def merge_scopes_with_or(scopes)
-          scopes_options = scopes.collect { |scope| scope.proxy_options }
+          scopes_options = scopes.collect { |scope| scope.scope(:find) }
           conditions = scopes_options.reject { |o| o[:conditions].nil? }.collect { |o| sanitize_sql(o[:conditions]) }
           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.delete(:readonly) unless scopes.any? { |scope| scope.proxy_options.key?(:readonly) }
           options.merge(:conditions => "(" + conditions.join(") OR (") + ")")
         end
     end

data/searchlogic.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.3.13"
+  s.version = "2.3.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.3.13
+  version: 2.3.14
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic