binarylogic-searchlogic 2.2.1 → 2.2.2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 2.2.2 released 2009-07-31
+
+* Fix bug to give priority to local columns.
+
 == 2.2.1 released 2009-07-30
 
 * Use ::ActiveRecord instead of ActiveRecord to avoid a name conflict since ActiveRecord is a module within Searchlogic.

data/VERSION.yml

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

data/lib/searchlogic/named_scopes/association_conditions.rb

@@ -22,7 +22,7 @@ module Searchlogic
         end
         
         def method_missing(name, *args, &block)
-          if details = association_condition_details(name)
+          if !local_condition?(name) && details = association_condition_details(name)
             create_association_condition(details[:association], details[:condition], args)
             send(name, *args)
           else

data/lib/searchlogic/named_scopes/conditions.rb

@@ -67,12 +67,16 @@ module Searchlogic
       
       # Is the name of the method a valid condition that can be dynamically created?
       def condition?(name)
-        return false if name.blank?
-        scope_names = scopes.keys.reject { |k| k == :scoped }
-        scope_names.include?(name.to_sym) || !condition_details(name).nil?
+        local_condition?(name)
       end
       
       private
+        def local_condition?(name)
+          return false if name.blank?
+          scope_names = scopes.keys.reject { |k| k == :scoped }
+          scope_names.include?(name.to_sym) || !condition_details(name).nil?
+        end
+        
         def method_missing(name, *args, &block)
           if details = condition_details(name)
             create_condition(details[:column], details[:condition], args)

data/searchlogic.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.2.1"
+  s.version = "2.2.2"
 
   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{2009-07-30}
+  s.date = %q{2009-07-31}
   s.description = %q{Searchlogic provides common named scopes and object based searching for ActiveRecord.}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [

data/spec/named_scopes/conditions_spec.rb

@@ -270,5 +270,8 @@ describe "Conditions" do
   
   it "should have priorty to columns over conflicting association conditions" do
     Company.users_count_gt(10)
+    User.create
+    User.company_id_null.count.should == 1
+    User.company_id_not_null.count.should == 0
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: binarylogic-searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-30 00:00:00 -07:00
+date: 2009-07-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency