searchgasm 1.1.3 → 1.2.0

data/test/test_conditions_base.rb

@@ -1,39 +1,130 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestConditionsBase < Test::Unit::TestCase
-  fixtures :accounts, :users, :orders
-  
-  def setup
-    setup_db
-    load_fixtures
-  end
-  
-  def teardown
-    teardown_db
-  end
-  
   def test_register_conditions
     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
-    
+  end
+  
+  def test_association_names
+    assert_equal ["account", "parent", "orders", "user_groups", "children"], Searchgasm::Cache::UserConditions.association_names
+    assert_equal ["admin", "orders", "users"], Searchgasm::Cache::AccountConditions.association_names
+  end
+  
+  def test_condition_names
+    # This is tested thoroughly through the tests
+  end
+  
+  def test_needed
+    assert !Searchgasm::Conditions::Base.needed?(User, {})
+    assert !Searchgasm::Conditions::Base.needed?(User, {:first_name => "Ben"})
+    assert Searchgasm::Conditions::Base.needed?(User, {:first_name_contains => "Awesome"})
   end
   
   def test_initialize
-    conditions = Account.new_conditions(:name_contains => "Binary")
+    conditions = Searchgasm::Cache::AccountConditions.new(:name_contains => "Binary")
     assert_equal conditions.klass, Account
     assert_equal conditions.name_contains, "Binary"
   end
   
-  def test_conditions_added
-    # test to make sure all of the proper methods were add, testing condition_names basically
+  def test_any
+    conditions = Searchgasm::Cache::AccountConditions.new
+    assert !conditions.any?
+
+    conditions = Searchgasm::Cache::AccountConditions.new(:any => true)
+    assert conditions.any?
+    conditions.any = "false"
+    assert !conditions.any?
+    
+    conditions = Searchgasm::Cache::AccountConditions.new
+    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
+    conditions.any = true
+    assert_equal ["(\"accounts\".\"name\" LIKE ?) OR (\"accounts\".\"id\" = 1)", "%Binary%"], conditions.sanitize
+    conditions.any = false
+    assert_equal ["(\"accounts\".\"name\" LIKE ?) AND (\"accounts\".\"id\" = 1)", "%Binary%"], conditions.sanitize
+  end
+  
+  def test_auto_joins
+    conditions = Searchgasm::Cache::AccountConditions.new
+    assert_equal conditions.auto_joins, nil
+    
+    conditions.name_like = "Binary"
+    assert_equal conditions.auto_joins, nil
+    
+    conditions.users.first_name_like = "Ben"
+    assert_equal conditions.auto_joins, :users
+    
+    conditions.users.orders.description_like = "apple"
+    assert_equal conditions.auto_joins, {:users => :orders} 
+  end
+  
+  def test_inspect
+    conditions = Searchgasm::Cache::AccountConditions.new
+    assert_nothing_raised { conditions.inspect }
+  end
+  
+  def test_sanitize
+    conditions = Searchgasm::Cache::AccountConditions.new
+    conditions.name_contains = "Binary"
+    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]
+    
+    # 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]
+    
+    # test that raw sql is returned
+    conditions.conditions = "awesome"
+    assert_equal "awesome", conditions.sanitize
+  end
+  
+  def test_conditions
+    conditions = Searchgasm::Cache::AccountConditions.new
+    now = Time.now
+    v = {:name_contains => "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)
+    
+    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}
+    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)
+    
+    conditions.name_contains = "awesome"
+    assert_equal({:name_contains => "awesome"}, conditions.conditions)
+    
+    conditions.conditions = {:id_gt => "", :name_starts_with => "Ben"}
+    assert_equal({:name_contains => "awesome", :name_begins_with => "Ben"}, conditions.conditions)
   end
   
+  # Other general usage tests, need to clean these up
+  
   def test_setting_conditions
     [Account, User, Order].each do |klass|
-      conditions = klass.new_conditions
+      conditions = "Searchgasm::Cache::#{klass}Conditions".constantize.new
       conditions.class.condition_names.each do |condition_name|
         conditions.send("#{condition_name}=", 1)
         assert_equal 1, conditions.send(condition_name)
@@ -43,13 +134,13 @@ class TestConditionsBase < Test::Unit::TestCase
   
   def test_accessible_protected_conditions
     Account.conditions_accessible << :name_contains
-    conditions = Account.new_conditions
+    conditions = Searchgasm::Cache::AccountConditions.new
     conditions.conditions = {:created_after => Time.now, :name_contains => "Binary"}
     assert({:name_contains => "Binary"}, conditions.conditions)
     Account.send(:write_inheritable_attribute, :conditions_accessible, nil)
     
     Account.conditions_protected << :name_contains
-    conditions = Account.new_conditions
+    conditions = Searchgasm::Cache::AccountConditions.new
     now = Time.now
     conditions.conditions = {:created_after => now, :name_contains => "Binary"}
     assert({:created_after => now}, conditions.conditions)
@@ -57,36 +148,22 @@ class TestConditionsBase < Test::Unit::TestCase
   end
   
   def test_assert_valid_values
-    conditions = User.new_conditions
+    conditions = Searchgasm::Cache::UserConditions.new
     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 = Account.new_conditions(:users => {:first_name_like => "Ben"})
+    conditions = Searchgasm::Cache::AccountConditions.new(:users => {:first_name_like => "Ben"})
     assert_equal conditions.users.first_name_like, "Ben"
     
     conditions.users.last_name_begins_with = "Ben"
     assert_equal conditions.users.last_name_begins_with, "Ben"
   end
   
-  def test_joins
-    conditions = Account.new_conditions
-    assert_equal conditions.joins, nil
-    
-    conditions.name_like = "Binary"
-    assert_equal conditions.joins, nil
-    
-    conditions.users.first_name_like = "Ben"
-    assert_equal conditions.joins, :users
-    
-    conditions.users.orders.description_like = "apple"
-    assert_equal conditions.joins, {:users => :orders} 
-  end
-  
   def test_objects
-    conditions = Account.new_conditions
+    conditions = Searchgasm::Cache::AccountConditions.new
     assert_equal conditions.send(:objects), []
     
     conditions.name_contains = "Binary"
@@ -97,7 +174,7 @@ class TestConditionsBase < Test::Unit::TestCase
   end
   
   def test_reset
-    conditions = Account.new_conditions
+    conditions = Searchgasm::Cache::AccountConditions.new
     
     conditions.name_contains = "Binary"
     assert_equal 1, conditions.send(:objects).size
@@ -121,88 +198,4 @@ class TestConditionsBase < Test::Unit::TestCase
     conditions.reset_users!
     assert_equal [], conditions.send(:objects)
   end
-  
-  def test_sanitize
-    conditions = Account.new_conditions
-    conditions.name_contains = "Binary"
-    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]
-    
-    # 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]
-  end
-  
-  def test_conditions
-    conditions = Account.new_conditions!
-    now = Time.now
-    v = {:name_contains => "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
-    
-    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}
-    conditions.conditions = v
-    assert_equal v2.merge(v), conditions.conditions
-    
-    sql2 = "id > 5 and name = 'Test'"
-    conditions.conditions = sql2
-    assert_equal sql2, conditions.conditions
-    
-    conditions.name_contains = "awesome"
-    assert_equal({:name_contains => "awesome"}, conditions.conditions)
-  end
-  
-  def test_searching
-    conditions = Account.new_conditions
-    conditions.name_contains = "Binary"
-    assert_equal Account.find(1, 3), conditions.all
-    assert_equal Account.find(1, 3), conditions.find(:all)
-    assert_equal Account.find(1), conditions.first
-    assert_equal Account.find(1), conditions.find(:first)
-    assert_equal 2, conditions.average('id')
-    assert_equal 2, conditions.calculate(:avg, 'id')
-    assert_equal 3, conditions.calculate(:max, 'id')
-    assert_equal 2, conditions.count
-    assert_equal 3, conditions.maximum('id')
-    assert_equal 1, conditions.minimum('id')
-    assert_equal 4, conditions.sum('id')
-  end
-  
-  def test_any
-    conditions = Account.new_conditions
-    conditions.name_contains = "Binary"
-    assert_equal Account.find(1, 3), conditions.all
-    conditions.id = 1
-    assert_equal [Account.find(1)], conditions.all
-    conditions.any = true
-    assert_equal Account.find(1, 3), conditions.all
-    conditions.any = false
-    assert_equal [Account.find(1)], conditions.all
-  end
-  
-  def test_ignoring_blanks
-    conditions = Account.new_conditions(:name => "", :created_after => nil)
-    assert_equal(nil, conditions.conditions)
-    conditions.name = ""
-    assert_equal({:name_equals => ""}, conditions.conditions)
-    conditions.created_after = ""
-    assert_equal({:name_equals => ""}, conditions.conditions)
-  end
-  
-  def test_inspect
-    conditions = Account.new_conditions
-    assert_nothing_raised { conditions.inspect }
-  end
 end

data/test/test_conditions_protection.rb

@@ -1,27 +1,16 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestConditionsProtection < Test::Unit::TestCase
-  fixtures :accounts, :users, :orders
-  
-  def setup
-    setup_db
-    load_fixtures
-  end
-  
-  def teardown
-    teardown_db
-  end
-
   def test_protection
-    assert_raise(ArgumentError) { Account.new_conditions("(DELETE FROM users)") }
-    assert_nothing_raised { Account.build_conditions!("(DELETE FROM users)") }
+    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.build_conditions("(DELETE FROM users)") }
-    assert_nothing_raised { account.users.build_conditions!("(DELETE FROM users)") }
+    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_nothing_raised { search.conditions = "(DELETE FROM users)" }
+    search = Account.new_search
+    assert_raise(ArgumentError) { search.conditions = "(DELETE FROM users)" }
   end
 end

data/test/test_config.rb

@@ -1,17 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestConfig < Test::Unit::TestCase
-  fixtures :accounts, :users, :orders
-
-  def setup
-    setup_db
-    load_fixtures
-  end
-
-  def teardown
-    teardown_db
-  end
-
   def test_per_page
     Searchgasm::Config.per_page = 1
     
@@ -31,4 +20,6 @@ class TestConfig < Test::Unit::TestCase
     assert User.new_search.all.size > 1
     assert User.new_search(:per_page => 1).all.size == 1
   end
+  
+  # test that config options do not mess up regular AR searches
 end

data/test/test_helper.rb

@@ -14,11 +14,15 @@ class Account < ActiveRecord::Base
   has_many :orders, :through => :users
 end
 
+class UserGroup < ActiveRecord::Base
+  has_and_belongs_to_many :users
+end
+
 class User < ActiveRecord::Base
   acts_as_tree
   belongs_to :account
   has_many :orders, :dependent => :destroy
-  has_one :cool_order, :class_name => "Order", :conditions => {:total => 100}
+  has_and_belongs_to_many :user_groups
 end
 
 class Order < ActiveRecord::Base
@@ -26,11 +30,6 @@ class Order < ActiveRecord::Base
 end
 
 class Test::Unit::TestCase
-  def self.fixtures(*fixtures)
-    @fixtures ||= []
-    @fixtures += [fixtures].flatten
-  end
-  
   def setup_db
     ActiveRecord::Schema.define(:version => 1) do
       create_table :accounts do |t|
@@ -40,6 +39,17 @@ class Test::Unit::TestCase
         t.boolean   :active
       end
 
+      create_table :user_groups do |t|
+        t.datetime  :created_at      
+        t.datetime  :updated_at
+        t.string    :name
+      end
+      
+      create_table :user_groups_users, :id => false do |t|
+        t.integer :user_group_id
+        t.integer :user_id
+      end
+      
       create_table :users do |t|
         t.datetime  :created_at      
         t.datetime  :updated_at
@@ -63,7 +73,8 @@ class Test::Unit::TestCase
   end
   
   def load_fixtures
-    self.class.fixtures.each do |fixture|
+    fixtures = [:accounts, :orders, :users, :user_groups]
+    fixtures.each do |fixture|
       records = YAML.load(File.read(File.dirname(__FILE__) + "/fixtures/#{fixture.to_s}.yml"))
       records.each do |name, attributes|
         record = fixture.to_s.singularize.classify.constantize.new
@@ -71,6 +82,17 @@ class Test::Unit::TestCase
         record.save!
       end
     end
+    
+    # Not sure why I have to do this, but sick of dealing with it
+    UserGroup.all.each do |user_group|
+      user_ids = user_group.user_ids.uniq!
+      user_group.users.clear
+      user_group.user_ids = user_ids
+      user_group.save!
+    end
+    
+    # Create the cached virtual classes
+    fixtures.each { |fixture| fixture.to_s.classify.constantize.new_search }
   end
   
   def teardown_db
@@ -78,4 +100,13 @@ class Test::Unit::TestCase
       ActiveRecord::Base.connection.drop_table(table)
     end
   end
+  
+  def setup
+    setup_db
+    load_fixtures
+  end
+  
+  def teardown
+    teardown_db
+  end
 end

data/test/test_search_base.rb

@@ -1,17 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestSearchBase < Test::Unit::TestCase
-  fixtures :accounts, :users, :orders
-
-  def setup
-    setup_db
-    load_fixtures
-  end
-
-  def teardown
-    teardown_db
-  end
-
   def test_needed
     assert Searchgasm::Search::Base.needed?(Account, :page => 2, :conditions => {:name => "Ben"})
     assert !Searchgasm::Search::Base.needed?(Account, :conditions => {:name => "Ben"})
@@ -109,20 +98,20 @@ class TestSearchBase < Test::Unit::TestCase
     assert_equal search.lock, true
   end
 
-  def test_joins
+  def test_auto_joins
     search = Account.new_search
-    assert_equal nil, search.joins
+    assert_equal nil, search.auto_joins
     search.conditions.name_contains = "Binary"
-    assert_equal nil, search.joins
+    assert_equal nil, search.auto_joins
     search.conditions.users.first_name_contains = "Ben"
-    assert_equal(:users, search.joins)
+    assert_equal(:users, search.auto_joins)
     search.conditions.users.orders.id_gt = 2
-    assert_equal({:users => :orders}, search.joins)
+    assert_equal({:users => :orders}, search.auto_joins)
     search.conditions.users.reset_orders!
-    assert_equal(:users, search.joins)
+    assert_equal(:users, search.auto_joins)
     search.conditions.users.orders.id_gt = 2
     search.conditions.reset_users!
-    assert_equal nil, search.joins
+    assert_equal nil, search.auto_joins
   end
 
   def test_limit

data/test/test_search_conditions.rb

@@ -1,17 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestSearchConditions < Test::Unit::TestCase
-  fixtures :accounts, :users, :orders
-
-  def setup
-    setup_db
-    load_fixtures
-  end
-
-  def teardown
-    teardown_db
-  end
-
   def test_conditions
     search = Account.new_search
     assert_kind_of Searchgasm::Conditions::Base, search.conditions
@@ -19,9 +8,32 @@ class TestSearchConditions < Test::Unit::TestCase
   
     search.conditions = {:name_like => "Binary"}
     assert_kind_of Searchgasm::Conditions::Base, search.conditions
+    
+    search = Account.new_search(:conditions => {:name_like => "Ben"})
+    assert_equal({:name_contains => "Ben"}, search.conditions.conditions)
+  end
+  
+  def test_auto_joins
+    search = Account.new_search
+    search.conditions = {:name_like => "Binary"}
+    assert_equal nil, search.auto_joins
+    search.conditions.users.first_name_like = "Ben"
+    assert_equal :users, search.auto_joins
+    search.conditions.reset_users!
+    assert_equal nil, search.auto_joins
+  end
+  
+  def test_joins
+    search = Account.new_search
+    search.conditions = {:id_lte => 2, :users => {:first_name_like => "Ben"}}
+    assert_equal :users, search.joins
+    assert_equal [Account.find(1)], search.all
+    search.conditions.any = true
+    assert_equal " LEFT OUTER JOIN \"users\" ON users.account_id = accounts.id ", search.joins
+    assert_equal Account.find(1, 2), search.all
+  end
   
-    conditions = Account.new_conditions(:id_greater_than => 8)
-    search.conditions = conditions
-    assert_equal conditions, search.conditions
+  def test_sanitize
+    # This is tested in test_search_base
   end
 end

data/test/test_search_ordering.rb

@@ -1,17 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestSearchOrdering < Test::Unit::TestCase
-  fixtures :accounts, :users, :orders
-  
-  def setup
-    setup_db
-    load_fixtures
-  end
-  
-  def teardown
-    teardown_db
-  end
-  
   def test_order_as
     search = Account.new_search
     assert_equal nil, search.order

data/test/test_search_pagination.rb

@@ -1,17 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestSearchPagination < Test::Unit::TestCase
-  fixtures :accounts, :users, :orders
-  
-  def setup
-    setup_db
-    load_fixtures
-  end
-  
-  def teardown
-    teardown_db
-  end
-  
   def test_limit
     search = Account.new_search
     search.limit = 10

data/test/test_search_protection.rb

@@ -1,17 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestSearchProtection < Test::Unit::TestCase
-  fixtures :accounts, :users, :orders
-
-  def setup
-    setup_db
-    load_fixtures
-  end
-
-  def teardown
-    teardown_db
-  end
-
   def test_protection
     assert_raise(ArgumentError) { Account.build_search(:conditions => "(DELETE FROM users)", :page => 2, :per_page => 15) }
     Searchgasm::Search::Base::VULNERABLE_FIND_OPTIONS.each { |option| assert_raise(ArgumentError) { Account.build_search(option => "(DELETE FROM users)") } }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-23 00:00:00 -04:00
+date: 2008-09-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,6 +31,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
@@ -87,7 +90,7 @@ extra_rdoc_files:
 - lib/searchgasm/search/ordering.rb
 - lib/searchgasm/search/pagination.rb
 - lib/searchgasm/search/protection.rb
-- lib/searchgasm/shared/searching.rb
+- lib/searchgasm/search/searching.rb
 - lib/searchgasm/shared/utilities.rb
 - lib/searchgasm/shared/virtual_classes.rb
 - lib/searchgasm/version.rb
@@ -134,7 +137,7 @@ files:
 - lib/searchgasm/search/ordering.rb
 - lib/searchgasm/search/pagination.rb
 - lib/searchgasm/search/protection.rb
-- lib/searchgasm/shared/searching.rb
+- lib/searchgasm/search/searching.rb
 - lib/searchgasm/shared/utilities.rb
 - lib/searchgasm/shared/virtual_classes.rb
 - lib/searchgasm/version.rb
@@ -145,6 +148,7 @@ files:
 - README.rdoc
 - test/fixtures/accounts.yml
 - test/fixtures/orders.yml
+- test/fixtures/user_groups.yml
 - test/fixtures/users.yml
 - test/libs/acts_as_tree.rb
 - test/libs/rexml_fix.rb
@@ -161,7 +165,6 @@ files:
 - test/test_search_ordering.rb
 - test/test_search_pagination.rb
 - test/test_search_protection.rb
-- test/text_config.rb
 - searchgasm.gemspec
 has_rdoc: true
 homepage: http://github.com/binarylogic/searchgasm