searchlogic 2.3.5 → 2.3.6

data/VERSION.yml

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

data/lib/searchlogic.rb

@@ -37,4 +37,4 @@ end
 if defined?(ActionController)
   require "searchlogic/rails_helpers"
   ActionController::Base.helper(Searchlogic::RailsHelpers)
-end
+end

data/lib/searchlogic/active_record/named_scopes.rb

@@ -13,10 +13,15 @@ module Searchlogic
       # ActiveRecord hides this internally in a Proc, so we have to try and pull it out with this
       # method.
       def named_scope_options(name)
+
         key = scopes.key?(name.to_sym) ? name.to_sym : primary_condition_name(name)
         
         if key
           eval("options", scopes[key].binding)
+        elsif name.to_s.downcase.match("_or_")
+          condition = find_applied_condition(name)
+          newname = name.to_s.gsub(/_or_/, "_#{condition}_or_").to_sym
+          named_scope_options(newname) unless name == newname
         else
           nil
         end

data/lib/searchlogic/named_scopes/alias_scope.rb

@@ -64,4 +64,4 @@ module Searchlogic
       end
     end
   end
-end
+end

data/lib/searchlogic/named_scopes/association_conditions.rb

@@ -8,7 +8,7 @@ module Searchlogic
       
       private
         def association_condition?(name)
-          !association_condition_details(name).nil?
+          !association_condition_details(name).nil? unless name.to_s.downcase.match("_or_")
         end
         
         def method_missing(name, *args, &block)
@@ -20,11 +20,12 @@ module Searchlogic
           end
         end
         
-        def association_condition_details(name)
+        def association_condition_details(name, last_condition = nil)
           assocs = reflect_on_all_associations.reject { |assoc| assoc.options[:polymorphic] }.sort { |a, b| b.name.to_s.size <=> a.name.to_s.size }
           return nil if assocs.empty?
           
-          if name.to_s =~ /^(#{assocs.collect(&:name).join("|")})_(\w+)$/
+          name_with_condition = [name, last_condition].compact.join('_')
+          if name_with_condition.to_s =~ /^(#{assocs.collect(&:name).join("|")})_(\w+)$/
             association_name = $1
             condition = $2
             association = reflect_on_association(association_name.to_sym)
@@ -98,4 +99,4 @@ module Searchlogic
         end
     end
   end
-end
+end

data/lib/searchlogic/named_scopes/association_ordering.rb

@@ -40,4 +40,4 @@ module Searchlogic
         end
     end
   end
-end
+end

data/lib/searchlogic/named_scopes/conditions.rb

@@ -35,6 +35,11 @@ module Searchlogic
         :not_blank => [:present]
       }
       
+      GROUP_CONDITIONS = {
+        :in => [],
+        :not_in => []
+      }
+      
       CONDITIONS = {}
       
       # Add any / all variations to every comparison and wildcard condition
@@ -46,6 +51,8 @@ module Searchlogic
       
       BOOLEAN_CONDITIONS.each { |condition, aliases| CONDITIONS[condition] = aliases }
       
+      GROUP_CONDITIONS.each { |condition, aliases| CONDITIONS[condition] = aliases }
+      
       PRIMARY_CONDITIONS = CONDITIONS.keys
       ALIAS_CONDITIONS = CONDITIONS.values.flatten
       
@@ -69,9 +76,20 @@ module Searchlogic
             super
           end
         end
+
+        def find_applied_condition(name)
+          if name.to_s =~ /(#{(PRIMARY_CONDITIONS + ALIAS_CONDITIONS).join("|")})$/
+            $1
+          end
+        end
         
-        def condition_details(name)
-          if name.to_s =~ /^(#{column_names.join("|")})_(#{(PRIMARY_CONDITIONS + ALIAS_CONDITIONS).join("|")})$/
+        def condition_details(name, *args)
+          if args.size > 0 and !args.first.nil?
+            assoc = reflect_on_association(args.first.to_sym)
+            klass = assoc.klass
+            name.to_s =~ /^(#{klass.column_names.join("|")})_(#{(PRIMARY_CONDITIONS + ALIAS_CONDITIONS).join("|")})$/
+            {:column => $1, :condition => $2}
+          elsif name.to_s =~ /^(#{column_names.join("|")})_(#{(PRIMARY_CONDITIONS + ALIAS_CONDITIONS).join("|")})$/
             {:column => $1, :condition => $2}
           end
         end
@@ -123,6 +141,10 @@ module Searchlogic
             {:conditions => "#{table_name}.#{column} = '' OR #{table_name}.#{column} IS NULL"}
           when "not_blank"
             {:conditions => "#{table_name}.#{column} != '' AND #{table_name}.#{column} IS NOT NULL"}
+          when "in"
+            scope_options(condition, column_type, "#{table_name}.#{column} IN (?)")
+          when "not_in"
+            scope_options(condition, column_type, "#{table_name}.#{column} NOT IN (?)")
           end
           
           named_scope("#{column}_#{condition}".to_sym, scope_options)

data/lib/searchlogic/named_scopes/or_conditions.rb

@@ -67,14 +67,16 @@ module Searchlogic
         def interpolate_or_conditions(parts)
           conditions = []
           last_condition = nil
-          
+
           parts.reverse.each do |part|
             if details = condition_details(part)
               # We are a searchlogic defined scope
               conditions << "#{details[:column]}_#{details[:condition]}"
               last_condition = details[:condition]
-            elsif details = association_condition_details(part)
-              # pending, need to find the last condition
+            elsif association_details = association_condition_details(part, last_condition)
+              path = full_association_path(part, last_condition, association_details[:association])
+              conditions << "#{path[:path].join("_").to_sym}_#{path[:column]}_#{path[:condition]}"
+              last_condition = path[:condition] || nil
             elsif local_condition?(part)
               # We are a custom scope
               conditions << part
@@ -91,7 +93,24 @@ module Searchlogic
             end
           end
           
-          conditions
+          conditions.reverse
+        end
+
+        def full_association_path(part, last_condition, given_assoc)
+            path = [given_assoc.to_sym]
+            part.sub!(/^#{given_assoc}_/, "")
+            klass = self
+            while klass = klass.send(:reflect_on_association, given_assoc.to_sym)
+              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, nil)
+                return { :path => path, :column => details[:column], :condition => details[:condition] }
+              end
+            end
+            { :path => path, :column => part, :condition => last_condition }
         end
         
         def create_or_condition(scopes, args)
@@ -109,8 +128,10 @@ module Searchlogic
             scope.send(scope_name, *args)
           end
           
-          scope.scope(:find).merge(:conditions => "(" + conditions.join(") OR (") + ")")
+          options = scope.scope(:find)
+          options.delete(:readonly) unless scope.proxy_options.key?(:readonly)
+          options.merge(:conditions => "(" + conditions.join(") OR (") + ")")
         end
     end
   end
-end
+end

data/lib/searchlogic/named_scopes/ordering.rb

@@ -45,4 +45,4 @@ module Searchlogic
         end
     end
   end
-end
+end

data/lib/searchlogic/search.rb

@@ -96,7 +96,7 @@ module Searchlogic
             conditions[condition_name]
           end
         else
-          scope = conditions.inject(klass.scoped(current_scope)) do |scope, condition|
+          scope = conditions.inject(klass.scoped(current_scope) || {}) do |scope, condition|
             scope_name, value = condition
             scope_name = normalize_scope_name(scope_name)
             klass.send(scope_name, value) if !klass.respond_to?(scope_name)
@@ -117,7 +117,11 @@ module Searchlogic
       end
       
       def normalize_scope_name(scope_name)
-        klass.column_names.include?(scope_name.to_s) ? "#{scope_name}_equals".to_sym : scope_name.to_sym
+        case
+        when klass.scopes.key?(scope_name.to_sym) then scope_name.to_sym
+        when klass.column_names.include?(scope_name.to_s) then "#{scope_name}_equals".to_sym
+        else scope_name.to_sym
+        end
       end
       
       def setter?(name)
@@ -125,8 +129,8 @@ module Searchlogic
       end
       
       def condition_name(name)
-        condition = name.to_s.match(/(\w+)=?$/)[1]
-        condition ? condition.to_sym : nil
+        condition = name.to_s.match(/(\w+)=?$/)
+        condition ? condition[1].to_sym : nil
       end
       
       def scope_name(condition_name)
@@ -138,7 +142,7 @@ module Searchlogic
       end
       
       def cast_type(name)
-        klass.send(name, nil) if !klass.respond_to?(name) # We need to set up the named scope if it doesn't exist, so we can get a value for named_ssope_options
+        klass.send(name, nil) if !klass.respond_to?(name) # We need to set up the named scope if it doesn't exist, so we can get a value for named_scope_options
         named_scope_options = klass.named_scope_options(name)
         arity = klass.named_scope_arity(name)
         if !arity || arity == 0
@@ -152,6 +156,8 @@ module Searchlogic
         case value
         when Array
           value.collect { |v| type_cast(v, type) }
+        when Range
+          Range.new(type_cast(value.first, type), type_cast(value.last, type))
         else
           # Let's leverage ActiveRecord's type casting, so that casting is consistent
           # with the other models.

data/searchlogic.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.3.5"
+  s.version = "2.3.6"
 
   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-09-13}
+  s.date = %q{2009-11-05}
   s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
@@ -82,3 +82,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activerecord>, [">= 2.0.0"])
   end
 end
+

data/spec/named_scopes/conditions_spec.rb

@@ -15,7 +15,6 @@ describe "Conditions" do
     it "should have equals" do
       (5..7).each { |age| User.create(:age => age) }
       User.age_equals(6).all.should == User.find_all_by_age(6)
-      User.age_equals(nil).all.should == User.find_all_by_age(nil)
       User.age_equals(5..6).all.should == User.find_all_by_age(5..6)
       User.age_equals([5, 7]).all.should == User.find_all_by_age([5, 7])
     end
@@ -269,6 +268,18 @@ describe "Conditions" do
     end
   end
   
+  context "group conditions" do
+    it "should have in" do
+      (5..7).each { |age| User.create(:age => age) }
+      User.age_in([5,6]).all == User.find(:all, :conditions => ["users.age IN (?)", [5, 6]])
+    end
+    
+    it "should have not_in" do
+      (5..7).each { |age| User.create(:age => age) }
+      User.age_not_in([5,6]).all == User.find(:all, :conditions => ["users.age NOT IN (?)", [5, 6]])
+    end
+  end
+  
   context "searchlogic lambda" do
     it "should be a string" do
       User.username_like("test")

data/spec/named_scopes/or_conditions_spec.rb

@@ -1,16 +1,21 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe "Or conditions" do
+  it "should define a scope by the exact same name as requested by the code" do
+    User.name_or_username_like('Test')
+    User.respond_to?(:name_or_username_like).should be_true
+  end
+  
   it "should match username or name" do
-    User.username_or_name_like("ben").proxy_options.should == {:conditions => "(users.name LIKE '%ben%') OR (users.username LIKE '%ben%')"}
+    User.username_or_name_like("ben").proxy_options.should == {:conditions => "(users.username LIKE '%ben%') OR (users.name LIKE '%ben%')"}
   end
   
   it "should use the specified condition" do
-    User.username_begins_with_or_name_like("ben").proxy_options.should == {:conditions => "(users.name LIKE '%ben%') OR (users.username LIKE 'ben%')"}
+    User.username_begins_with_or_name_like("ben").proxy_options.should == {:conditions => "(users.username LIKE 'ben%') OR (users.name LIKE '%ben%')"}
   end
   
   it "should use the last specified condition" do
-    User.username_or_name_like_or_id_or_age_lt(10).proxy_options.should == {:conditions => "(users.age < 10) OR (users.id < 10) OR (users.name LIKE '%10%') OR (users.username LIKE '%10%')"}
+    User.username_or_name_like_or_id_or_age_lt(10).proxy_options.should == {:conditions => "(users.username LIKE '%10%') OR (users.name LIKE '%10%') OR (users.id < 10) OR (users.age < 10)"}
   end
   
   it "should raise an error on unknown conditions" do
@@ -18,19 +23,31 @@ describe "Or conditions" do
   end
   
   it "should work well with _or_equal_to" do
-    User.id_less_than_or_equal_to_or_age_gt(10).proxy_options.should == {:conditions => "(users.age > 10) OR (users.id <= 10)"}
+    User.id_less_than_or_equal_to_or_age_gt(10).proxy_options.should == {:conditions => "(users.id <= 10) OR (users.age > 10)"}
   end
   
   it "should work well with _or_equal_to_any" do
-    User.id_less_than_or_equal_to_all_or_age_gt(10).proxy_options.should == {:conditions => "(users.age > 10) OR (users.id <= 10)"}
+    User.id_less_than_or_equal_to_all_or_age_gt(10).proxy_options.should == {:conditions => "(users.id <= 10) OR (users.age > 10)"}
   end
   
   it "should work well with _or_equal_to_all" do
-    User.id_less_than_or_equal_to_any_or_age_gt(10).proxy_options.should == {:conditions => "(users.age > 10) OR (users.id <= 10)"}
+    User.id_less_than_or_equal_to_any_or_age_gt(10).proxy_options.should == {:conditions => "(users.id <= 10) OR (users.age > 10)"}
   end
   
   it "should play nice with other scopes" do
     User.username_begins_with("ben").id_gt(10).age_not_nil.username_or_name_ends_with("ben").scope(:find).should ==
-      {:conditions => "((users.name LIKE '%ben') OR (users.username LIKE '%ben')) AND ((users.age IS NOT NULL) AND ((users.id > 10) AND (users.username LIKE 'ben%')))"}
+      {:conditions => "((users.username LIKE '%ben') OR (users.name LIKE '%ben')) AND ((users.age IS NOT NULL) AND ((users.id > 10) AND (users.username LIKE 'ben%')))"}
+  end
+  
+  it "should play nice with scopes on associations" do
+    lambda { User.name_or_company_name_like("ben") }.should_not raise_error(Searchlogic::NamedScopes::OrConditions::NoConditionSpecifiedError)
+    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%')"}
+  end
+
+  it "should play nice with n-depth scopes on associations" do
+    User.company_conglomerate_name_or_company_conglomerate_description_like("ben").proxy_options.should ==
+      {:joins =>[{:company, :conglomerate}], :conditions => "(conglomerates.name LIKE '%ben%') OR (conglomerates.description LIKE '%ben%')"}
   end
-end
+end

data/spec/search_spec.rb

@@ -75,6 +75,15 @@ describe "Search" do
       search.username.should be_nil
     end
     
+    it "should use custom scopes before normalizing" do
+      User.create(:username => "bjohnson")
+      User.named_scope :username, lambda { |value| {:conditions => {:username => value.reverse}} }
+      search1 = User.search(:username => "bjohnson")
+      search2 = User.search(:username => "nosnhojb")
+      search1.count.should == 0
+      search2.count.should == 1
+    end
+    
     it "should ignore blank values in arrays" do
       search = User.search
       search.conditions = {"username_equals_any" => [""]}
@@ -95,7 +104,7 @@ describe "Search" do
       search.username_gt.should == "bjohnson"
     end
     
-    it "should allow chainging conditions" do
+    it "should allow chaining conditions" do
       user = User.create(:username => "bjohnson", :age => 20)
       User.create(:username => "bjohnson", :age => 5)
       search = User.search
@@ -103,6 +112,12 @@ describe "Search" do
       search.all.should == [user]
     end
     
+    it "should allow chaining conditions with n-depth associations" do
+      search = User.search
+      search.company_conglomerate_name_or_company_conglomerate_description_like("ben")
+      search.proxy_options.should == User.company_conglomerate_name_or_company_conglomerate_description_like("ben").proxy_options
+    end
+
     it "should allow setting association conditions" do
       search = User.search
       search.orders_total_gt = 10
@@ -237,6 +252,12 @@ describe "Search" do
         search.total_gt.should == 1.5
       end
       
+      it "should be a Range given 1..3" do
+        search = Order.search
+        search.total_eq = (1..3)
+        search.total_eq.should == (1..3)
+      end
+      
       it "should be a Date given 'Jan 1, 2009'" do
         search = Order.search
         search.shipped_on_after = "Jan 1, 2009"
@@ -321,4 +342,22 @@ describe "Search" do
       User.search(:order => "ascend_by_username").proxy_options.should == User.ascend_by_username.proxy_options
     end
   end
+  
+  context "method delegation" do
+    it "should respond to count" do
+      User.create(:username => "bjohnson")
+      search1 = User.search(:username => "bjohnson")
+      search2 = User.search(:username => "nosnhojb")
+      search1.count.should == 1
+      search2.count.should == 0
+    end
+    
+    it "should respond to empty?" do
+      User.create(:username => "bjohnson")
+      search1 = User.search(:username => "bjohnson")
+      search2 = User.search(:username => "nosnhojb")
+      search1.empty?.should == false
+      search2.empty?.should == true
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -15,6 +15,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.datetime :created_at
     t.datetime :updated_at
     t.string :name
+    t.string :description
     t.integer :users_count, :default => 0
   end
   
@@ -56,6 +57,13 @@ ActiveRecord::Schema.define(:version => 1) do
     t.integer :order_id
     t.float :price
   end
+
+  create_table :conglomerates do |t|
+    t.datetime :created_at
+    t.datetime :updated_at
+    t.string :name
+    t.string :description
+  end
 end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -65,6 +73,7 @@ require 'searchlogic'
 Spec::Runner.configure do |config|
   config.before(:each) do
     class Company < ActiveRecord::Base
+      belongs_to :conglomerate
       has_many :users, :dependent => :destroy
     end
     
@@ -86,6 +95,10 @@ Spec::Runner.configure do |config|
     class LineItem < ActiveRecord::Base
       belongs_to :order
     end
+
+    class Conglomerate < ActiveRecord::Base
+      has_many :companies, :dependent => :destroy
+    end
     
     Company.destroy_all
     User.destroy_all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-13 00:00:00 -04:00
+date: 2009-11-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency