searchlogic 2.4.32 → 2.5.19

data/spec/searchlogic/active_record/consistency_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe Searchlogic::ActiveRecord::Consistency do
   it "should merge joins with consistent conditions" do

data/spec/searchlogic/core_ext/object_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe Searchlogic::CoreExt::Object do
   it "should accept and pass the argument to the searchlogic_options" do

data/spec/searchlogic/core_ext/proc_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe Searchlogic::CoreExt::Proc do
   it "should have a searchlogic_options accessor" do

data/spec/searchlogic/named_scopes/alias_scope_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe Searchlogic::NamedScopes::AliasScope do
   before(:each) do
@@ -11,6 +11,13 @@ describe Searchlogic::NamedScopes::AliasScope do
     User.username_has("bjohnson").all.should == User.find_all_by_username("bjohnson")
   end
   
+  it "should allow alias scopes with symbols" do
+    User.alias_scope :login_has, :username_has
+    User.create(:username => "bjohnson")
+    User.create(:username => "thunt")
+    User.login_has("bjohnson").all.should == User.find_all_by_username("bjohnson")
+  end
+  
   it "should allow alias scopes from the search object" do
     search = User.search
     search.username_has = "bjohnson"
@@ -18,6 +25,6 @@ describe Searchlogic::NamedScopes::AliasScope do
   end
   
   it "should inherit alias scopes from superclasses" do
-    Class.new(User).alias_scope?("username_has").should be_true
+    Class.new(User).condition?("username_has").should be_true
   end
 end

data/spec/searchlogic/named_scopes/association_conditions_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe Searchlogic::NamedScopes::AssociationConditions do
   it "should create a named scope" do
@@ -210,4 +210,37 @@ describe Searchlogic::NamedScopes::AssociationConditions do
     user.orders.shipped_on_not_null.shipped_on_greater_than(2.days.ago).count.should == 1
   end
 
+  it "should allow chained dynamic scopes without losing association scope conditions" do
+    user = User.create
+    order1 = Order.create :user => user, :shipped_on => Time.now, :total => 2
+    order2 = Order.create :shipped_on => Time.now, :total => 2
+    user.orders.id_equals(order1.id).count.should == 1
+    user.orders.id_equals(order1.id).total_equals(2).count.should == 1
+  end
+
+  it "shouldn't cache the lambda of a named_scope for a chained association" do
+    user = User.create
+    Order.create :user => user, :shipped_on => Time.current
+
+    # create the named_scope and use it through a chained association
+    Order.named_scope :shipped, lambda { {:conditions => ["shipped_on <= ?", Time.current]} }
+    User.orders_shipped
+
+    # simulate a day passing after the chained scope is first used
+    Timecop.travel(Date.tomorrow)
+
+    # make a new object that is active on our simulated day
+    Order.create :user => user, :shipped_on => Time.current
+
+    # we have 2 orders and both were shipped on or before the current time,
+    # so both should be included in the scope
+    user.orders.count.should == 2
+    User.orders_shipped.count.should == 2
+  end
+
+  it "should allow Marshal.dump on objects that only have polymorphic associations where a polymorphic association is loaded" do
+    audit = Audit.create
+    audit.auditable = User.create
+    lambda { Marshal.dump(audit) }.should_not raise_error
+  end
 end

data/spec/searchlogic/named_scopes/association_ordering_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe Searchlogic::NamedScopes::Ordering do
   it "should allow ascending" do

data/spec/searchlogic/named_scopes/{conditions_spec.rb → column_conditions_spec.rb}

@@ -1,9 +1,13 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
-describe Searchlogic::NamedScopes::Conditions do
+describe Searchlogic::NamedScopes::ColumnConditions do
   it "should be dynamically created and then cached" do
-    User.should_not respond_to(:age_less_than)
+    User.scopes.key?(:age_less_than).should == false
     User.age_less_than(5)
+    User.scopes.key?(:age_less_than).should == true
+  end
+  
+  it "should respond to the scope" do
     User.should respond_to(:age_less_than)
   end
   
@@ -14,14 +18,17 @@ describe Searchlogic::NamedScopes::Conditions do
   context "comparison conditions" do
     it "should have equals" do
       (5..7).each { |age| User.create(:age => age) }
+      nil_user = User.create
       User.age_equals(6).all.should == User.find_all_by_age(6)
-      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])
+      User.age_equals(nil).all.should == User.find_all_by_age(nil)
     end
     
     it "should have does not equal" do
       (5..7).each { |age| User.create(:age => age) }
       User.age_does_not_equal(6).all.should == User.find_all_by_age([5,7])
+      
+      User.create!(:age => nil)
+      User.age_does_not_equal(nil).all.size.should == 3
     end
     
     it "should have less than" do
@@ -322,4 +329,8 @@ describe Searchlogic::NamedScopes::Conditions do
     count2 = User.id_ne(10).username_not_like("root").count
     count1.should == count2
   end
+  
+  it "should produce left outer joins" do
+    User.left_outer_joins(:orders).should == [" LEFT OUTER JOIN \"orders\" ON orders.user_id = users.id "]
+  end
 end

data/spec/searchlogic/named_scopes/or_conditions_spec.rb

@@ -1,51 +1,62 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe Searchlogic::NamedScopes::OrConditions 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.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.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.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
     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.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.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.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.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 work with boolean conditions" do
+    User.male_or_name_eq("susan").proxy_options.should == {:conditions => %Q{("users"."male" = 't') OR (users.name = 'susan')}}
+    User.not_male_or_name_eq("susan").proxy_options.should == {:conditions => %Q{("users"."male" = 'f') OR (users.name = 'susan')}}
+    lambda { User.male_or_name_eq("susan").all }.should_not raise_error
+  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%')"}
+    User.name_or_company_name_like("ben").proxy_options.should == {:joins => ["LEFT OUTER JOIN \"companies\" ON \"companies\".id = \"users\".company_id"], :conditions => "(users.name LIKE '%ben%') OR (companies.name LIKE '%ben%')"}
+    User.company_name_or_name_like("ben").proxy_options.should == {:joins => ["LEFT OUTER JOIN \"companies\" ON \"companies\".id = \"users\".company_id"], :conditions => "(companies.name LIKE '%ben%') OR (users.name LIKE '%ben%')"}
+    User.company_name_or_company_description_like("ben").proxy_options.should == {:joins => ["LEFT OUTER JOIN \"companies\" ON \"companies\".id = \"users\".company_id"], :conditions => "(companies.name LIKE '%ben%') OR (companies.description LIKE '%ben%')"}
+    Cart.user_company_name_or_user_company_name_like("ben").proxy_options.should == {:joins => ["LEFT OUTER JOIN \"users\" ON \"carts\".user_id = \"users\".id", "LEFT OUTER JOIN \"companies\" ON \"companies\".id = \"users\".company_id"], :conditions => "(companies.name LIKE '%ben%') OR (companies.name LIKE '%ben%')"}
+  end
+
+  it "should raise an error on missing condition" do
+    lambda { User.id_or_age(123) }.should raise_error(Searchlogic::NamedScopes::OrConditions::NoConditionSpecifiedError)
   end
-  
+
   it "should not get confused by the 'or' in find_or_create_by_* methods" do
     User.create(:name => "Fred")
     User.find_or_create_by_name("Fred").should be_a_kind_of User
@@ -55,7 +66,7 @@ describe Searchlogic::NamedScopes::OrConditions do
     User.create(:name => "Fred", :username => "fredb")
     User.find_or_create_by_name_and_username("Fred", "fredb").should be_a_kind_of User
   end
-  
+
   it "should work with User.search(conditions) method" do
     User.search(:username_or_name_like => 'ben').proxy_options.should == {:conditions => "(users.username LIKE '%ben%') OR (users.name LIKE '%ben%')"}
   end
@@ -63,4 +74,11 @@ describe Searchlogic::NamedScopes::OrConditions do
   it "should convert types properly when used with User.search(conditions) method" do
     User.search(:id_or_age_lte => '10').proxy_options.should == {:conditions => "(users.id <= 10) OR (users.age <= 10)"}
   end
+
+  it "should converts inner joins to left out joins" do
+    scopes = []
+    scopes << User.orders_id_equals(1)
+    scopes << User.carts_id_equals(1)
+    User.send(:merge_scopes_with_or, scopes).should == {:conditions=>"(orders.id = 1) OR (carts.id = 1)", :joins=>["LEFT OUTER JOIN \"carts\" ON carts.user_id = users.id", "LEFT OUTER JOIN \"orders\" ON orders.user_id = users.id"]}
+  end
 end

data/spec/searchlogic/named_scopes/ordering_spec.rb

@@ -1,22 +1,16 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require 'spec_helper'
 
 describe Searchlogic::NamedScopes::Ordering do
-  it "should be dynamically created and then cached" do
-    User.should_not respond_to(:ascend_by_username)
-    User.ascend_by_username
-    User.should respond_to(:ascend_by_username)
-  end
-  
   it "should have ascending" do
     %w(bjohnson thunt).each { |username| User.create(:username => username) }
     User.ascend_by_username.all.should == User.all(:order => "username ASC")
   end
-  
+
   it "should have descending" do
     %w(bjohnson thunt).each { |username| User.create(:username => username) }
     User.descend_by_username.all.should == User.all(:order => "username DESC")
   end
-  
+
   it "should have order" do
     User.order("ascend_by_username").proxy_options.should == User.ascend_by_username.proxy_options
   end
@@ -27,7 +21,7 @@ describe Searchlogic::NamedScopes::Ordering do
     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
   end