searchlogic 2.5.4 → 2.5.5

data/VERSION.yml

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

data/lib/searchlogic/named_scopes/alias_scope.rb

@@ -33,7 +33,7 @@ module Searchlogic
       # is a safe method.
       def alias_scope(name, options = nil)
         alias_scopes[name.to_sym] = options
-        (class << self; self end).instance_eval do
+        (class << self; self; end).instance_eval do
           define_method name do |*args|
             case options
             when Symbol

data/lib/searchlogic/named_scopes/or_conditions.rb

@@ -101,20 +101,20 @@ module Searchlogic
         end
 
         def full_association_path(part, last_condition, given_assoc)
-            path = [given_assoc.name]
-            part.sub!(/^#{given_assoc.name}_/, "")
-            klass = self
-            while klass = klass.send(:reflect_on_association, given_assoc.name)
-              klass = klass.klass
-              if details = klass.send(:association_condition_details, part, last_condition)
-                path << details[:association]
-                part = details[:condition]
-                given_assoc = details[:association]
-              elsif details = klass.send(:condition_details, part)
-                return { :path => path, :column => details[:column], :condition => details[:condition] }
-              end
+          path = [given_assoc.name]
+          part.sub!(/^#{given_assoc.name}_/, "")
+          klass = self
+          while klass = klass.send(:reflect_on_association, given_assoc.name)
+            klass = klass.klass
+            if details = klass.send(:association_condition_details, part, last_condition)
+              path << details[:association].name
+              part = details[:condition]
+              given_assoc = details[:association]
+            elsif details = klass.send(:condition_details, part)
+              return { :path => path, :column => details[:column], :condition => details[:condition] }
             end
-            { :path => path, :column => part, :condition => last_condition }
+          end
+          {:path => path, :column => part, :condition => last_condition}
         end
 
         def create_or_condition(scopes)

data/searchlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.5.4"
+  s.version = "2.5.5"
 
   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{2011-03-10}
+  s.date = %q{2011-04-07}
   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/or_conditions_spec.rb

@@ -44,6 +44,7 @@ describe Searchlogic::NamedScopes::OrConditions do
     User.name_or_company_name_like("ben").proxy_options.should == {:joins => :company, :conditions => "(users.name LIKE '%ben%') OR (companies.name LIKE '%ben%')"}
     User.company_name_or_name_like("ben").proxy_options.should == {:joins => :company, :conditions => "(companies.name LIKE '%ben%') OR (users.name LIKE '%ben%')"}
     User.company_name_or_company_description_like("ben").proxy_options.should == {:joins =>[:company], :conditions => "(companies.name LIKE '%ben%') OR (companies.description LIKE '%ben%')"}
+    Cart.user_company_name_or_user_company_name_like("ben").proxy_options.should == {:joins => {:user=>:company}, :conditions => "(companies.name LIKE '%ben%') OR (companies.name LIKE '%ben%')"}
   end
   
   it "should not get confused by the 'or' in find_or_create_by_* methods" do

metadata

@@ -2,7 +2,7 @@
 name: searchlogic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.5.4
+  version: 2.5.5
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 -05:00
+date: 2011-04-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2792229626031075775
+      hash: 2802957322570024148
       segments: 
       - 0
       version: "0"