rd_searchlogic 3.0.0.rc

data/spec/searchlogic/named_scopes/association_conditions_spec.rb

@@ -0,0 +1,221 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+
+describe Searchlogic::NamedScopes::AssociationConditions do
+  it "should create a named scope" do
+    #Company.users_username_like("bjohnson").should == User.username_like("bjohnson").merge(:joins => :users)
+    Company.users_username_like("bjohnson").should == Company.joins(:users).where("users.username LIKE ?", "%bjohnson%")
+  end
+  
+  it "should create a deep named scope" do
+    Company.users_orders_total_greater_than(10).should == Company.joins(:users=>:orders).where('orders.total > ?', 10)
+  end
+
+  it "should allow the use of foreign pre-existing named scopes" do
+    User.scope :uname, lambda { |value| {:conditions => ["users.username = ?", value]} }
+    Company.users_uname("bjohnson").should == Company.joins(:users).where("users.username = ?", "bjohnson")
+  end
+
+  it "should allow the use of deep foreign pre-existing named scopes" do
+    pending
+    condition = "orders.id > 100"
+    Order.scope :big_id, :conditions => condition
+    Company.users_orders_big_id.should == Company.joins(:users=>:orders).where(condition)
+  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").should == Company.joins(:users).where("user.username LIKE ?", "%bjohnson%")
+#  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").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 allow named scopes on non existent deep association columns" do
+    lambda { User.users_orders_whatever_like("bjohnson") }.should raise_error(NoMethodError)
+  end
+
+  it "should allow named scopes to be called multiple times and reflect the value passed" do
+    Company.users_username_like("thunt").should eq_scope(Company.joins(:users).where("users.username LIKE ?", "%thunt%"))
+    Company.users_username_like("bjohnson").should eq_scope(Company.joins(:users).where("users.username LIKE ?", "%bjohnson%"))
+  end
+
+  it "should allow deep named scopes to be called multiple times and reflect the value passed" do
+    Company.users_orders_total_greater_than(10).should eq_scope(Company.joins(:users=>:orders).where('orders.total > ?', 10))
+    Company.users_orders_total_greater_than(20).should eq_scope(Company.joins(:users=>:orders).where('orders.total > ?', 20))
+  end
+
+  it "should have an arity of nil if the underlying scope has an arity of nil" do
+    Company.users_orders_total_null.should eq_scope(Company.joins(:users=>:orders).where("orders.total IS NULL"))
+  end
+
+  it "should have an arity of -1 if the underlying scope has an arity of -1" do
+    Company.users_id_equals_any.should eq_scope(Company.joins(:users))
+    Company.users_id_equals_any(1).should eq_scope(Company.joins(:users).where('users.id = ?', 1))
+    Company.users_id_equals_any(1,2).should eq_scope(Company.joins(:users).where('users.id = ? or users.id = ?', 1, 2))
+    Company.users_id_equals_any(1..10).should eq_scope(Company.joins(:users).where('users.id between ? and ?', 1, 10))
+  end
+
+  it "should allow aliases" do
+    Company.users_username_contains("bjohnson").should eq_scope(Company.joins(:users).where('users.username LIKE ?', '%bjohnson%'))
+  end
+
+  it "should allow deep aliases" do
+    Company.users_orders_total_gt(10).should eq_scope(Company.joins(:users=>:orders).where("orders.total > ?", 10))
+  end
+
+  it "should include optional associations" do
+    pending # this is a problem with using inner joins and left outer joins
+    Company.create
+    company = Company.create
+    user = company.users.create
+    order = user.orders.create(:total => 20, :taxes => 3)
+    Company.ascend_by_users_orders_total.all.should == Company.all
+  end
+
+  it "should implement exclusive scoping" do
+    Company.users_company_name_like('name').users_company_description_like('description').should
+    eq_scope(Company.joins(:users=>:company).where('companies.name like ?', '%name%').where('companies.description like ?', '%description%'))
+#    scope = Company.users_company_name_like("name").users_company_description_like("description")
+#    scope.scope(:find)[:joins].should == [
+#      "INNER JOIN \"users\" ON companies.id = users.company_id",
+#      "INNER JOIN \"companies\" companies_users ON \"companies_users\".id = \"users\".company_id"
+#    ]
+#    lambda { scope.all }.should_not raise_error
+  end
+
+  #TODO: re-add ascend_by_users_orders_total after fixing association_ordering
+  it "should not create the same join twice" do
+    Company.users_orders_total_gt(10).users_orders_taxes_lt(5).should eq_scope(
+      Company.joins(:users=>:orders).where("orders.total > ?", 10).where("orders.taxes < ?", 5)
+    )
+#    scope = Company.users_orders_total_gt(10).users_orders_taxes_lt(5).ascend_by_users_orders_total
+#    scope.scope(:find)[:joins].should == [
+#      "INNER JOIN \"users\" ON companies.id = users.company_id",
+#      "INNER JOIN \"orders\" ON orders.user_id = users.id"
+#    ]
+#    lambda { scope.count }.should_not raise_error
+  end
+
+  #TODO: fix Company.joins(:users).joins(:users=>:orders) duplicates join
+  it "should not create the same join twice when traveling through the duplicate join" do
+    pending
+    Company.users_username_like('bj').users_orders_total_gt(100).should eq_scope(
+      Company.joins(:users=>:orders).where("users.username like ?", '%bj%').where("orders.total < ?", 100)
+    )
+#    scope = Company.users_username_like("bjohnson").users_orders_total_gt(100)
+#    scope.scope(:find)[:joins].should == [
+#      "INNER JOIN \"users\" ON companies.id = users.company_id",
+#      "INNER JOIN \"orders\" ON orders.user_id = users.id"
+#    ]
+#    lambda { scope.count }.should_not raise_error
+  end
+
+#  it "should not create the same join twice when traveling through the deep duplicate join" do
+#    scope = Company.users_orders_total_gt(100).users_orders_line_items_price_gt(20)
+#    scope.scope(:find)[:joins].should == [
+#      "INNER JOIN \"users\" ON companies.id = users.company_id",
+#      "INNER JOIN \"orders\" ON orders.user_id = users.id",
+#      "INNER JOIN \"line_items\" ON line_items.order_id = orders.id"
+#    ]
+#    lambda { scope.all }.should_not raise_error
+#  end
+#
+  it "should allow the use of :include when a join was created" do
+    company = Company.create
+    user = company.users.create
+    order = user.orders.create(:total => 20, :taxes => 3)
+    #TODO: recover after fixing ordering
+#    Company.users_orders_total_gt(10).users_orders_taxes_lt(5).ascend_by_users_orders_total.all(:include => :users).should == Company.all
+    Company.users_orders_total_gt(10).users_orders_taxes_lt(5).all(:include => :users).should =~ Company.all
+  end
+
+  it "should allow the use of deep :include when a join was created" do
+    company = Company.create
+    user = company.users.create
+    order = user.orders.create(:total => 20, :taxes => 3)
+    #TODO: recover after fixing ordering
+#    Company.users_orders_total_gt(10).users_orders_taxes_lt(5).ascend_by_users_orders_total.all(:include => {:users => :orders}).should == Company.all
+    Company.users_orders_total_gt(10).users_orders_taxes_lt(5).all(:include => {:users => :orders}).should =~ Company.all
+  end
+
+  it "should allow the use of :include when traveling through the duplicate join" do
+    company = Company.create
+    user = company.users.create(:username => "bjohnson")
+    order = user.orders.create(:total => 20, :taxes => 3)
+    #TODO: recover after fixing ordering
+#    Company.users_username_like("bjohnson").users_orders_taxes_lt(5).ascend_by_users_orders_total.all(:include => :users).should == Company.all
+    Company.users_username_like("bjohnson").users_orders_taxes_lt(5).all(:include => :users).should =~ Company.all
+  end
+
+  it "should allow the use of deep :include when traveling through the duplicate join" do
+    company = Company.create
+    user = company.users.create(:username => "bjohnson")
+    order = user.orders.create(:total => 20, :taxes => 3)
+    #TODO: recover after fixing ordering
+#    Company.users_orders_taxes_lt(50).ascend_by_users_orders_total.all(:include => {:users => :orders}).should == Company.all
+    Company.users_orders_taxes_lt(50).all(:include => {:users => :orders}).should =~ Company.all
+  end
+#  #NOTE: not sure this has relevance to Arel
+#  it "should automatically add string joins if the association condition is using strings" do
+#    User.scope(:orders_big_id, :joins => "INNER JOIN \"orders\" ON orders.user_id = users.id")
+#    Company.users_orders_big_id.should == {:joins=>[" INNER JOIN \"users\" ON users.company_id = companies.id ", " INNER JOIN \"orders\" ON orders.user_id = users.id "]}
+#  end
+
+  it "should order the join statements ascending by the fieldnames so that we don't get double joins where the only difference is that the order of the fields is different" do
+    company = Company.create
+    user = company.users.create(:company_id => company.id)
+    company.users.company_id_eq(company.id).should == [user]
+  end
+
+  it "should sanitize the scope on a foreign model instead of passing the raw options back to the original" do
+    Company.scope(:users_count_10, :conditions => {:users_count => 10})
+    User.company_users_count_10.should eq_scope(
+      User.joins(:company).where("\"companies\".\"users_count\" = 10")
+    )
+  end
+
+  #polymorphic
+#  it "should delegate to polymorphic relationships" do
+#    Audit.auditable_user_type_name_like("ben").should eq_scope(
+#      Audit.joins(:auditable, :as=>:user)
+#
+#    #      }
+#    #      :conditions => ["users.name LIKE ?", "%ben%"],
+#    #      :joins => "INNER JOIN \"users\" ON \"users\".id = \"audits\".auditable_id AND \"audits\".auditable_type = 'User'"
+#    #    }
+#  end
+
+#  it "should delegate to polymorphic relationships (with a lazy split on _type_)" do
+#    Audit.auditable_user_type_some_type_id_like("ben").should == {
+#      :conditions => ["users.some_type_id LIKE ?", "%ben%"],
+#      :joins => "INNER JOIN \"users\" ON \"users\".id = \"audits\".auditable_id AND \"audits\".auditable_type = 'User'"
+#    }
+#  end
+#
+#  it "should deep delegate to polymorphic relationships" do
+#    Audit.auditable_user_type_company_name_like("company").should == {
+#      :conditions => ["companies.name LIKE ?", "%company%"],
+#      :joins => ["INNER JOIN \"users\" ON \"users\".id = \"audits\".auditable_id AND \"audits\".auditable_type = 'User'", " INNER JOIN \"companies\" ON \"companies\".id = \"users\".company_id "]
+#    }
+#  end
+#
+#  it "should allow any on a has_many relationship" do
+#    company1 = Company.create
+#    user1 = company1.users.create
+#    company2 = Company.create
+#    user2 = company2.users.create
+#    user3 = company2.users.create
+#
+#    Company.users_id_equals_any([user2.id, user3.id]).all(:select => "DISTINCT companies.*").should == [company2]
+#  end
+end

data/spec/searchlogic/named_scopes/association_ordering_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+
+describe Searchlogic::NamedScopes::Ordering do
+  it "should allow ascending" do
+    Company.ascend_by_users_username.should eq_scope(
+      Company.joins(:users).order("users.username ASC")
+    )
+  end
+  
+#  it "should allow descending" do
+#    Company.descend_by_users_username.proxy_options.should == User.descend_by_username.proxy_options.merge(:joins => :users)
+#  end
+#
+#  it "should allow deep ascending" do
+#    Company.ascend_by_users_orders_total.proxy_options.should == Order.ascend_by_total.proxy_options.merge(:joins => {:users => :orders})
+#  end
+#
+#  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/searchlogic/named_scopes/conditions_spec.rb

@@ -0,0 +1,321 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+
+describe Searchlogic::NamedScopes::Conditions do
+  it "should be dynamically created and then cached" do
+    User.should_not respond_to(:age_less_than)
+    User.age_less_than(5)
+    User.should respond_to(:age_less_than)
+  end
+
+  it "should not allow conditions on non columns" do
+    lambda { User.whatever_equals(2) }.should raise_error(NoMethodError)
+  end
+
+  context "comparison 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(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
+      (5..7).each { |age| User.create(:age => age) }
+      User.age_does_not_equal(6).all.should == User.find_all_by_age([5,7])
+    end
+
+    it "should have less than" do
+      (5..7).each { |age| User.create(:age => age) }
+      User.age_less_than(6).all.should == User.find_all_by_age(5)
+    end
+
+    it "should have less than or equal to" do
+      (5..7).each { |age| User.create(:age => age) }
+      User.age_less_than_or_equal_to(6).all.should == User.find_all_by_age([5, 6])
+    end
+
+    it "should have greater than" do
+      (5..7).each { |age| User.create(:age => age) }
+      User.age_greater_than(6).all.should == User.find_all_by_age(7)
+    end
+
+    it "should have greater than or equal to" do
+      (5..7).each { |age| User.create(:age => age) }
+      User.age_greater_than_or_equal_to(6).all.should == User.find_all_by_age([6, 7])
+    end
+  end
+
+  context "wildcard conditions" do
+    it "should have like" do
+      %w(bjohnson thunt).each { |username| User.create(:username => username) }
+      User.username_like("john").all.should == User.find_all_by_username("bjohnson")
+    end
+
+    it "should have not like" do
+      %w(bjohnson thunt).each { |username| User.create(:username => username) }
+      User.username_not_like("john").all.should == User.find_all_by_username("thunt")
+    end
+
+    it "should have begins with" do
+      %w(bjohnson thunt).each { |username| User.create(:username => username) }
+      User.username_begins_with("bj").all.should == User.find_all_by_username("bjohnson")
+    end
+
+    it "should have not begin with" do
+      %w(bjohnson thunt).each { |username| User.create(:username => username) }
+      User.username_not_begin_with("bj").all.should == User.find_all_by_username("thunt")
+    end
+
+    it "should have ends with" do
+      %w(bjohnson thunt).each { |username| User.create(:username => username) }
+      User.username_ends_with("son").all.should == User.find_all_by_username("bjohnson")
+    end
+
+    it "should have not end with" do
+      %w(bjohnson thunt).each { |username| User.create(:username => username) }
+      User.username_not_end_with("son").all.should == User.find_all_by_username("thunt")
+    end
+  end
+
+  context "boolean conditions" do
+    it "should have scopes for boolean columns" do
+      female = User.create(:male => false)
+      male = User.create(:male => true)
+      User.male.all.should == [male]
+      User.not_male.all.should == [female]
+    end
+
+    it "should have null" do
+      ["bjohnson", nil].each { |username| User.create(:username => username) }
+      User.username_null.all.should == User.find_all_by_username(nil)
+    end
+
+    it "should have not null" do
+      ["bjohnson", nil].each { |username| User.create(:username => username) }
+      User.username_not_null.all.should == User.find_all_by_username("bjohnson")
+    end
+
+    it "should have empty" 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
+    it "should do nothing if no arguments are passed" do
+      # proxy_options no longer supported in ActiveRecord
+      #User.username_equals_any.proxy_options.should == {}
+      User.username_equals_any.to_sql.squeeze.should == "SELECT \"users\".* FROM \"users\""
+    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.should == User.find_all_by_username(["bjohnson", "thunt"])
+    end
+
+    it "should have equals all" do
+      %w(bjohnson thunt dainor).each { |username| User.create(:username => username) }
+      User.username_equals_all("bjohnson", "thunt").all.should == []
+    end
+
+    it "should have does not equal any" do
+      %w(bjohnson thunt dgainor).each { |username| User.create(:username => username) }
+      User.username_does_not_equal_any("bjohnson", "thunt").all.should == User.find_all_by_username(["bjohnson", "thunt", "dgainor"])
+    end
+
+    it "should have does not equal all" do
+      %w(bjohnson thunt dgainor).each { |username| User.create(:username => username) }
+      User.username_does_not_equal_all("bjohnson", "thunt").all.should == User.find_all_by_username("dgainor")
+    end
+
+    it "should have less than any" do
+      (5..7).each { |age| User.create(:age => age) }
+      User.age_less_than_any(7,6).all.should == User.find_all_by_age([5, 6])
+    end
+
+    it "should have less than all" do
+      (5..7).each { |age| User.create(:age => age) }
+      User.age_less_than_all(7,6).all.should == User.find_all_by_age(5)
+    end
+
+    it "should have less than or equal to any" do
+      (5..7).each { |age| User.create(:age => age) }
+      User.age_less_than_or_equal_to_any(7,6).all.should == User.find_all_by_age([5, 6, 7])
+    end
+
+    it "should have less than or equal to all" do
+      (5..7).each { |age| User.create(:age => age) }
+      User.age_less_than_or_equal_to_all(7,6).all.should == User.find_all_by_age([5, 6])
+    end
+
+    it "should have less than any" do
+      (5..7).each { |age| User.create(:age => age) }
+      User.age_greater_than_any(5,6).all.should == User.find_all_by_age([6, 7])
+    end
+
+    it "should have greater than all" do
+      (5..7).each { |age| User.create(:age => age) }
+      User.age_greater_than_all(5,6).all.should == User.find_all_by_age(7)
+    end
+
+    it "should have greater than or equal to any" do
+      (5..7).each { |age| User.create(:age => age) }
+      User.age_greater_than_or_equal_to_any(5,6).all.should == User.find_all_by_age([5, 6, 7])
+    end
+
+    it "should have greater than or equal to all" do
+      (5..7).each { |age| User.create(:age => age) }
+      User.age_greater_than_or_equal_to_all(5,6).all.should == User.find_all_by_age([6, 7])
+    end
+
+    it "should have like all" do
+      %w(bjohnson thunt dgainor).each { |username| User.create(:username => username) }
+      User.username_like_all("bjohnson", "thunt").all.should == []
+      User.username_like_all("n", "o").all.should == User.find_all_by_username(["bjohnson", "dgainor"])
+    end
+
+    it "should have like any" do
+      %w(bjohnson thunt dgainor).each { |username| User.create(:username => username) }
+      User.username_like_any("bjohnson", "thunt").all.should == User.find_all_by_username(["bjohnson", "thunt"])
+    end
+
+    it "should have begins with all" do
+      %w(bjohnson thunt dgainor).each { |username| User.create(:username => username) }
+      User.username_begins_with_all("bjohnson", "thunt").all.should == []
+    end
+
+    it "should have begins with any" do
+      %w(bjohnson thunt dgainor).each { |username| User.create(:username => username) }
+      User.username_begins_with_any("bj", "th").all.should == User.find_all_by_username(["bjohnson", "thunt"])
+    end
+
+    it "should have ends with all" do
+      %w(bjohnson thunt dgainor).each { |username| User.create(:username => username) }
+      User.username_ends_with_all("n", "r").all.should == []
+    end
+
+    it "should have ends with any" do
+      %w(bjohnson thunt dgainor).each { |username| User.create(:username => username) }
+      User.username_ends_with_any("n", "r").all.should == User.find_all_by_username(["bjohnson", "dgainor"])
+    end
+  end
+
+  context "alias conditions" do
+    it "should have is" do
+      User.age_is(5).to_sql.squeeze.should == User.age_equals(5).to_sql.squeeze
+    end
+
+    it "should have eq" do
+      User.age_eq(5).to_sql.squeeze.should == User.age_equals(5).to_sql.squeeze
+    end
+
+    it "should have not_equal_to" do
+      User.age_not_equal_to(5).to_sql.squeeze.should == User.age_does_not_equal(5).to_sql.squeeze
+    end
+
+    it "should have is_not" do
+      User.age_is_not(5).to_sql.squeeze.should == User.age_does_not_equal(5).to_sql.squeeze
+    end
+
+    it "should have not" do
+      User.age_not(5).to_sql.squeeze.should == User.age_does_not_equal(5).to_sql.squeeze
+    end
+
+    it "should have ne" do
+      User.age_ne(5).to_sql.squeeze.should == User.age_does_not_equal(5).to_sql.squeeze
+    end
+
+    it "should have lt" do
+      User.age_lt(5).to_sql.squeeze.should == User.age_less_than(5).to_sql.squeeze
+    end
+
+    it "should have lte" do
+      User.age_lte(5).to_sql.squeeze.should == User.age_less_than_or_equal_to(5).to_sql.squeeze
+    end
+
+    it "should have gt" do
+      User.age_gt(5).to_sql.squeeze.should == User.age_greater_than(5).to_sql.squeeze
+    end
+
+    it "should have gte" do
+      User.age_gte(5).to_sql.squeeze.should == User.age_greater_than_or_equal_to(5).to_sql.squeeze
+    end
+
+    it "should have contains" do
+      User.username_contains(5).to_sql.squeeze.should == User.username_like(5).to_sql.squeeze
+    end
+
+    it "should have contains" do
+      User.username_includes(5).to_sql.squeeze.should == User.username_like(5).to_sql.squeeze
+    end
+
+    it "should have bw" do
+      User.username_bw(5).to_sql.squeeze.should == User.username_begins_with(5).to_sql.squeeze
+    end
+
+    it "should have ew" do
+      User.username_ew(5).to_sql.squeeze.should == User.username_ends_with(5).to_sql.squeeze
+    end
+
+    it "should have nil" do
+      User.username_nil.to_sql.squeeze.should == User.username_nil.to_sql.squeeze
+    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.should == 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.should == 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")
+#      User.named_scope_options(:username_like).searchlogic_options[:type].should == :string
+#    end
+#
+#    it "should be an integer" do
+#      User.id_gt(10)
+#      User.named_scope_options(:id_gt).searchlogic_options[:type].should == :integer
+#    end
+#
+#    it "should be a float" do
+#        Order.total_gt(10)
+#      Order.named_scope_options(:total_gt).searchlogic_options[:type].should == :float
+#    end
+#  end
+
+  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
+
+  it "should fix bug for issue 26" do
+    count1 = User.id_ne(10).username_not_like("root").count
+    count2 = User.id_ne(10).username_not_like("root").count
+    count1.should == count2
+  end
+end

data/spec/searchlogic/named_scopes/or_conditions_spec.rb

@@ -0,0 +1,66 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../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 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 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
+  end
+
+  it "should not get confused by the 'or' in compound find_or_create_by_* methods" 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
+
+  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
+end

data/spec/searchlogic/named_scopes/ordering_spec.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../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").to_sql.squeeze.should == User.ascend_by_username.to_sql.squeeze
+  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.scope(:ascend_by_custom, :order => "username ASC, name DESC")
+    User.order("ascend_by_custom").to_sql.squeeze.should == User.ascend_by_custom.to_sql.squeeze
+  end
+  
+  it "should have priorty to columns over conflicting association columns" do
+    Company.ascend_by_users_count
+  end
+end