searchgasm 0.9.6 → 0.9.7

data/lib/searchgasm.rb

@@ -1,31 +1,67 @@
 require "active_record"
+require "active_support"
 
+# Utilties
+require "searchgasm/version"
+require "searchgasm/config"
+require "searchgasm/utilities"
+
+# ActiveRecord
 require "searchgasm/active_record/base"
 require "searchgasm/active_record/associations"
 
-require "searchgasm/version"
-require "searchgasm/search/utilities"
-require "searchgasm/search/condition"
+# Search
+require "searchgasm/search/ordering"
+require "searchgasm/search/pagination"
 require "searchgasm/search/conditions"
 require "searchgasm/search/base"
+require "searchgasm/search/protection"
+
+# Conditions
+require "searchgasm/conditions/protection"
+require "searchgasm/conditions/base"
 
-# Regular conidtion types
-require "searchgasm/search/condition_types/begins_with_condition"
-require "searchgasm/search/condition_types/contains_condition"
-require "searchgasm/search/condition_types/does_not_equal_condition"
-require "searchgasm/search/condition_types/ends_with_condition"
-require "searchgasm/search/condition_types/equals_condition"
-require "searchgasm/search/condition_types/greater_than_condition"
-require "searchgasm/search/condition_types/greater_than_or_equal_to_condition"
-require "searchgasm/search/condition_types/keywords_condition"
-require "searchgasm/search/condition_types/less_than_condition"
-require "searchgasm/search/condition_types/less_than_or_equal_to_condition"
+# Condition
+require "searchgasm/condition/base"
+require "searchgasm/condition/begins_with"
+require "searchgasm/condition/contains"
+require "searchgasm/condition/does_not_equal"
+require "searchgasm/condition/ends_with"
+require "searchgasm/condition/equals"
+require "searchgasm/condition/greater_than"
+require "searchgasm/condition/greater_than_or_equal_to"
+require "searchgasm/condition/keywords"
+require "searchgasm/condition/less_than"
+require "searchgasm/condition/less_than_or_equal_to"
+require "searchgasm/condition/tree"
+require "searchgasm/condition/child_of"
+require "searchgasm/condition/descendant_of"
+require "searchgasm/condition/inclusive_descendant_of"
+require "searchgasm/condition/sibling_of"
 
-# Tree condition types
-require "searchgasm/search/condition_types/tree_condition"
-require "searchgasm/search/condition_types/child_of_condition"
-require "searchgasm/search/condition_types/descendant_of_condition"
-require "searchgasm/search/condition_types/inclusive_descendant_of_condition"
-require "searchgasm/search/condition_types/sibling_of_condition"
+# Helpers
+require "searchgasm/helpers/utilities_helper"
+require "searchgasm/helpers/form_helper"
+require "searchgasm/helpers/search_helper"
 
-Searchgasm = BinaryLogic::Searchgasm::Search
+# Lets do it!
+module Searchgasm
+  module Search
+    class Base
+      include Conditions
+      include Ordering
+      include Pagination
+      include Protection
+    end
+  end
+  
+  module Conditions
+    class Base
+      include Protection
+    end
+    
+    [:begins_with, :child_of, :contains, :descendant_of, :does_not_equal, :ends_with, :equals, :greater_than, :greater_than_or_equal_to, :inclusive_descendant_of, :keywords, :less_than, :less_than_or_equal_to, :sibling_of].each do |condition|
+      Base.register_condition("Searchgasm::Condition::#{condition.to_s.camelize}".constantize)
+    end
+  end
+end

data/searchgasm.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Searchgasm-0.9.6
+# Gem::Specification for Searchgasm-0.9.7
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
 autorequire: 
 bindir: bin
 
-date: 2008-09-03 00:00:00 -04:00
+date: 2008-09-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,58 +55,77 @@ extra_rdoc_files:
 - CHANGELOG
 - lib/searchgasm/active_record/associations.rb
 - lib/searchgasm/active_record/base.rb
+- lib/searchgasm/condition/base.rb
+- lib/searchgasm/condition/begins_with.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/ends_with.rb
+- lib/searchgasm/condition/equals.rb
+- lib/searchgasm/condition/greater_than.rb
+- lib/searchgasm/condition/greater_than_or_equal_to.rb
+- lib/searchgasm/condition/inclusive_descendant_of.rb
+- lib/searchgasm/condition/keywords.rb
+- lib/searchgasm/condition/less_than.rb
+- lib/searchgasm/condition/less_than_or_equal_to.rb
+- lib/searchgasm/condition/sibling_of.rb
+- lib/searchgasm/condition/tree.rb
+- lib/searchgasm/conditions/base.rb
+- lib/searchgasm/conditions/protection.rb
+- lib/searchgasm/config.rb
+- lib/searchgasm/helpers/form_helper.rb
+- lib/searchgasm/helpers/search_helper.rb
+- lib/searchgasm/helpers/utilities_helper.rb
 - lib/searchgasm/search/base.rb
-- lib/searchgasm/search/condition.rb
-- lib/searchgasm/search/condition_types/begins_with_condition.rb
-- lib/searchgasm/search/condition_types/child_of_condition.rb
-- lib/searchgasm/search/condition_types/contains_condition.rb
-- lib/searchgasm/search/condition_types/descendant_of_condition.rb
-- lib/searchgasm/search/condition_types/does_not_equal_condition.rb
-- lib/searchgasm/search/condition_types/ends_with_condition.rb
-- lib/searchgasm/search/condition_types/equals_condition.rb
-- lib/searchgasm/search/condition_types/greater_than_condition.rb
-- lib/searchgasm/search/condition_types/greater_than_or_equal_to_condition.rb
-- lib/searchgasm/search/condition_types/inclusive_descendant_of_condition.rb
-- lib/searchgasm/search/condition_types/keywords_condition.rb
-- lib/searchgasm/search/condition_types/less_than_condition.rb
-- lib/searchgasm/search/condition_types/less_than_or_equal_to_condition.rb
-- lib/searchgasm/search/condition_types/sibling_of_condition.rb
-- lib/searchgasm/search/condition_types/tree_condition.rb
 - lib/searchgasm/search/conditions.rb
-- lib/searchgasm/search/utilities.rb
+- lib/searchgasm/search/ordering.rb
+- lib/searchgasm/search/pagination.rb
+- lib/searchgasm/search/protection.rb
+- lib/searchgasm/utilities.rb
 - lib/searchgasm/version.rb
 - lib/searchgasm.rb
-- README.mdown
+- README.rdoc
 files: 
 - CHANGELOG
+- examples/README.rdoc
 - init.rb
 - lib/searchgasm/active_record/associations.rb
 - lib/searchgasm/active_record/base.rb
+- lib/searchgasm/condition/base.rb
+- lib/searchgasm/condition/begins_with.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/ends_with.rb
+- lib/searchgasm/condition/equals.rb
+- lib/searchgasm/condition/greater_than.rb
+- lib/searchgasm/condition/greater_than_or_equal_to.rb
+- lib/searchgasm/condition/inclusive_descendant_of.rb
+- lib/searchgasm/condition/keywords.rb
+- lib/searchgasm/condition/less_than.rb
+- lib/searchgasm/condition/less_than_or_equal_to.rb
+- lib/searchgasm/condition/sibling_of.rb
+- lib/searchgasm/condition/tree.rb
+- lib/searchgasm/conditions/base.rb
+- lib/searchgasm/conditions/protection.rb
+- lib/searchgasm/config.rb
+- lib/searchgasm/helpers/form_helper.rb
+- lib/searchgasm/helpers/search_helper.rb
+- lib/searchgasm/helpers/utilities_helper.rb
 - lib/searchgasm/search/base.rb
-- lib/searchgasm/search/condition.rb
-- lib/searchgasm/search/condition_types/begins_with_condition.rb
-- lib/searchgasm/search/condition_types/child_of_condition.rb
-- lib/searchgasm/search/condition_types/contains_condition.rb
-- lib/searchgasm/search/condition_types/descendant_of_condition.rb
-- lib/searchgasm/search/condition_types/does_not_equal_condition.rb
-- lib/searchgasm/search/condition_types/ends_with_condition.rb
-- lib/searchgasm/search/condition_types/equals_condition.rb
-- lib/searchgasm/search/condition_types/greater_than_condition.rb
-- lib/searchgasm/search/condition_types/greater_than_or_equal_to_condition.rb
-- lib/searchgasm/search/condition_types/inclusive_descendant_of_condition.rb
-- lib/searchgasm/search/condition_types/keywords_condition.rb
-- lib/searchgasm/search/condition_types/less_than_condition.rb
-- lib/searchgasm/search/condition_types/less_than_or_equal_to_condition.rb
-- lib/searchgasm/search/condition_types/sibling_of_condition.rb
-- lib/searchgasm/search/condition_types/tree_condition.rb
 - lib/searchgasm/search/conditions.rb
-- lib/searchgasm/search/utilities.rb
+- lib/searchgasm/search/ordering.rb
+- lib/searchgasm/search/pagination.rb
+- lib/searchgasm/search/protection.rb
+- lib/searchgasm/utilities.rb
 - lib/searchgasm/version.rb
 - lib/searchgasm.rb
 - Manifest
 - MIT-LICENSE
 - Rakefile
-- README.mdown
+- README.rdoc
 - test/fixtures/accounts.yml
 - test/fixtures/orders.yml
 - test/fixtures/users.yml
@@ -114,10 +133,13 @@ files:
 - test/libs/rexml_fix.rb
 - test/test_active_record_associations.rb
 - test/test_active_record_base.rb
+- test/test_condition.rb
+- test/test_conditions_base.rb
 - test/test_helper.rb
-- test/test_searchgasm_base.rb
-- test/test_searchgasm_condition_types.rb
-- test/test_searchgasm_conditions.rb
+- test/test_search_base.rb
+- test/test_search_ordering.rb
+- test/test_search_pagination.rb
+- test/test_search_protection.rb
 - searchgasm.gemspec
 has_rdoc: true
 homepage: http://github.com/binarylogic/searchgasm
@@ -128,7 +150,7 @@ rdoc_options:
 - --title
 - Searchgasm
 - --main
-- README.mdown
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -152,7 +174,10 @@ summary: Orgasmic ActiveRecord searching
 test_files: 
 - test/test_active_record_associations.rb
 - test/test_active_record_base.rb
+- test/test_condition.rb
+- test/test_conditions_base.rb
 - test/test_helper.rb
-- test/test_searchgasm_base.rb
-- test/test_searchgasm_condition_types.rb
-- test/test_searchgasm_conditions.rb
+- test/test_search_base.rb
+- test/test_search_ordering.rb
+- test/test_search_pagination.rb
+- test/test_search_protection.rb

data/test/test_active_record_associations.rb

@@ -14,7 +14,7 @@ class TestActiveRecordAssociations < Test::Unit::TestCase
   
   def test_build_search
     search = Account.find(1).users.build_search
-    assert_kind_of BinaryLogic::Searchgasm::Search::Base, search
+    assert_kind_of Searchgasm::Search::Base, search
     assert_equal User, search.klass
     assert_equal "\"users\".account_id = 1", search.conditions.scope
     

data/test/test_active_record_base.rb

@@ -34,10 +34,10 @@ class TestActiveRecordBase < Test::Unit::TestCase
   
   def test_build_search
     search = Account.new_search
-    assert_kind_of BinaryLogic::Searchgasm::Search::Base, search
+    assert_kind_of Searchgasm::Search::Base, search
     
     search = Account.build_search(:conditions => {:name_keywords => "awesome"}, :page => 2, :per_page => 15)
-    assert_kind_of BinaryLogic::Searchgasm::Search::Base, search
+    assert_kind_of Searchgasm::Search::Base, search
     assert_equal Account, search.klass
     assert_equal "awesome", search.conditions.name_keywords
     assert_equal 2, search.page
@@ -49,10 +49,10 @@ class TestActiveRecordBase < Test::Unit::TestCase
   
   def test_build_conditions
     search = Account.new_conditions
-    assert_kind_of BinaryLogic::Searchgasm::Search::Conditions, search
+    assert_kind_of Searchgasm::Conditions::Base, search
     
     search = Account.build_conditions(:name_keywords => "awesome")
-    assert_kind_of BinaryLogic::Searchgasm::Search::Conditions, search
+    assert_kind_of Searchgasm::Conditions::Base, search
     assert_equal Account, search.klass
     assert_equal "awesome", search.name_keywords
 

data/test/test_condition.rb

@@ -0,0 +1,143 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestCondition < Test::Unit::TestCase
+  fixtures :accounts, :users, :orders
+  
+  def setup
+    setup_db
+    load_fixtures
+  end
+  
+  def teardown
+    teardown_db
+  end
+  
+  def test_condition_name
+    assert_equal "equals", Searchgasm::Condition::Equals.condition_name
+    assert_equal "keywords", Searchgasm::Condition::Keywords.condition_name
+    assert_equal "greater_than_or_equal_to", Searchgasm::Condition::GreaterThanOrEqualTo.condition_name
+  end
+  
+  def test_string_column
+    
+  end
+  
+  def test_comparable_column
+    
+  end
+  
+  def test_initialize
+    condition = Searchgasm::Condition::Keywords.new(Account, Account.columns_hash["name"])
+    assert_equal condition.klass, Account
+    assert_equal condition.column, Account.columns_hash["name"]
+    
+    condition = Searchgasm::Condition::GreaterThan.new(Account, "id")
+    assert_equal condition.column, Account.columns_hash["id"]
+  end
+  
+  def test_explicitly_set_value
+    condition = Searchgasm::Condition::Equals.new(Account, Account.columns_hash["name"])
+    assert !condition.explicitly_set_value?
+    condition.value = nil
+    assert condition.explicitly_set_value?
+    
+    condition = Searchgasm::Condition::Keywords.new(Account, Account.columns_hash["name"])
+    assert !condition.explicitly_set_value?
+    condition.value = nil
+    assert !condition.explicitly_set_value?
+  end
+  
+  def test_ignore_blanks?
+    condition = Searchgasm::Condition::Equals.new(Account, Account.columns_hash["id"])
+    assert !condition.ignore_blanks?
+    
+    condition = Searchgasm::Condition::Keywords.new(Account, Account.columns_hash["name"])
+    assert condition.ignore_blanks?
+  end
+
+  def test_sanitize
+    condition = Searchgasm::Condition::BeginsWith.new(Account, Account.columns_hash["name"])
+    condition.value = "Binary"
+    assert_equal condition.sanitize, ["\"accounts\".\"name\" LIKE ?", "Binary%"]
+    
+    condition = Searchgasm::Condition::ChildOf.new(User)
+    condition.value = User.first.id
+    assert_equal condition.sanitize, ["\"users\".\"parent_id\" = ?", User.first.id]
+    
+    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%"]
+    
+    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"
+    
+    condition = Searchgasm::Condition::EndsWith.new(Account, Account.columns_hash["name"])
+    condition.value = "Binary"
+    assert_equal condition.sanitize, ["\"accounts\".\"name\" LIKE ?", "%Binary"]
+    
+    condition = Searchgasm::Condition::Equals.new(Account, Account.columns_hash["id"])
+    condition.value = 12
+    assert_equal condition.sanitize, "\"accounts\".\"id\" = 12"
+    
+    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)"
+    
+    condition = Searchgasm::Condition::Equals.new(Account, Account.columns_hash["id"])
+    condition.value = (1..10)
+    assert_equal condition.sanitize, "\"accounts\".\"id\" BETWEEN 1 AND 10"
+    
+    condition = Searchgasm::Condition::GreaterThan.new(Account, Account.columns_hash["id"])
+    condition.value = 2
+    assert_equal condition.sanitize, ["\"accounts\".\"id\" > ?", 2]
+    
+    condition = Searchgasm::Condition::GreaterThanOrEqualTo.new(Account, Account.columns_hash["id"])
+    condition.value = 2
+    assert_equal condition.sanitize, ["\"accounts\".\"id\" >= ?", 2]
+    
+    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]
+    
+    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%"]
+    
+    condition = Searchgasm::Condition::Keywords.new(Account, Account.columns_hash["name"])
+    condition.value = "%^$*(^$)"
+    assert_equal condition.sanitize, nil
+    
+    condition = Searchgasm::Condition::LessThan.new(Account, Account.columns_hash["id"])
+    condition.value = 2
+    assert_equal condition.sanitize, ["\"accounts\".\"id\" < ?", 2]
+    
+    condition = Searchgasm::Condition::LessThanOrEqualTo.new(Account, Account.columns_hash["id"])
+    condition.value = 2
+    assert_equal condition.sanitize, ["\"accounts\".\"id\" <= ?", 2]
+    
+    condition = Searchgasm::Condition::SiblingOf.new(User)
+    condition.value = User.find(2)
+    assert_equal condition.sanitize, ["(\"users\".\"id\" != ?) AND (\"users\".\"parent_id\" = ?)", 2, 1]
+  end
+  
+  def test_value
+    
+  end
+end

data/test/{test_searchgasm_conditions.rb → test_conditions_base.rb}

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-class TestSearchgasmConditions < Test::Unit::TestCase
+class TestConditionsBase < Test::Unit::TestCase
   fixtures :accounts, :users, :orders
   
   def setup
@@ -13,16 +13,16 @@ class TestSearchgasmConditions < Test::Unit::TestCase
   end
   
   def test_register_conditions
-    BinaryLogic::Searchgasm::Search::Conditions.register_condition(BinaryLogic::Searchgasm::Search::ConditionTypes::KeywordsCondition)
-    assert [BinaryLogic::Searchgasm::Search::ConditionTypes::KeywordsCondition], BinaryLogic::Searchgasm::Search::Conditions.conditions
+    Searchgasm::Conditions::Base.register_condition(Searchgasm::Condition::Keywords)
+    assert [Searchgasm::Condition::Keywords], Searchgasm::Conditions::Base.conditions
     
-    BinaryLogic::Searchgasm::Search::Conditions.register_condition(BinaryLogic::Searchgasm::Search::ConditionTypes::ContainsCondition)
-    assert [BinaryLogic::Searchgasm::Search::ConditionTypes::KeywordsCondition, BinaryLogic::Searchgasm::Search::ConditionTypes::ContainsCondition], BinaryLogic::Searchgasm::Search::Conditions.conditions
+    Searchgasm::Conditions::Base.register_condition(Searchgasm::Condition::Contains)
+    assert [Searchgasm::Condition::Keywords, Searchgasm::Condition::Contains], Searchgasm::Conditions::Base.conditions
     
   end
   
   def test_initialize
-    conditions = BinaryLogic::Searchgasm::Search::Conditions.new(Account, :name_contains => "Binary")
+    conditions = Searchgasm::Conditions::Base.new(Account, :name_contains => "Binary")
     assert_equal conditions.klass, Account
     assert_equal conditions.name_contains, "Binary"
   end
@@ -34,19 +34,29 @@ class TestSearchgasmConditions < Test::Unit::TestCase
   def test_setting_conditions
     [Account, User, Order].each do |klass|
       conditions = klass.new_conditions
-      conditions.condition_names.each do |condition_name|
+      conditions.send(:condition_names).each do |condition_name|
         conditions.send("#{condition_name}=", 1)
         assert_equal 1, conditions.send(condition_name)
       end
     end
   end
   
+  def test_accessible_protected_conditions
+    #Account.conditions_accessible << :name_contains
+    #conditions = Searchgasm::Conditions::Base.new(Account)
+    #conditions.conditions = {:created_after => Time.now, :name_contains => "Binary"}
+    #assert({:name_contains => "Binary"}, conditions.value)
+  end
+  
   def test_assert_valid_values
-    
+    conditions = User.new_conditions
+    assert_raise(ArgumentError) { conditions.conditions = {:unknown => "blah"} }
+    assert_nothing_raised { conditions.conditions = {:first_name => "blah"} }
+    assert_nothing_raised { conditions.conditions = {:first_name_contains => "blah"} }
   end
   
   def test_setting_associations
-    conditions = BinaryLogic::Searchgasm::Search::Conditions.new(Account, :users => {:first_name_like => "Ben"})
+    conditions = Searchgasm::Conditions::Base.new(Account, :users => {:first_name_like => "Ben"})
     assert_equal conditions.users.first_name_like, "Ben"
     
     conditions.users.last_name_begins_with = "Ben"
@@ -54,7 +64,7 @@ class TestSearchgasmConditions < Test::Unit::TestCase
   end
   
   def test_includes
-    conditions = BinaryLogic::Searchgasm::Search::Conditions.new(Account)
+    conditions = Searchgasm::Conditions::Base.new(Account)
     assert_equal conditions.includes, nil
     
     conditions.name_like = "Binary"
@@ -68,44 +78,44 @@ class TestSearchgasmConditions < Test::Unit::TestCase
   end
   
   def test_objects
-    conditions = BinaryLogic::Searchgasm::Search::Conditions.new(Account)
-    assert_equal conditions.objects, []
+    conditions = Searchgasm::Conditions::Base.new(Account)
+    assert_equal conditions.send(:objects), []
     
     conditions.name_contains = "Binary"
-    assert_equal conditions.objects.size, 1
+    assert_equal conditions.send(:objects).size, 1
     
     conditions.users.first_name_contains = "Ben"
-    assert_equal conditions.objects.size, 2
+    assert_equal conditions.send(:objects).size, 2
   end
   
   def test_reset
-    conditions = BinaryLogic::Searchgasm::Search::Conditions.new(Account)
+    conditions = Searchgasm::Conditions::Base.new(Account)
     
     conditions.name_contains = "Binary"
-    assert_equal 1, conditions.objects.size
+    assert_equal 1, conditions.send(:objects).size
     
     conditions.reset_name_contains!
-    assert_equal [], conditions.objects
+    assert_equal [], conditions.send(:objects)
     
     conditions.users.first_name_like = "Ben"
-    assert_equal 1, conditions.objects.size
+    assert_equal 1, conditions.send(:objects).size
     
     conditions.reset_users!
-    assert_equal [], conditions.objects
+    assert_equal [], conditions.send(:objects)
     
     conditions.name_begins_with ="Binary"
     conditions.users.orders.total_gt = 200
-    assert_equal 2, conditions.objects.size
+    assert_equal 2, conditions.send(:objects).size
     
     conditions.reset_name_begins_with!
-    assert_equal 1, conditions.objects.size
+    assert_equal 1, conditions.send(:objects).size
     
     conditions.reset_users!
-    assert_equal [], conditions.objects
+    assert_equal [], conditions.send(:objects)
   end
   
   def test_sanitize
-    conditions = BinaryLogic::Searchgasm::Search::Conditions.new(Account)
+    conditions = Searchgasm::Conditions::Base.new(Account)
     conditions.name_contains = "Binary"
     conditions.id_gt = 5
     now = Time.now
@@ -119,29 +129,29 @@ class TestSearchgasmConditions < Test::Unit::TestCase
     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]
   end
   
-  def test_value
-    conditions = BinaryLogic::Searchgasm::Search::Conditions.new(Account)
+  def test_conditions
+    conditions = Searchgasm::Conditions::Base.new(Account)
     now = Time.now
     v = {:name_contains => "Binary", :created_at_greater_than => now}
-    conditions.value = v
-    assert_equal v, conditions.value
+    conditions.conditions = v
+    assert_equal v, conditions.conditions
     
     scope = "id in (1,2,3,4)"
-    conditions.value = scope
-    assert_equal v, conditions.value, v
+    conditions.conditions = scope
+    assert_equal v, conditions.conditions, v
     assert_equal scope, conditions.scope
     
     v2 = {:id_less_than => 5, :name_begins_with => "Beginning of string"}
-    conditions.value = v2
-    assert_equal v.merge(v2), conditions.value
+    conditions.conditions = v2
+    assert_equal v.merge(v2), conditions.conditions
     
     scope2 = "id > 5 and name = 'Test'"
-    conditions.value = scope2
+    conditions.conditions = scope2
     assert_equal scope2, conditions.scope
   end
   
   def test_searching
-    conditions = BinaryLogic::Searchgasm::Search::Conditions.new(Account)
+    conditions = Searchgasm::Conditions::Base.new(Account)
     conditions.name_contains = "Binary"
     assert_equal Account.find(1, 3), conditions.all
     assert_equal Account.find(1, 3), conditions.find(:all)