searchlogic 2.4.10 → 2.4.11

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 2
 :minor: 4
 :build: 
-:patch: 10
+:patch: 11

data/lib/searchlogic/named_scopes/association_conditions.rb

@@ -34,7 +34,7 @@ module Searchlogic
           if name_with_condition.to_s =~ /^(#{non_poly_assocs.collect(&:name).join("|")})_(\w+)$/
             association_name = $1
             condition = $2
-          elsif name_with_condition.to_s =~ /^(#{poly_assocs.collect(&:name).join("|")})_(\w+)_type_(\w+)$/
+          elsif name_with_condition.to_s =~ /^(#{poly_assocs.collect(&:name).join("|")})_(\w+?)_type_(\w+)$/
             association_name = $1
             poly_type = $2
             condition = $3

data/searchlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.4.10"
+  s.version = "2.4.11"
 
   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-02-06}
+  s.date = %q{2010-02-11}
   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/named_scopes/association_conditions_spec.rb

@@ -172,6 +172,13 @@ describe "Association Conditions" do
     }
   end
   
+  it "should delegate to polymorphic relationships (with a lazy split on _type_)" do
+    Audit.auditable_user_type_some_type_id_like("ben").proxy_options.should == {
+      :conditions => ["users.some_type_id LIKE ?", "%ben%"],
+      :joins => "INNER JOIN \"users\" ON \"users\".id = \"audits\".auditable_id AND \"audits\".auditable_type = 'User'"
+    }
+  end
+  
   it "should deep delegate to polymorphic relationships" do
     Audit.auditable_user_type_company_name_like("company").proxy_options.should == {
       :conditions => ["companies.name LIKE ?", "%company%"],

data/spec/spec_helper.rb

@@ -41,6 +41,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string :name
     t.integer :age
     t.boolean :male
+    t.string :some_type_id
   end
   
   create_table :carts do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.4.10
+  version: 2.4.11
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-06 00:00:00 -05:00
+date: 2010-02-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency