searchlogic 2.4.21 → 2.4.22

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 2
 :minor: 4
-:patch: 21
+:patch: 22
 :build: 

data/lib/searchlogic/named_scopes/association_conditions.rb

@@ -71,10 +71,11 @@ module Searchlogic
             options
           else
             proc_args = arity_args(arity)
-            arg_type = (scope_options.respond_to?(:searchlogic_options) && scope_options.searchlogic_options[:type]) || :string
+            scope_options = scope_options.respond_to?(:searchlogic_options) ? scope_options.searchlogic_options.clone : {}
+            arg_type = scope_options.delete(:type) || :string
             
             eval <<-"end_eval"
-              searchlogic_lambda(:#{arg_type}) { |#{proc_args.join(",")}|
+              searchlogic_lambda(:#{arg_type}, #{scope_options}) { |#{proc_args.join(",")}|
                 options = {}
                 
                 in_searchlogic_delegation do

data/searchlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.4.21"
+  s.version = "2.4.22"
 
   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-07-25}
+  s.date = %q{2010-08-05}
   s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [

data/spec/searchlogic/named_scopes/association_conditions_spec.rb

@@ -75,6 +75,11 @@ describe Searchlogic::NamedScopes::AssociationConditions do
     Company.users_orders_total_gt(10).proxy_options.should == Order.total_gt(10).proxy_options.merge(:joins => {:users => :orders})
   end
   
+  it "should copy over the named scope options" do
+    Order.user_whatever_at_equals(1)
+    Order.named_scope_options(:user_whatever_at_equals).searchlogic_options[:skip_conversion].should == true
+  end
+  
   it "should include optional associations" do
     pending # this is a problem with using inner joins and left outer joins
     Company.create

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: false
   segments: 
   - 2
   - 4
-  - 21
-  version: 2.4.21
+  - 22
+  version: 2.4.22
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-25 00:00:00 -04:00
+date: 2010-08-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency