searchgasm 1.2.2 → 1.3.0

data/test/test_condition_types.rb

@@ -4,130 +4,130 @@ class TestConditionTypes < Test::Unit::TestCase
   def test_sanitize
     condition = Searchgasm::Condition::BeginsWith.new(Account, Account.columns_hash["name"])
     condition.value = "Binary"
-    assert_equal condition.sanitize, ["\"accounts\".\"name\" LIKE ?", "Binary%"]
+    assert_equal ["\"accounts\".\"name\" LIKE ?", "Binary%"], condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
     condition.value = true
-    assert_equal condition.sanitize, "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = ''"
+    assert_equal "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = ''", condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
     condition.value = false
-    assert_equal condition.sanitize, "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != ''"
+    assert_equal "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != ''", condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
     condition.value = "true"
-    assert_equal condition.sanitize, "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = ''"
+    assert_equal "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = ''", condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
     condition.value = "false"
-    assert_equal condition.sanitize, "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != ''"
+    assert_equal "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != ''", condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
     condition.value = nil
-    assert_equal condition.sanitize, nil
+    assert_equal nil, condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
     condition.value = ""
-    assert_equal condition.sanitize, nil
+    assert_equal nil, condition.sanitize
     
     condition = Searchgasm::Condition::ChildOf.new(User)
     condition.value = User.first.id
-    assert_equal condition.sanitize, ["\"users\".\"parent_id\" = ?", User.first.id]
+    assert_equal ["\"users\".\"parent_id\" = ?", User.first.id], condition.sanitize
     
     condition = Searchgasm::Condition::ChildOf.new(User)
     condition.value = User.first
-    assert_equal condition.sanitize, ["\"users\".\"parent_id\" = ?", User.first.id]
-    
-    condition = Searchgasm::Condition::Contains.new(Account, Account.columns_hash["name"])
-    condition.value = "Binary and blah"
-    assert_equal condition.sanitize, ["\"accounts\".\"name\" LIKE ?", "%Binary and blah%"]
+    assert_equal ["\"users\".\"parent_id\" = ?", User.first.id], condition.sanitize
     
     condition = Searchgasm::Condition::DescendantOf.new(User)
     condition.value = User.find(1)
-    assert_equal condition.sanitize, ["\"users\".\"id\" = ? OR \"users\".\"id\" = ?", 2, 3]
-    
-    condition = Searchgasm::Condition::DoesNotEqual.new(Account, Account.columns_hash["id"])
-    condition.value = 12
-    assert_equal condition.sanitize, "\"accounts\".\"id\" != 12"
-    
-    condition = Searchgasm::Condition::DoesNotEqual.new(Account, Account.columns_hash["id"])
-    condition.value = [1,2,3,4]
-    assert_equal condition.sanitize, "\"accounts\".\"id\" NOT IN (1,2,3,4)"
-    
-    condition = Searchgasm::Condition::DoesNotEqual.new(Account, Account.columns_hash["id"])
-    condition.value = (1..10)
-    assert_equal condition.sanitize, "\"accounts\".\"id\" NOT BETWEEN 1 AND 10"
+    assert_equal ["\"users\".\"id\" = ? OR \"users\".\"id\" = ?", 2, 3], condition.sanitize
     
     condition = Searchgasm::Condition::EndsWith.new(Account, Account.columns_hash["name"])
     condition.value = "Binary"
-    assert_equal condition.sanitize, ["\"accounts\".\"name\" LIKE ?", "%Binary"]
+    assert_equal ["\"accounts\".\"name\" LIKE ?", "%Binary"], condition.sanitize
     
     condition = Searchgasm::Condition::Equals.new(Account, Account.columns_hash["id"])
     condition.value = 12
-    assert_equal condition.sanitize, "\"accounts\".\"id\" = 12"
+    assert_equal "\"accounts\".\"id\" = 12", condition.sanitize
     
     condition = Searchgasm::Condition::Equals.new(Account, Account.columns_hash["id"])
     condition.value = [1,2,3,4]
-    assert_equal condition.sanitize, "\"accounts\".\"id\" IN (1,2,3,4)"
+    assert_equal "\"accounts\".\"id\" IN (1,2,3,4)", condition.sanitize
     
     condition = Searchgasm::Condition::Equals.new(Account, Account.columns_hash["id"])
     condition.value = (1..10)
-    assert_equal condition.sanitize, "\"accounts\".\"id\" BETWEEN 1 AND 10"
+    assert_equal "\"accounts\".\"id\" BETWEEN 1 AND 10", condition.sanitize
     
     condition = Searchgasm::Condition::GreaterThan.new(Account, Account.columns_hash["id"])
     condition.value = 2
-    assert_equal condition.sanitize, ["\"accounts\".\"id\" > ?", 2]
+    assert_equal ["\"accounts\".\"id\" > ?", 2], condition.sanitize
     
     condition = Searchgasm::Condition::GreaterThanOrEqualTo.new(Account, Account.columns_hash["id"])
     condition.value = 2
-    assert_equal condition.sanitize, ["\"accounts\".\"id\" >= ?", 2]
+    assert_equal ["\"accounts\".\"id\" >= ?", 2], condition.sanitize
     
     condition = Searchgasm::Condition::InclusiveDescendantOf.new(User)
     condition.value = User.find(1)
-    assert_equal condition.sanitize, ["(\"users\".\"id\" = ?) OR (\"users\".\"id\" = ? OR \"users\".\"id\" = ?)", 1, 2, 3]
+    assert_equal ["(\"users\".\"id\" = ?) OR (\"users\".\"id\" = ? OR \"users\".\"id\" = ?)", 1, 2, 3], condition.sanitize
+    
+    condition = Searchgasm::Condition::Like.new(Account, Account.columns_hash["name"])
+    condition.value = "Binary and blah"
+    assert_equal ["\"accounts\".\"name\" LIKE ?", "%Binary and blah%"], condition.sanitize
     
     condition = Searchgasm::Condition::Nil.new(Account, Account.columns_hash["id"])
     condition.value = true
-    assert_equal condition.sanitize, "\"accounts\".\"id\" is NULL"
+    assert_equal "\"accounts\".\"id\" is NULL", condition.sanitize
     
     condition = Searchgasm::Condition::Nil.new(Account, Account.columns_hash["id"])
     condition.value = false
-    assert_equal condition.sanitize, "\"accounts\".\"id\" is NOT NULL"
+    assert_equal "\"accounts\".\"id\" is NOT NULL", condition.sanitize
     
     condition = Searchgasm::Condition::Nil.new(Account, Account.columns_hash["id"])
     condition.value = "true"
-    assert_equal condition.sanitize, "\"accounts\".\"id\" is NULL"
+    assert_equal "\"accounts\".\"id\" is NULL", condition.sanitize
     
     condition = Searchgasm::Condition::Nil.new(Account, Account.columns_hash["id"])
     condition.value = "false"
-    assert_equal condition.sanitize, "\"accounts\".\"id\" is NOT NULL"
+    assert_equal "\"accounts\".\"id\" is NOT NULL", condition.sanitize
     
     condition = Searchgasm::Condition::Nil.new(Account, Account.columns_hash["id"])
     condition.value = nil
-    assert_equal condition.sanitize, nil
+    assert_equal nil, condition.sanitize
     
     condition = Searchgasm::Condition::Nil.new(Account, Account.columns_hash["id"])
     condition.value = ""
-    assert_equal condition.sanitize, nil
+    assert_equal nil, condition.sanitize
+    
+    condition = Searchgasm::Condition::NotEqual.new(Account, Account.columns_hash["id"])
+    condition.value = 12
+    assert_equal "\"accounts\".\"id\" != 12", condition.sanitize
+    
+    condition = Searchgasm::Condition::NotEqual.new(Account, Account.columns_hash["id"])
+    condition.value = [1,2,3,4]
+    assert_equal "\"accounts\".\"id\" NOT IN (1,2,3,4)", condition.sanitize
+    
+    condition = Searchgasm::Condition::NotEqual.new(Account, Account.columns_hash["id"])
+    condition.value = (1..10)
+    assert_equal "\"accounts\".\"id\" NOT BETWEEN 1 AND 10", condition.sanitize
     
     condition = Searchgasm::Condition::Keywords.new(Account, Account.columns_hash["name"])
     condition.value = "freedom yeah, freedom YEAH right"
-    assert_equal condition.sanitize, ["\"accounts\".\"name\" LIKE ? AND \"accounts\".\"name\" LIKE ? AND \"accounts\".\"name\" LIKE ?", "%freedom%", "%yeah%", "%right%"]
+    assert_equal ["\"accounts\".\"name\" LIKE ? AND \"accounts\".\"name\" LIKE ? AND \"accounts\".\"name\" LIKE ?", "%freedom%", "%yeah%", "%right%"], condition.sanitize
     
     condition = Searchgasm::Condition::Keywords.new(Account, Account.columns_hash["name"])
     condition.value = "%^$*(^$)"
-    assert_equal condition.sanitize, nil
+    assert_equal nil, condition.sanitize
     
     condition = Searchgasm::Condition::LessThan.new(Account, Account.columns_hash["id"])
     condition.value = 2
-    assert_equal condition.sanitize, ["\"accounts\".\"id\" < ?", 2]
+    assert_equal ["\"accounts\".\"id\" < ?", 2], condition.sanitize
     
     condition = Searchgasm::Condition::LessThanOrEqualTo.new(Account, Account.columns_hash["id"])
     condition.value = 2
-    assert_equal condition.sanitize, ["\"accounts\".\"id\" <= ?", 2]
+    assert_equal ["\"accounts\".\"id\" <= ?", 2], condition.sanitize
     
     condition = Searchgasm::Condition::SiblingOf.new(User)
     condition.value = User.find(2)
-    assert_equal condition.sanitize, ["(\"users\".\"id\" != ?) AND (\"users\".\"parent_id\" = ?)", 2, 1]
+    assert_equal ["(\"users\".\"id\" != ?) AND (\"users\".\"parent_id\" = ?)", 2, 1], condition.sanitize
   end
 end

data/test/test_conditions_base.rb

@@ -5,8 +5,8 @@ class TestConditionsBase < Test::Unit::TestCase
     Searchgasm::Conditions::Base.register_condition(Searchgasm::Condition::Keywords)
     assert [Searchgasm::Condition::Keywords], Searchgasm::Conditions::Base.conditions
     
-    Searchgasm::Conditions::Base.register_condition(Searchgasm::Condition::Contains)
-    assert [Searchgasm::Condition::Keywords, Searchgasm::Condition::Contains], Searchgasm::Conditions::Base.conditions
+    Searchgasm::Conditions::Base.register_condition(Searchgasm::Condition::Like)
+    assert [Searchgasm::Condition::Keywords, Searchgasm::Condition::Like], Searchgasm::Conditions::Base.conditions
   end
   
   def test_association_names
@@ -44,11 +44,11 @@ class TestConditionsBase < Test::Unit::TestCase
     conditions.name_contains = "Binary"
     assert_equal ["\"accounts\".\"name\" LIKE ?", "%Binary%"], conditions.sanitize
     conditions.id = 1
-    assert_equal ["(\"accounts\".\"name\" LIKE ?) AND (\"accounts\".\"id\" = 1)", "%Binary%"], conditions.sanitize
+    assert_equal ["(\"accounts\".\"id\" = 1) AND (\"accounts\".\"name\" LIKE ?)", "%Binary%"], conditions.sanitize
     conditions.any = true
-    assert_equal ["(\"accounts\".\"name\" LIKE ?) OR (\"accounts\".\"id\" = 1)", "%Binary%"], conditions.sanitize
+    assert_equal ["(\"accounts\".\"id\" = 1) OR (\"accounts\".\"name\" LIKE ?)", "%Binary%"], conditions.sanitize
     conditions.any = false
-    assert_equal ["(\"accounts\".\"name\" LIKE ?) AND (\"accounts\".\"id\" = 1)", "%Binary%"], conditions.sanitize
+    assert_equal ["(\"accounts\".\"id\" = 1) AND (\"accounts\".\"name\" LIKE ?)", "%Binary%"], conditions.sanitize
   end
   
   def test_auto_joins
@@ -76,13 +76,13 @@ class TestConditionsBase < Test::Unit::TestCase
     conditions.id_gt = 5
     now = Time.now
     conditions.created_after = now
-    assert_equal conditions.sanitize, ["(\"accounts\".\"name\" LIKE ?) AND (\"accounts\".\"id\" > ?) AND (\"accounts\".\"created_at\" > ?)", "%Binary%", 5, now]
+    assert_equal ["(\"accounts\".\"created_at\" > ?) AND (\"accounts\".\"id\" > ?) AND (\"accounts\".\"name\" LIKE ?)", now, 5, "%Binary%"], conditions.sanitize
     
     # test out associations
     conditions.users.first_name_like = "Ben"
     conditions.users.id_gt = 10
     conditions.users.orders.total_lt = 500
-    assert_equal conditions.sanitize, ["(\"accounts\".\"name\" LIKE ?) AND (\"accounts\".\"id\" > ?) AND (\"accounts\".\"created_at\" > ?) AND ((\"users\".\"first_name\" LIKE ?) AND (\"users\".\"id\" > ?) AND (\"orders\".\"total\" < ?))", "%Binary%", 5, now, "%Ben%", 10, 500]
+    assert_equal ["(\"accounts\".\"created_at\" > ?) AND (\"accounts\".\"id\" > ?) AND (\"accounts\".\"name\" LIKE ?) AND ((\"users\".\"first_name\" LIKE ?) AND (\"users\".\"id\" > ?) AND (\"orders\".\"total\" < ?))", now, 5, "%Binary%", "%Ben%", 10, 500], conditions.sanitize
     
     # test that raw sql is returned
     conditions.conditions = "awesome"
@@ -92,33 +92,33 @@ class TestConditionsBase < Test::Unit::TestCase
   def test_conditions
     conditions = Searchgasm::Cache::AccountConditions.new
     now = Time.now
-    v = {:name_contains => "Binary", :created_at_greater_than => now}
+    v = {:name_like => "Binary", :created_at_greater_than => now}
     conditions.conditions = v
     assert_equal v, conditions.conditions
     
     sql = "id in (1,2,3,4)"
     conditions.conditions = sql
     assert_equal sql, conditions.conditions
-    assert_equal [], conditions.send(:objects)
+    assert_equal({}, conditions.send(:objects))
     
     v2 = {:id_less_than => 5, :name_begins_with => "Beginning of string"}
     conditions.conditions = v2
     assert_equal v2, conditions.conditions
     
-    v = {:name_contains => "Binary", :created_at_greater_than => now}
+    v = {:name_like => "Binary", :created_at_greater_than => now}
     conditions.conditions = v
     assert_equal v2.merge(v), conditions.conditions
     
     sql2 = "id > 5 and name = 'Test'"
     conditions.conditions = sql2
     assert_equal sql2, conditions.conditions
-    assert_equal [], conditions.send(:objects)
+    assert_equal({}, conditions.send(:objects))
     
     conditions.name_contains = "awesome"
-    assert_equal({:name_contains => "awesome"}, conditions.conditions)
+    assert_equal({:name_like => "awesome"}, conditions.conditions)
     
     conditions.conditions = {:id_gt => "", :name_starts_with => "Ben"}
-    assert_equal({:name_contains => "awesome", :name_begins_with => "Ben"}, conditions.conditions)
+    assert_equal({:name_like => "awesome", :name_begins_with => "Ben"}, conditions.conditions)
   end
   
   # Other general usage tests, need to clean these up
@@ -150,7 +150,7 @@ class TestConditionsBase < Test::Unit::TestCase
   
   def test_assert_valid_values
     conditions = Searchgasm::Cache::UserConditions.new
-    assert_raise(ArgumentError) { conditions.conditions = {:unknown => "blah"} }
+    assert_raise(NoMethodError) { conditions.conditions = {:unknown => "blah"} }
     assert_nothing_raised { conditions.conditions = {:first_name => "blah"} }
     assert_nothing_raised { conditions.conditions = {:first_name_contains => "blah"} }
   end
@@ -163,15 +163,27 @@ class TestConditionsBase < Test::Unit::TestCase
     assert_equal conditions.users.last_name_begins_with, "Ben"
   end
   
+  def test_virtual_columns
+    conditions = Searchgasm::Cache::AccountConditions.new
+    conditions.hour_of_created_gt = 2
+    assert_equal ["strftime('%H', \"accounts\".\"created_at\") > ?", 2], conditions.sanitize
+    conditions.dow_of_created_at_most = 5
+    assert_equal ["(strftime('%w', \"accounts\".\"created_at\") <= ?) AND (strftime('%H', \"accounts\".\"created_at\") > ?)", 5, 2], conditions.sanitize
+    conditions.month_of_created_at_nil = true
+    assert_equal ["(strftime('%w', \"accounts\".\"created_at\") <= ?) AND (strftime('%H', \"accounts\".\"created_at\") > ?) AND (strftime('%m', \"accounts\".\"created_at\") is NULL)", 5, 2], conditions.sanitize
+    conditions.min_of_hour_of_month_of_created_at_nil = true
+    assert_equal ["(strftime('%w', \"accounts\".\"created_at\") <= ?) AND (strftime('%H', \"accounts\".\"created_at\") > ?) AND (strftime('%m', strftime('%H', strftime('%M', \"accounts\".\"created_at\"))) is NULL) AND (strftime('%m', \"accounts\".\"created_at\") is NULL)", 5, 2], conditions.sanitize
+  end
+  
   def test_objects
     conditions = Searchgasm::Cache::AccountConditions.new
-    assert_equal conditions.send(:objects), []
+    assert_equal({}, conditions.send(:objects))
     
     conditions.name_contains = "Binary"
-    assert_equal conditions.send(:objects).size, 1
+    assert_equal 1, conditions.send(:objects).size
     
     conditions.users.first_name_contains = "Ben"
-    assert_equal conditions.send(:objects).size, 2
+    assert_equal 2, conditions.send(:objects).size
   end
   
   def test_reset
@@ -180,14 +192,15 @@ class TestConditionsBase < Test::Unit::TestCase
     conditions.name_contains = "Binary"
     assert_equal 1, conditions.send(:objects).size
     
-    conditions.reset_name_contains!
-    assert_equal [], conditions.send(:objects)
+    conditions.reset_name_like!
+    conditions.reset_name_contains! # should set up aliases for reset
+    assert_equal({}, conditions.send(:objects))
     
     conditions.users.first_name_like = "Ben"
     assert_equal 1, conditions.send(:objects).size
     
     conditions.reset_users!
-    assert_equal [], conditions.send(:objects)
+    assert_equal({}, conditions.send(:objects))
     
     conditions.name_begins_with ="Binary"
     conditions.users.orders.total_gt = 200
@@ -197,6 +210,6 @@ class TestConditionsBase < Test::Unit::TestCase
     assert_equal 1, conditions.send(:objects).size
     
     conditions.reset_users!
-    assert_equal [], conditions.send(:objects)
+    assert_equal({}, conditions.send(:objects))
   end
 end

data/test/test_helper.rb

@@ -3,6 +3,7 @@ require "rubygems"
 require "ruby-debug"
 require "activerecord"
 require File.dirname(__FILE__) + '/libs/acts_as_tree'
+require File.dirname(__FILE__) + '/libs/ordered_hash'
 require File.dirname(__FILE__) + '/libs/rexml_fix'
 require File.dirname(__FILE__) + '/../lib/searchgasm'
 

data/test/test_search_conditions.rb

@@ -10,7 +10,7 @@ class TestSearchConditions < Test::Unit::TestCase
     assert_kind_of Searchgasm::Conditions::Base, search.conditions
     
     search = Account.new_search(:conditions => {:name_like => "Ben"})
-    assert_equal({:name_contains => "Ben"}, search.conditions.conditions)
+    assert_equal({:name_like => "Ben"}, search.conditions.conditions)
   end
   
   def test_auto_joins

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-29 00:00:00 -04:00
+date: 2008-10-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,10 +59,7 @@ extra_rdoc_files:
 - lib/searchgasm/condition/begins_with.rb
 - lib/searchgasm/condition/blank.rb
 - lib/searchgasm/condition/child_of.rb
-- lib/searchgasm/condition/contains.rb
 - lib/searchgasm/condition/descendant_of.rb
-- lib/searchgasm/condition/does_not_equal.rb
-- lib/searchgasm/condition/during_evening.rb
 - lib/searchgasm/condition/ends_with.rb
 - lib/searchgasm/condition/equals.rb
 - lib/searchgasm/condition/greater_than.rb
@@ -71,7 +68,13 @@ extra_rdoc_files:
 - lib/searchgasm/condition/keywords.rb
 - lib/searchgasm/condition/less_than.rb
 - lib/searchgasm/condition/less_than_or_equal_to.rb
+- lib/searchgasm/condition/like.rb
 - lib/searchgasm/condition/nil.rb
+- lib/searchgasm/condition/not_begin_with.rb
+- lib/searchgasm/condition/not_end_with.rb
+- lib/searchgasm/condition/not_equal.rb
+- lib/searchgasm/condition/not_have_keywords.rb
+- lib/searchgasm/condition/not_like.rb
 - lib/searchgasm/condition/sibling_of.rb
 - lib/searchgasm/condition/tree.rb
 - lib/searchgasm/conditions/base.rb
@@ -86,6 +89,41 @@ extra_rdoc_files:
 - lib/searchgasm/helpers/control_types/select.rb
 - lib/searchgasm/helpers/form.rb
 - lib/searchgasm/helpers/utilities.rb
+- lib/searchgasm/modifiers/absolute.rb
+- lib/searchgasm/modifiers/acos.rb
+- lib/searchgasm/modifiers/asin.rb
+- lib/searchgasm/modifiers/atan.rb
+- lib/searchgasm/modifiers/base.rb
+- lib/searchgasm/modifiers/ceil.rb
+- lib/searchgasm/modifiers/char_length.rb
+- lib/searchgasm/modifiers/cos.rb
+- lib/searchgasm/modifiers/cot.rb
+- lib/searchgasm/modifiers/day_of_month.rb
+- lib/searchgasm/modifiers/day_of_week.rb
+- lib/searchgasm/modifiers/day_of_year.rb
+- lib/searchgasm/modifiers/degrees.rb
+- lib/searchgasm/modifiers/exp.rb
+- lib/searchgasm/modifiers/floor.rb
+- lib/searchgasm/modifiers/hex.rb
+- lib/searchgasm/modifiers/hour.rb
+- lib/searchgasm/modifiers/log.rb
+- lib/searchgasm/modifiers/log10.rb
+- lib/searchgasm/modifiers/log2.rb
+- lib/searchgasm/modifiers/md5.rb
+- lib/searchgasm/modifiers/microseconds.rb
+- lib/searchgasm/modifiers/milliseconds.rb
+- lib/searchgasm/modifiers/minute.rb
+- lib/searchgasm/modifiers/month.rb
+- lib/searchgasm/modifiers/octal.rb
+- lib/searchgasm/modifiers/radians.rb
+- lib/searchgasm/modifiers/round.rb
+- lib/searchgasm/modifiers/second.rb
+- lib/searchgasm/modifiers/sign.rb
+- lib/searchgasm/modifiers/sin.rb
+- lib/searchgasm/modifiers/square_root.rb
+- lib/searchgasm/modifiers/tan.rb
+- lib/searchgasm/modifiers/week.rb
+- lib/searchgasm/modifiers/year.rb
 - lib/searchgasm/search/base.rb
 - lib/searchgasm/search/conditions.rb
 - lib/searchgasm/search/ordering.rb
@@ -111,10 +149,7 @@ files:
 - lib/searchgasm/condition/begins_with.rb
 - lib/searchgasm/condition/blank.rb
 - lib/searchgasm/condition/child_of.rb
-- lib/searchgasm/condition/contains.rb
 - lib/searchgasm/condition/descendant_of.rb
-- lib/searchgasm/condition/does_not_equal.rb
-- lib/searchgasm/condition/during_evening.rb
 - lib/searchgasm/condition/ends_with.rb
 - lib/searchgasm/condition/equals.rb
 - lib/searchgasm/condition/greater_than.rb
@@ -123,7 +158,13 @@ files:
 - lib/searchgasm/condition/keywords.rb
 - lib/searchgasm/condition/less_than.rb
 - lib/searchgasm/condition/less_than_or_equal_to.rb
+- lib/searchgasm/condition/like.rb
 - lib/searchgasm/condition/nil.rb
+- lib/searchgasm/condition/not_begin_with.rb
+- lib/searchgasm/condition/not_end_with.rb
+- lib/searchgasm/condition/not_equal.rb
+- lib/searchgasm/condition/not_have_keywords.rb
+- lib/searchgasm/condition/not_like.rb
 - lib/searchgasm/condition/sibling_of.rb
 - lib/searchgasm/condition/tree.rb
 - lib/searchgasm/conditions/base.rb
@@ -138,6 +179,41 @@ files:
 - lib/searchgasm/helpers/control_types/select.rb
 - lib/searchgasm/helpers/form.rb
 - lib/searchgasm/helpers/utilities.rb
+- lib/searchgasm/modifiers/absolute.rb
+- lib/searchgasm/modifiers/acos.rb
+- lib/searchgasm/modifiers/asin.rb
+- lib/searchgasm/modifiers/atan.rb
+- lib/searchgasm/modifiers/base.rb
+- lib/searchgasm/modifiers/ceil.rb
+- lib/searchgasm/modifiers/char_length.rb
+- lib/searchgasm/modifiers/cos.rb
+- lib/searchgasm/modifiers/cot.rb
+- lib/searchgasm/modifiers/day_of_month.rb
+- lib/searchgasm/modifiers/day_of_week.rb
+- lib/searchgasm/modifiers/day_of_year.rb
+- lib/searchgasm/modifiers/degrees.rb
+- lib/searchgasm/modifiers/exp.rb
+- lib/searchgasm/modifiers/floor.rb
+- lib/searchgasm/modifiers/hex.rb
+- lib/searchgasm/modifiers/hour.rb
+- lib/searchgasm/modifiers/log.rb
+- lib/searchgasm/modifiers/log10.rb
+- lib/searchgasm/modifiers/log2.rb
+- lib/searchgasm/modifiers/md5.rb
+- lib/searchgasm/modifiers/microseconds.rb
+- lib/searchgasm/modifiers/milliseconds.rb
+- lib/searchgasm/modifiers/minute.rb
+- lib/searchgasm/modifiers/month.rb
+- lib/searchgasm/modifiers/octal.rb
+- lib/searchgasm/modifiers/radians.rb
+- lib/searchgasm/modifiers/round.rb
+- lib/searchgasm/modifiers/second.rb
+- lib/searchgasm/modifiers/sign.rb
+- lib/searchgasm/modifiers/sin.rb
+- lib/searchgasm/modifiers/square_root.rb
+- lib/searchgasm/modifiers/tan.rb
+- lib/searchgasm/modifiers/week.rb
+- lib/searchgasm/modifiers/year.rb
 - lib/searchgasm/search/base.rb
 - lib/searchgasm/search/conditions.rb
 - lib/searchgasm/search/ordering.rb
@@ -157,6 +233,7 @@ files:
 - test/fixtures/user_groups.yml
 - test/fixtures/users.yml
 - test/libs/acts_as_tree.rb
+- test/libs/ordered_hash.rb
 - test/libs/rexml_fix.rb
 - test/test_active_record_associations.rb
 - test/test_active_record_base.rb

data/lib/searchgasm/condition/contains.rb

@@ -1,20 +0,0 @@
-module Searchgasm
-  module Condition
-    class Contains < Base
-      class << self
-        def name_for_column(column)
-          return unless string_column?(column)
-          super
-        end
-        
-        def aliases_for_column(column)
-          ["#{column.name}_like", "#{column.name}_has"]
-        end
-      end
-      
-      def to_conditions(value)
-        ["#{quoted_table_name}.#{quoted_column_name} LIKE ?", "%#{value}%"]
-      end
-    end
-  end
-end

data/lib/searchgasm/condition/during_evening.rb

@@ -1,32 +0,0 @@
-module Searchgasm
-  module Condition
-    class DuringEvening < Base
-      class << self
-        def name_for_column(column)
-          return unless time_column?(column)
-          super
-        end
-        
-        def aliases_for_column(column)
-          column_names = [column.name]
-          column_names << column.name.gsub(/_(at|on)$/, "") if column.name =~ /_(at|on)$/
-          
-          aliases = []
-          column_names.each { |column_name| aliases += ["#{column_name}_in_the_evening", "#{column_name}_in_evening", "#{column_name}_evening"] }
-          aliases << "#{column_names.last}_during_evening" if column_names.size > 1
-          aliases
-        end
-      end
-      
-      def to_conditions(value)
-        evening_start = 17
-        evening_end = 22
-        
-        # Need to set up a funcion in each adapter for dealing with dates. Mysql uses HOUR(), sqlite uses strftime(), postgres uses date_part('hour', date). Could potentially be a pain in the ass.
-        # Also, you could set up an hour = condition, and leverage that to do this.
-        if value == true
-          ["#{quoted_table_name}.#{quoted_column_name} >= ? AND #{quoted_table_name}.#{quoted_column_name} <= ?", value]
-      end
-    end
-  end
-end