kazjote-searchlogic 2.1.9.3 → 2.3.4

data/lib/searchlogic.rb

@@ -1,30 +1,37 @@
 require "searchlogic/core_ext/proc"
 require "searchlogic/core_ext/object"
-require "searchlogic/active_record_consistency"
+require "searchlogic/active_record/consistency"
+require "searchlogic/active_record/named_scopes"
 require "searchlogic/named_scopes/conditions"
 require "searchlogic/named_scopes/ordering"
 require "searchlogic/named_scopes/association_conditions"
 require "searchlogic/named_scopes/association_ordering"
 require "searchlogic/named_scopes/alias_scope"
+require "searchlogic/named_scopes/or_conditions"
 require "searchlogic/search"
 
 Proc.send(:include, Searchlogic::CoreExt::Proc)
 Object.send(:include, Searchlogic::CoreExt::Object)
+
+module ActiveRecord # :nodoc: all
+  class Base
+    class << self; include Searchlogic::ActiveRecord::Consistency; end
+  end
+end
+
+ActiveRecord::Base.extend(Searchlogic::ActiveRecord::NamedScopes)
 ActiveRecord::Base.extend(Searchlogic::NamedScopes::Conditions)
-ActiveRecord::Base.extend(Searchlogic::NamedScopes::Ordering)
 ActiveRecord::Base.extend(Searchlogic::NamedScopes::AssociationConditions)
 ActiveRecord::Base.extend(Searchlogic::NamedScopes::AssociationOrdering)
+ActiveRecord::Base.extend(Searchlogic::NamedScopes::Ordering)
 ActiveRecord::Base.extend(Searchlogic::NamedScopes::AliasScope)
+ActiveRecord::Base.extend(Searchlogic::NamedScopes::OrConditions)
 ActiveRecord::Base.extend(Searchlogic::Search::Implementation)
 
 # Try to use the search method, if it's available. Thinking sphinx and other plugins
 # like to use that method as well.
 if !ActiveRecord::Base.respond_to?(:search)
-  ActiveRecord::Base.class_eval do
-    class << self
-      alias_method :search, :searchlogic
-    end
-  end
+  ActiveRecord::Base.class_eval { class << self; alias_method :search, :searchlogic; end }
 end
 
 if defined?(ActionController)

data/searchlogic.gemspec

@@ -1,13 +1,16 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.1.9.3"
+  s.version = "2.3.4"
 
   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-16}
-  s.description = %q{Searchlogic provides common named scopes and object based searching for ActiveRecord.}
+  s.date = %q{2009-09-02}
+  s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -22,13 +25,15 @@ Gem::Specification.new do |s|
      "VERSION.yml",
      "init.rb",
      "lib/searchlogic.rb",
-     "lib/searchlogic/active_record_consistency.rb",
+     "lib/searchlogic/active_record/consistency.rb",
+     "lib/searchlogic/active_record/named_scopes.rb",
      "lib/searchlogic/core_ext/object.rb",
      "lib/searchlogic/core_ext/proc.rb",
      "lib/searchlogic/named_scopes/alias_scope.rb",
      "lib/searchlogic/named_scopes/association_conditions.rb",
      "lib/searchlogic/named_scopes/association_ordering.rb",
      "lib/searchlogic/named_scopes/conditions.rb",
+     "lib/searchlogic/named_scopes/or_conditions.rb",
      "lib/searchlogic/named_scopes/ordering.rb",
      "lib/searchlogic/rails_helpers.rb",
      "lib/searchlogic/search.rb",
@@ -40,6 +45,7 @@ Gem::Specification.new do |s|
      "spec/named_scopes/association_conditions_spec.rb",
      "spec/named_scopes/association_ordering_spec.rb",
      "spec/named_scopes/conditions_spec.rb",
+     "spec/named_scopes/or_conditions_spec.rb",
      "spec/named_scopes/ordering_spec.rb",
      "spec/search_spec.rb",
      "spec/spec_helper.rb"
@@ -48,8 +54,8 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{searchlogic}
-  s.rubygems_version = %q{1.3.4}
-  s.summary = %q{Searchlogic provides common named scopes and object based searching for ActiveRecord.}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.test_files = [
     "spec/core_ext/object_spec.rb",
      "spec/core_ext/proc_spec.rb",
@@ -57,6 +63,7 @@ Gem::Specification.new do |s|
      "spec/named_scopes/association_conditions_spec.rb",
      "spec/named_scopes/association_ordering_spec.rb",
      "spec/named_scopes/conditions_spec.rb",
+     "spec/named_scopes/or_conditions_spec.rb",
      "spec/named_scopes/ordering_spec.rb",
      "spec/search_spec.rb",
      "spec/spec_helper.rb"

data/spec/named_scopes/alias_scope_spec.rb

@@ -1,6 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe "AliasScope" do
+  before(:each) do
+    User.alias_scope :username_has, lambda { |value| User.username_like(value) }
+  end
+  
   it "should allow alias scopes" do
     User.create(:username => "bjohnson")
     User.create(:username => "thunt")

data/spec/named_scopes/association_conditions_spec.rb

@@ -9,11 +9,36 @@ describe "Association Conditions" do
     Company.users_orders_total_greater_than(10).proxy_options.should == Order.total_greater_than(10).proxy_options.merge(:joins => {:users => :orders})
   end
   
-  it "should not allowed named scopes on non existent association columns" do
+  it "should allow the use of foreign pre-existing named scopes" do
+    User.named_scope :uname, lambda { |value| {:conditions => ["users.username = ?", value]} }
+    Company.users_uname("bjohnson").proxy_options.should == User.uname("bjohnson").proxy_options.merge(:joins => :users)
+  end
+  
+  it "should allow the use of deep foreign pre-existing named scopes" do
+    pending
+    Order.named_scope :big_id, :conditions => "orders.id > 100"
+    Company.users_orders_big_id.proxy_options.should == Order.big_id.proxy_options.merge(:joins => {:users => :orders})
+  end
+  
+  it "should allow the use of foreign pre-existing alias scopes" do
+    User.alias_scope :username_has, lambda { |value| User.username_like(value) }
+    Company.users_username_has("bjohnson").proxy_options.should == User.username_has("bjohnson").proxy_options.merge(:joins => :users)
+  end
+  
+  it "should not raise errors for scopes that don't return anything" do
+    User.alias_scope :blank_scope, lambda { |value| }
+    Company.users_blank_scope("bjohnson").proxy_options.should == {:joins => :users}
+  end
+  
+  it "should ignore polymorphic associations" do
+    lambda { Fee.owner_created_at_gt(Time.now) }.should raise_error(NoMethodError)
+  end
+  
+  it "should not allow named scopes on non existent association columns" do
     lambda { User.users_whatever_like("bjohnson") }.should raise_error(NoMethodError)
   end
   
-  it "should not allowed named scopes on non existent deep association columns" do
+  it "should not allow named scopes on non existent deep association columns" do
     lambda { User.users_orders_whatever_like("bjohnson") }.should raise_error(NoMethodError)
   end
   
@@ -101,4 +126,9 @@ describe "Association Conditions" do
     order = user.orders.create(:total => 20, :taxes => 3)
     Company.users_orders_taxes_lt(50).ascend_by_users_orders_total.all(:include => {:users => :orders}).should == Company.all
   end
+  
+  it "should automatically add string joins if the association condition is using strings" do
+    User.named_scope(:orders_big_id, :joins => User.inner_joins(:orders))
+    Company.users_orders_big_id.proxy_options.should == {:joins=>[" INNER JOIN \"users\" ON users.company_id = companies.id ", " INNER JOIN \"orders\" ON orders.user_id = users.id "]}
+  end
 end

data/spec/named_scopes/association_ordering_spec.rb

@@ -16,4 +16,12 @@ describe "Association Ordering" do
   it "should allow deep descending" do
     Company.descend_by_users_orders_total.proxy_options.should == Order.descend_by_total.proxy_options.merge(:joins => {:users => :orders})
   end
+  
+  it "should ascend with a belongs to" do
+    User.ascend_by_company_name.proxy_options.should == Company.ascend_by_name.proxy_options.merge(:joins => :company)
+  end
+  
+  it "should work through #order" do
+    Company.order('ascend_by_users_username').proxy_options.should == Company.ascend_by_users_username.proxy_options
+  end
 end

data/spec/named_scopes/conditions_spec.rb

@@ -15,6 +15,9 @@ 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
     
     it "should have does not equal" do
@@ -90,6 +93,16 @@ describe "Conditions" do
       ["bjohnson", ""].each { |username| User.create(:username => username) }
       User.username_empty.all.should == User.find_all_by_username("")
     end
+    
+    it "should have blank" do
+      ["bjohnson", "", nil].each { |username| User.create(:username => username) }
+      User.username_blank.all.should == [User.find_by_username(""), User.find_by_username(nil)]
+    end
+    
+    it "should have not blank" do
+      ["bjohnson", "", nil].each { |username| User.create(:username => username) }
+      User.username_not_blank.all.should == User.find_all_by_username("bjohnson")
+    end
   end
   
   context "any and all conditions" do
@@ -97,6 +110,11 @@ describe "Conditions" do
       User.username_equals_any.proxy_options.should == {}
     end
     
+    it "should treat an array and multiple arguments the same" do
+      %w(bjohnson thunt dgainor).each { |username| User.create(:username => username) }
+      User.username_like_any("bjohnson", "thunt").should == User.username_like_any(["bjohnson", "thunt"])
+    end
+    
     it "should have equals any" do
       %w(bjohnson thunt dgainor).each { |username| User.create(:username => username) }
       User.username_equals_any("bjohnson", "thunt").all == User.find_all_by_username(["bjohnson", "thunt"])
@@ -203,9 +221,6 @@ describe "Conditions" do
     end
     
     it "should have is_not" do
-      # This is matching "not" first. How do you give priority in a regex? Because it's matching the
-      # 'not' condition and thinking the column is 'age_is'.
-      pending
       User.age_is_not(5).proxy_options.should == User.age_does_not_equal(5).proxy_options
     end
     
@@ -273,5 +288,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

data/spec/named_scopes/or_conditions_spec.rb

@@ -0,0 +1,36 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+
+describe "Or conditions" do
+  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%')"}
+  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%')"}
+  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%')"}
+  end
+  
+  it "should raise an error on unknown conditions" do
+    lambda { User.usernme_begins_with_or_name_like("ben") }.should raise_error(Searchlogic::NamedScopes::OrConditions::UnknownConditionError)
+  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)"}
+  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)"}
+  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)"}
+  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%')))"}
+  end
+end

data/spec/named_scopes/ordering_spec.rb

@@ -20,6 +20,13 @@ describe "Ordering" do
   it "should have order" do
     User.order("ascend_by_username").proxy_options.should == User.ascend_by_username.proxy_options
   end
+
+  it "should have order by custom scope" do
+    User.column_names.should_not include("custom")
+    %w(bjohnson thunt fisons).each { |username| User.create(:username => username) }
+    User.named_scope(:ascend_by_custom, :order => "username ASC, name DESC")
+    User.order("ascend_by_custom").proxy_options.should == User.ascend_by_custom.proxy_options
+  end
   
   it "should have priorty to columns over conflicting association columns" do
     Company.ascend_by_users_count

data/spec/search_spec.rb

@@ -14,7 +14,9 @@ describe "Search" do
       company = Company.create
       user = company.users.create
       search = company.users.search
-      search.current_scope.should == company.users.scope(:find)
+      expected_options = company.users.scope(:find).dup
+      expected_options.delete(:order)
+      search.current_scope.should == expected_options
     end
   end
 
@@ -109,6 +111,20 @@ describe "Search" do
       search.orders_total_gt.should == 10
     end
 
+    it "should allow setting pre-existing association conditions" do
+      User.named_scope :uname, lambda { |value| {:conditions => ["users.username = ?", value]} }
+      search = Company.search
+      search.users_uname = "bjohnson"
+      search.users_uname.should == "bjohnson"
+    end
+
+    it "should allow setting pre-existing association alias conditions" do
+      User.alias_scope :username_has, lambda { |value| User.username_like(value) }
+      search = Company.search
+      search.users_username_has = "bjohnson"
+      search.users_username_has.should == "bjohnson"
+    end
+
     it "should allow using custom conditions" do
       User.named_scope(:four_year_olds, { :conditions => { :age => 4 } })
       search = User.search
@@ -146,6 +162,11 @@ describe "Search" do
       lambda { search.unknown = true }.should raise_error(Searchlogic::Search::UnknownConditionError)
     end
 
+    it "should not allow setting conditions on sensitive methods" do
+      search = User.search
+      lambda { search.destroy = true }.should raise_error(Searchlogic::Search::UnknownConditionError)
+    end
+
     it "should not use the ruby implementation of the id method" do
       search = User.search
       search.id.should be_nil
@@ -301,6 +322,19 @@ describe "Search" do
     it "should recognize the order condition" do
       User.search(:order => "ascend_by_username").proxy_options.should == User.ascend_by_username.proxy_options
     end
+
+    it "should not use default scope ordering when one explicitly provided" do
+      # default_scope is :order => "created_at asc"
+      fee1 = Fee.create(:cost => 2.0)
+      fee2 = Fee.create(:cost => 1.0)
+
+      Fee.search(:order => "ascend_by_cost").proxy_options.should == {:order => "fees.cost ASC"}
+    end
+
+    it "should use default scope ordering when no ordering conditions provided" do
+      # default_scope is :order => "created_at asc"
+      Fee.search.proxy_options.should == {:order => "created_at ASC"}
+    end
   end
 end
 

data/spec/spec_helper.rb

@@ -14,9 +14,10 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :companies do |t|
     t.datetime :created_at
     t.datetime :updated_at
+    t.string :name
     t.integer :users_count, :default => 0
   end
-  
+
   create_table :users do |t|
     t.datetime :created_at
     t.datetime :updated_at
@@ -25,7 +26,13 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string :name
     t.integer :age
   end
-  
+
+  create_table :carts do |t|
+    t.datetime :created_at
+    t.datetime :updated_at
+    t.integer :user_id
+  end
+
   create_table :orders do |t|
     t.datetime :created_at
     t.datetime :updated_at
@@ -34,7 +41,15 @@ ActiveRecord::Schema.define(:version => 1) do
     t.float :taxes
     t.float :total
   end
-  
+
+  create_table :fees do |t|
+    t.datetime :created_at
+    t.datetime :updated_at
+    t.string :owner_type
+    t.integer :owner_id
+    t.float :cost
+  end
+
   create_table :line_items do |t|
     t.datetime :created_at
     t.datetime :updated_at
@@ -52,28 +67,34 @@ Spec::Runner.configure do |config|
     class Company < ActiveRecord::Base
       has_many :users, :dependent => :destroy
     end
-    
+
     class User < ActiveRecord::Base
       belongs_to :company, :counter_cache => true
       has_many :orders, :dependent => :destroy
-      alias_scope :username_has, lambda { |value| username_like(value) }
+      has_many :orders_big, :class_name => 'Order', :conditions => 'total > 100'
     end
-    
+
     class Order < ActiveRecord::Base
       belongs_to :user
       has_many :line_items, :dependent => :destroy
     end
-    
+
+    class Fee < ActiveRecord::Base
+      belongs_to :owner, :polymorphic => true
+
+      default_scope :order => "created_at ASC"
+    end
+
     class LineItem < ActiveRecord::Base
       belongs_to :order
     end
-    
+
     Company.destroy_all
     User.destroy_all
     Order.destroy_all
     LineItem.destroy_all
   end
-  
+
   config.after(:each) do
     Object.send(:remove_const, :Company)
     Object.send(:remove_const, :User)
@@ -81,3 +102,4 @@ Spec::Runner.configure do |config|
     Object.send(:remove_const, :LineItem)
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kazjote-searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.1.9.3
+  version: 2.3.4
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-16 00:00:00 -07:00
+date: 2009-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.0
     version: 
-description: Searchlogic provides common named scopes and object based searching for ActiveRecord.
+description: Searchlogic makes using ActiveRecord named scopes easier and less repetitive.
 email: bjohnson@binarylogic.com
 executables: []
 
@@ -40,13 +40,15 @@ files:
 - VERSION.yml
 - init.rb
 - lib/searchlogic.rb
-- lib/searchlogic/active_record_consistency.rb
+- lib/searchlogic/active_record/consistency.rb
+- lib/searchlogic/active_record/named_scopes.rb
 - lib/searchlogic/core_ext/object.rb
 - lib/searchlogic/core_ext/proc.rb
 - lib/searchlogic/named_scopes/alias_scope.rb
 - lib/searchlogic/named_scopes/association_conditions.rb
 - lib/searchlogic/named_scopes/association_ordering.rb
 - lib/searchlogic/named_scopes/conditions.rb
+- lib/searchlogic/named_scopes/or_conditions.rb
 - lib/searchlogic/named_scopes/ordering.rb
 - lib/searchlogic/rails_helpers.rb
 - lib/searchlogic/search.rb
@@ -58,12 +60,12 @@ files:
 - spec/named_scopes/association_conditions_spec.rb
 - spec/named_scopes/association_ordering_spec.rb
 - spec/named_scopes/conditions_spec.rb
+- spec/named_scopes/or_conditions_spec.rb
 - spec/named_scopes/ordering_spec.rb
 - spec/search_spec.rb
 - spec/spec_helper.rb
 has_rdoc: false
 homepage: http://github.com/binarylogic/searchlogic
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -84,10 +86,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: searchlogic
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
-summary: Searchlogic provides common named scopes and object based searching for ActiveRecord.
+summary: Searchlogic makes using ActiveRecord named scopes easier and less repetitive.
 test_files: 
 - spec/core_ext/object_spec.rb
 - spec/core_ext/proc_spec.rb
@@ -95,6 +97,7 @@ test_files:
 - spec/named_scopes/association_conditions_spec.rb
 - spec/named_scopes/association_ordering_spec.rb
 - spec/named_scopes/conditions_spec.rb
+- spec/named_scopes/or_conditions_spec.rb
 - spec/named_scopes/ordering_spec.rb
 - spec/search_spec.rb
 - spec/spec_helper.rb

data/lib/searchlogic/active_record_consistency.rb

@@ -1,27 +0,0 @@
-module Searchlogic
-  # Active Record is pretty inconsistent with how their SQL is constructed. This
-  # method attempts to close the gap between the various inconsistencies.
-  module ActiveRecordConsistency
-    def self.included(klass)
-      klass.class_eval do
-        alias_method_chain :merge_joins, :searchlogic
-      end
-    end
-    
-    # In AR multiple joins are sometimes in a single join query, and other time they
-    # are not. The merge_joins method in AR should account for this, but it doesn't.
-    # This fixes that problem.
-    def merge_joins_with_searchlogic(*args)
-      joins = merge_joins_without_searchlogic(*args)
-      joins.collect { |j| j.is_a?(String) ? j.split("  ") : j }.flatten.uniq
-    end
-  end
-end
-
-module ActiveRecord # :nodoc: all
-  class Base
-    class << self
-      include Searchlogic::ActiveRecordConsistency
-    end
-  end
-end