searchlogic 1.5.3 → 1.5.4

data/test/test_conditions_protection.rb

@@ -1,16 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestConditionsProtection < Test::Unit::TestCase
-  def test_protection
-    assert_raise(ArgumentError) { Account.new_search(:conditions => "(DELETE FROM users)") }
-    assert_nothing_raised { Account.new_search!(:conditions => "(DELETE FROM users)") }
-    
-    account = Account.first
-    
-    assert_raise(ArgumentError) { account.users.new_search(:conditions => "(DELETE FROM users)") }
-    assert_nothing_raised { account.users.new_search!(:conditions => "(DELETE FROM users)") }
-    
-    search = Account.new_search
-    assert_raise(ArgumentError) { search.conditions = "(DELETE FROM users)" }
-  end
-end

data/test/test_search_base.rb

@@ -1,227 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestSearchBase < Test::Unit::TestCase
-  def test_needed
-    assert Searchlogic::Search::Base.needed?(Account, :page => 2, :conditions => {:name => "Ben"})
-    assert !Searchlogic::Search::Base.needed?(Account, :conditions => {:name => "Ben"})
-    assert Searchlogic::Search::Base.needed?(Account, :limit => 2, :conditions => {:name_contains => "Ben"})
-    assert !Searchlogic::Search::Base.needed?(Account, :limit => 2)
-    assert Searchlogic::Search::Base.needed?(Account, :per_page => 2)
-  end
-
-  def test_initialize
-    assert_nothing_raised { Account.new_search }
-    search = Account.new_search!(:conditions => {:name_like => "binary"}, :page => 2, :limit => 10, :readonly => true)
-    assert_equal Account, search.klass
-    assert_equal "binary", search.conditions.name_like
-    assert_equal 2, search.page
-    assert_equal 10, search.limit
-    assert_equal true, search.readonly
-  end
-  
-  def test_acting_as_filter
-    search = Account.new_search
-    search.acting_as_filter = true
-    assert search.acting_as_filter?
-    search.acting_as_filter = false
-    assert !search.acting_as_filter?
-  end
-
-  def test_setting_first_level_options
-    search = Account.new_search!(:include => :users, :joins => :users, :offset => 5, :limit => 20, :order => "name ASC", :select => "name", :readonly => true, :group => "name", :from => "accounts", :lock => true)
-    assert_equal :users, search.include
-    assert_equal :users, search.joins
-    assert_equal 5, search.offset
-    assert_equal 20, search.limit
-    assert_equal "name ASC", search.order
-    assert_equal "name", search.select
-    assert_equal true, search.readonly
-    assert_equal "name", search.group
-    assert_equal "accounts", search.from
-    assert_equal true, search.lock
-    
-    search = Account.new_search(:per_page => nil)
-  
-    search.include = :users
-    assert_equal :users, search.include
-    
-    # treat it like SQL, just like AR
-    search.joins = "users"
-    assert_equal "users", search.joins
-  
-    search.page = 5
-    assert_equal 1, search.page
-    assert_equal nil, search.offset
-  
-    search.limit = 20
-    assert_equal search.limit, 20
-    assert_equal search.per_page, 20
-    assert_equal search.page, 5
-    assert_equal search.offset, 80
-    search.limit = nil
-    assert_equal nil, search.limit
-    assert_equal nil, search.per_page
-    assert_equal 1, search.page
-    assert_equal nil, search.offset
-  
-    search.offset = 50
-    assert_equal 50, search.offset
-    assert_equal 1, search.page
-    search.limit = 50
-    assert_equal 2, search.page
-    search.offset = nil
-    assert_equal nil, search.offset
-    assert_equal 1, search.page
-  
-    search.per_page = 2
-    assert_equal 2, search.per_page
-    assert_equal 2, search.limit
-    search.offset = 50
-    assert_equal 26, search.page
-    assert_equal 50, search.offset
-  
-    search.order = "name ASC"
-    assert_equal search.order, "name ASC"
-  
-    search.select = "name"
-    assert_equal search.select, "name"
-  
-    search.readonly = true
-    assert_equal search.readonly, true
-  
-    search.group = "name"
-    assert_equal search.group, "name"
-  
-    search.from = "accounts"
-    assert_equal search.from, "accounts"
-  
-    search.lock = true
-    assert_equal search.lock, true
-  end
-
-  def test_joins
-    search = Account.new_search
-    assert_equal nil, search.joins
-    search.conditions.name_contains = "Binary"
-    assert_equal nil, search.joins
-    search.conditions.users.first_name_contains = "Ben"
-    assert_equal(:users, search.joins)
-    search.conditions.users.orders.id_gt = 2
-    assert_equal({:users => :orders}, search.joins)
-    search.conditions.users.reset_orders!
-    assert_equal(:users, search.joins)
-    search.conditions.users.orders.id_gt = 2
-    search.conditions.reset_users!
-    assert_equal nil, search.joins
-  end
-
-  def test_limit
-    search = Account.new_search
-    search.limit = 10
-    assert_equal 10, search.limit
-    search.page = 2
-    assert_equal 10, search.offset
-    search.limit = 25
-    assert_equal 25, search.offset
-    assert_equal 2, search.page
-    search.page = 5
-    assert_equal 5, search.page
-    assert_equal 25, search.limit
-    search.limit = 3
-    assert_equal 12, search.offset
-  end
-
-  def test_options
-  end
-
-  def test_sanitize
-    search = Account.new_search
-    search.per_page = 2
-    search.conditions.name_like = "Binary"
-    search.conditions.users.id_greater_than = 2
-    search.page = 3
-    search.readonly = true
-    assert_equal({:joins => :users, :offset => 4, :select => "DISTINCT \"accounts\".*", :readonly => true, :conditions => ["(\"accounts\".\"name\" LIKE ?) AND (\"users\".\"id\" > ?)", "%Binary%", 2], :limit => 2 }, search.sanitize)
-  end
-
-  def test_scope
-    search = Account.new_search!
-    search.conditions = "some sql"
-    conditions = search.conditions
-    assert_equal "some sql", search.conditions.conditions
-    search.conditions = nil
-    assert_equal nil, search.conditions.conditions
-    search.conditions = "some sql"
-    assert_equal "some sql", search.conditions.conditions
-    search.conditions = "some sql"
-    assert_equal "some sql", search.conditions.conditions
-  end
-
-  def test_searching
-    search = Account.new_search
-    search.conditions.name_like = "Binary"
-    assert_equal [Account.find(1), Account.find(3)], search.all
-    assert_equal [Account.find(1), Account.find(3)], search.find(:all)
-    assert_equal Account.find(1), search.first
-    assert_equal Account.find(1), search.find(:first)
-  
-    search.per_page = 20
-    search.page = 2
-  
-    assert_equal [], search.all
-    assert_equal [], search.find(:all)
-    assert_equal nil, search.first
-    assert_equal nil, search.find(:first)
-      
-    search.per_page = 0
-    search.page = nil
-    search.conditions.users.first_name_contains = "Ben"
-    search.conditions.users.orders.description_keywords = "products, &*ap#ple $%^&*"
-    assert_equal [Account.find(1)], search.all
-    assert_equal [Account.find(1)], search.find(:all)
-    assert_equal Account.find(1), search.first
-    assert_equal Account.find(1), search.find(:first)
-    
-    search = Account.new_search
-    search.select = "id, name"
-    assert_equal Account.all, search.all
-    
-    search = Account.scope1.new_search!(:conditions => {:users => {:first_name_starts_with => "Ben"}})
-    assert_equal [Account.find(1)], search.all
-    search2 = search.dup
-    assert_equal [Account.find(1)], search2.all
-  end
-
-  def test_calculations
-    search = Account.new_search
-    search.conditions.name_like = "Binary"
-    assert_equal 2, search.average('id')
-    assert_equal 2, search.calculate(:avg, 'id')
-    assert_equal 3, search.calculate(:max, 'id')
-    assert_equal 2, search.count
-    assert_equal 3, search.maximum('id')
-    assert_equal 1, search.minimum('id')
-    assert_equal 4, search.sum('id')
-    
-    search.readonly = true
-    assert_equal 4, search.sum('id')
-    
-    search = Account.new_search(:conditions => {:users => {:orders => {:id_gt => 1}}})
-    assert_equal 1, search.count
-    
-    search = Order.new_search(:conditions => {:user => {:account => {:id_gt => 1}}})
-    assert_equal 1, search.count
-    
-    search = UserGroup.new_search(:conditions => {:users => {:orders => {:id_gt => 1}}})
-    assert_equal 1, search.count
-  end
-  
-  def test_inspect
-    search = Account.new_search
-    assert_nothing_raised { search.inspect }
-  end
-  
-  def test_sti
-    
-  end
-end

data/test/test_search_conditions.rb

@@ -1,19 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestSearchConditions < Test::Unit::TestCase
-  def test_conditions
-    search = Account.new_search
-    assert_kind_of Searchlogic::Conditions::Base, search.conditions
-    assert_equal search.conditions.klass, Account
-  
-    search.conditions = {:name_like => "Binary"}
-    assert_kind_of Searchlogic::Conditions::Base, search.conditions
-    
-    search = Account.new_search(:conditions => {:name_like => "Ben"})
-    assert_equal({:name_like => "Ben"}, search.conditions.conditions)
-  end
-
-  def test_sanitize
-    # This is tested in test_search_base
-  end
-end

data/test/test_search_ordering.rb

@@ -1,165 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestSearchOrdering < Test::Unit::TestCase
-  def test_order_to_order_by
-    search = Account.new_search
-    search.order = "name"
-    assert_equal "name", search.order_by
-    search.order = "users.first_name"
-    assert_equal({"users" => "first_name"}, search.order_by)
-    search.order = "\"users\".\"first_name\""
-    assert_equal({"users" => "first_name"}, search.order_by)
-    search.order = "\"users\".\"first_name\", name ASC"
-    assert_equal([{"users" => "first_name"}, "name"], search.order_by)
-  end
-  
-  def test_order_by
-    search = Account.new_search
-    assert_equal nil, search.order
-    assert_equal nil, search.order_by
-    
-    search.order_by = "first_name"
-    assert_equal "first_name", search.order_by
-    assert_equal "\"accounts\".\"first_name\"", search.order
-    
-    search.order_by = "last_name"
-    assert_equal "last_name", search.order_by
-    assert_equal "\"accounts\".\"last_name\"", search.order
-    
-    search.order_by = ["first_name", "last_name"]
-    assert_equal ["first_name", "last_name"], search.order_by
-    assert_equal "\"accounts\".\"first_name\", \"accounts\".\"last_name\"", search.order
-    
-    search.order = "created_at DESC"
-    assert_equal "created_at", search.order_by
-    assert_equal "created_at DESC", search.order
-    
-    search.order = "\"users\".updated_at ASC"
-    assert_equal({"users" => "updated_at"}, search.order_by)
-    assert_equal "\"users\".updated_at ASC", search.order
-    
-    search.order = "`users`.first_name DESC"
-    assert_equal({"users" => "first_name"}, search.order_by)
-    assert_equal "`users`.first_name DESC", search.order
-    
-    search.order = "`accounts`.name DESC"
-    assert_equal "name", search.order_by
-    assert_equal "`accounts`.name DESC", search.order
-    
-    search.order = "accounts.name DESC"
-    assert_equal "name", search.order_by
-    assert_equal "accounts.name DESC", search.order
-    
-    search.order = "`users`.first_name DESC, name DESC, `accounts`.id DESC"
-    assert_equal [{"users" => "first_name"}, "name", "id"], search.order_by
-    assert_equal "`users`.first_name DESC, name DESC, `accounts`.id DESC", search.order
-    
-    search.order = "`users`.first_name DESC, `line_items`.id DESC, `accounts`.id DESC"
-    assert_equal [{"users" => "first_name"}, "id"], search.order_by
-    assert_equal "`users`.first_name DESC, `line_items`.id DESC, `accounts`.id DESC", search.order
-    
-    search.order = "`line_items`.id DESC"
-    assert_equal nil, search.order_by
-    assert_equal "`line_items`.id DESC", search.order
-  end
-  
-  def test_order_as
-    search = Account.new_search
-    assert_equal nil, search.order
-    assert_equal nil, search.order_as
-    assert search.asc?
-    assert !search.desc?
-    
-    search.order_as = "DESC"
-    assert_equal nil, search.order_as
-    assert !search.desc?
-    assert_equal nil, search.order
-    
-    search.order_by = "name"
-    assert_equal "\"accounts\".\"name\" DESC", search.order
-    
-    search.order_as = "ASC"
-    assert_equal "\"accounts\".\"name\" ASC", search.order
-    assert search.asc?
-    
-    search.order = "id ASC"
-    assert_equal "ASC", search.order_as
-    assert search.asc?
-    assert_equal "id ASC", search.order
-    
-    search.order = "id DESC"
-    assert_equal "DESC", search.order_as
-    assert search.desc?
-    assert_equal "id DESC", search.order
-    
-    search.order_by = "name"
-    assert_equal "DESC", search.order_as
-    assert search.desc?
-    assert_equal "\"accounts\".\"name\" DESC", search.order
-    
-    assert_raise(ArgumentError) { search.order_as = "awesome" }
-  end
-
-  def test_order_by_auto_joins
-    search = Account.new_search
-    assert_equal nil, search.order_by_auto_joins
-    search.order_by = :name
-    assert_equal nil, search.order_by_auto_joins
-    search.order_by = {:users => :first_name}
-    assert_equal :users, search.order_by_auto_joins
-    search.order_by = [{:users => :first_name}, {:orders => :total}, {:users => {:user_groups => :name}}]
-    assert_equal [:users, :orders, {:users => :user_groups}], search.order_by_auto_joins
-    search.priority_order_by = {:users => :first_name}
-    assert_equal [:users, :orders, {:users => :user_groups}], search.order_by_auto_joins
-    search.priority_order_by = {:users => {:orders => :total}}
-    assert_equal({:users => :orders}, search.priority_order_by_auto_joins)
-  end
-
-  def test_priority_order_by
-    search = Account.new_search
-    assert_equal nil, search.priority_order
-    assert_equal nil, search.priority_order_by
-    assert_equal nil, search.priority_order_as
-    
-    search.priority_order_by = :name
-    assert_equal "\"accounts\".\"name\"", search.priority_order
-    assert_equal "\"accounts\".\"name\"", search.sanitize[:order]
-    assert_equal nil, search.order
-    assert_equal :name, search.priority_order_by
-    assert_equal nil, search.priority_order_as
-    
-    search.order_by = :id
-    assert_equal "\"accounts\".\"name\", \"accounts\".\"id\"", search.sanitize[:order]
-    search.order_as = "DESC"
-    assert_equal "\"accounts\".\"name\", \"accounts\".\"id\" DESC", search.sanitize[:order]
-  end
-  
-  def test_priority_order_as
-    search = Account.new_search
-    assert_equal nil, search.priority_order_as
-    assert_equal nil, search.order_as
-    search.priority_order_as = "ASC"
-    assert_equal nil, search.priority_order_as
-    assert_equal nil, search.order_as
-    search.priority_order_by = :name
-    assert_equal "ASC", search.priority_order_as
-    assert_equal nil, search.order_as
-    search.priority_order_as = "DESC"
-    assert_equal "DESC", search.priority_order_as
-    assert_equal nil, search.order_as
-    assert_raise(ArgumentError) { search.priority_order_as = "awesome" }
-    search.priority_order = nil
-    assert_equal nil, search.priority_order_as
-    assert_equal nil, search.order_as
-  end
-  
-  def test_sanitize
-    # tested in test_priority_order_by
-  end
-  
-  def test_ordering_includes_blank
-    search = User.new_search!
-    search.order_by = {:account => :name}
-    assert_equal 4, search.count
-  end
-end

data/test/test_search_pagination.rb

@@ -1,72 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestSearchPagination < Test::Unit::TestCase
-  def test_limit
-    search = Account.new_search
-    search.limit = 10
-    assert_equal 10, search.limit
-    search.page = 2
-    assert_equal 10, search.offset
-    search.limit = 25
-    assert_equal 25, search.offset
-    assert_equal 2, search.page
-    search.page = 5
-    assert_equal 5, search.page
-    assert_equal 25, search.limit
-    search.limit = 3
-    assert_equal 12, search.offset
-  end
-  
-  def test_page
-    search = Account.new_search(:per_page => nil)
-    search.page = 2
-    assert_equal 1, search.page
-    search.per_page = 20
-    assert_equal 2, search.page
-    search.limit = 0
-    assert_equal 1, search.page
-    search.per_page = 20
-    assert_equal 2, search.page
-    search.limit = nil
-    assert_equal 1, search.page
-  end
-  
-  def test_per_page
-    search = Account.new_search
-    search.per_page = 10
-    assert_equal 10, search.per_page
-    search.per_page = ""
-    assert_equal nil, search.per_page
-    search.per_page = 40
-    assert_equal 40, search.per_page
-    search.per_page = nil
-    assert_equal nil, search.per_page
-    search.per_page = 60
-    assert_equal 60, search.per_page
-    search.per_page = false
-    assert_equal nil, search.per_page
-  end
-  
-  def test_next_page
-    
-  end
-  
-  def test_prev_page
-    
-  end
-  
-  def test_page_count
-    search = Account.new_search
-    assert_equal 1, search.page_count
-    search.per_page = 1
-    assert_equal 3, search.page_count
-    search.per_page = 100
-    assert_equal 1, search.page_count
-    
-    Searchlogic::Config.search.per_page = 1
-    search = Account.new_search
-    assert_equal 3, search.page_count    
-    search.conditions.users.first_name_contains
-    assert_equal 3, search.page_count
-  end
-end