searchgasm 1.3.5 → 1.4.0

data/lib/searchgasm/modifiers/upper.rb

@@ -0,0 +1,15 @@
+module Searchgasm
+  module Modifiers
+    class Upper < Base
+      class << self
+        def modifier_names
+          super + ["upcase", "ucase"]
+        end
+        
+        def return_type
+          :string
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/search/base.rb

@@ -22,7 +22,7 @@ module Searchgasm #:nodoc:
       OPTIONS = SPECIAL_FIND_OPTIONS + AR_OPTIONS # the order is very important, these options get set in this order
       
       attr_accessor *AR_OPTIONS
-      attr_reader :auto_joins
+      attr_writer :scope
       
       class << self
         # Used in the ActiveRecord methods to determine if Searchgasm should get involved or not.
@@ -56,8 +56,9 @@ module Searchgasm #:nodoc:
       # Specific implementation of cloning
       def clone
         options = {}
-        (OPTIONS - [:conditions]).each { |option| options[option] = send(option) }
+        (AR_OPTIONS - [:conditions]).each { |option| options[option] = instance_variable_get("@#{option}") }
         options[:conditions] = conditions.conditions
+        SPECIAL_FIND_OPTIONS.each { |option| options[option] = send(option) }
         obj = self.class.new(options)
         obj.protect = protected?
         obj.scope = scope
@@ -79,49 +80,27 @@ module Searchgasm #:nodoc:
         "#<#{klass}Search #{current_find_options.inspect}>"
       end
       
-      # The method is unique in the fact that if searchgasm is acting_as_filter? then auto joins are not included. Searchgasm should not change the default ActiveRecord behavior.
-      # If you are running a search via new_search or build_search then auto joins are included.
+      # Merges all joins together, including the scopes joins for
       def joins
-        joins_sql = ""
-        all_joins = auto_joins
-        
-        case @joins
-        when String
-          joins_sql += @joins
-        else
-          all_joins = merge_joins(@joins, all_joins)
-        end
-        
-        return if joins_sql.blank? && all_joins.blank?
-        return joins_sql if all_joins.blank?
-        
-        # convert scopes joins to sql, so we can determine which joins to skip
-        scope_joins_sql = nil
-        if scope && !scope[:joins].blank?
-          case scope[:joins]
-          when String
-            scope_joins_sql = scope[:joins]
-          else
-            join_dependency = ::ActiveRecord::Associations::ClassMethods::JoinDependency.new(klass, scope[:joins], nil)
-            scope_joins_sql = join_dependency.join_associations.collect { |assoc| assoc.association_join }.join
-          end
-        end
-
-        join_dependency = ::ActiveRecord::Associations::ClassMethods::JoinDependency.new(klass, all_joins, nil)
-        safe_joins = []
-        join_dependency.join_associations.each do |assoc|
-          join_sql = assoc.association_join
-          
-          #debugger if scope && scope[:joins].include?("LEFT OUTER JOIN \"users\"")
-          safe_joins << join_sql if scope_joins_sql.blank? || !scope_joins_sql.include?(join_sql.gsub(/(LEFT OUTER JOIN|INNER JOIN)/i, "").strip)
-        end
+        all_joins = (safe_to_array(conditions.auto_joins) + safe_to_array(order_by_auto_joins) + safe_to_array(priority_order_by_auto_joins) + safe_to_array(@joins)).uniq
+        # For partial backwards compatibility, delete if the scope contains conflicts, AR 2.2 does this for you
+        scope_joins = safe_to_array(scope && scope[:joins])
+        all_joins.delete_if { |j| scope_joins.include?(j) } unless scope_joins.blank?
+        all_joins.size <= 1 ? all_joins.first : all_joins
+      end
+=begin
+      def joins
+        auto_joins = joins_to_sql_array((safe_to_array(conditions.auto_joins) + safe_to_array(order_by_auto_joins) + safe_to_array(priority_order_by_auto_joins)).uniq)
+        scope_joins = joins_to_sql_array(scope && scope[:joins])
+        include_joins = joins_to_sql_array(include)
         
+        #raise auto_joins.inspect if conditions.respond_to?(:dogs) && conditions.dogs.id == 1
         
+        auto_joins.delete_if { |auto_join| scope_joins.include?(auto_join) || include_joins.include?(auto_join) }
         
-        joins_sql += " " unless joins_sql.blank?
-        joins_sql += safe_joins.join
+        #raise auto_joins.inspect if auto_joins.size > 1
       end
-      
+=end
       def limit=(value)
         @set_limit = true
         @limit = value.blank? || value == 0 ? nil : value.to_i
@@ -158,6 +137,31 @@ module Searchgasm #:nodoc:
       def scope
         @scope ||= {}
       end
+      
+      private
+        def joins_to_sql_array(joins)
+          unless array_of_strings?(safe_to_array(joins))
+            join_dependency = ::ActiveRecord::Associations::ClassMethods::JoinDependency.new(klass, joins, nil)
+            join_dependency.join_associations.collect { |assoc| assoc.association_join }
+          else
+            joins.is_a?(Array) ? joins : safe_to_array(joins)
+          end
+        end
+        
+        def safe_to_array(o)
+          case o
+          when NilClass
+            []
+          when Array
+            o
+          else
+            [o]
+          end
+        end
+        
+        def array_of_strings?(o)
+          o.is_a?(Array) && o.all?{|obj| obj.is_a?(String)}
+        end
     end
   end
 end

data/lib/searchgasm/search/conditions.rb

@@ -9,8 +9,6 @@ module Searchgasm
         klass.class_eval do
           alias_method_chain :initialize, :conditions
           alias_method_chain :conditions=, :conditions
-          alias_method_chain :conditions, :conditions
-          alias_method_chain :auto_joins, :conditions
           alias_method_chain :sanitize, :conditions
         end
       end
@@ -34,7 +32,6 @@ module Searchgasm
       # now you can create the rest of your search and your "scope" will get merged into your final SQL.
       # What this does is determine if the value a hash or a conditions object, if not it sets it up as a scope.
       def conditions_with_conditions=(values)
-        @memoized_auto_joins = nil
         case values
         when Searchgasm::Conditions::Base
           @conditions = values
@@ -43,19 +40,6 @@ module Searchgasm
         end
       end
       
-      def conditions_with_conditions
-        @memoized_auto_joins = nil # have to assume they are calling a condition on a relationship
-        conditions_without_conditions
-      end
-      
-      # Tells searchgasm what relationships to join during the search. This is based on what conditions you set.
-      #
-      # <b>Be careful!</b>
-      # ActiveRecord associations can be an SQL train wreck. Make sure you think about what you are searching and that you aren't joining a table with a million records.
-      def auto_joins_with_conditions
-        @memoized_auto_joins ||= merge_joins(auto_joins_without_conditions, conditions.auto_joins)
-      end
-      
       def sanitize_with_conditions(searching = true) # :nodoc:
         find_options = sanitize_without_conditions(searching)
         if conditions_obj = find_options.delete(:conditions)

data/lib/searchgasm/search/ordering.rb

@@ -18,22 +18,16 @@ module Searchgasm
     module Ordering
       def self.included(klass)
         klass.class_eval do
-          alias_method_chain :auto_joins, :ordering
           alias_method_chain :order=, :ordering
           alias_method_chain :sanitize, :ordering
           attr_reader :priority_order
         end
       end
       
-      def auto_joins_with_ordering # :nodoc:
-        @memoized_auto_joins ||= merge_joins(auto_joins_without_ordering, order_by_auto_joins, priority_order_by_auto_joins)
-      end
-      
       def order_with_ordering=(value) # :nodoc
         @order_by = nil
         @order_as = nil
         @order_by_auto_joins = nil
-        @memoized_auto_joins = nil
         self.order_without_ordering = value
       end
       
@@ -93,7 +87,6 @@ module Searchgasm
       #   order_by = [:id, {:user_group => :name}] # => users.id ASC, user_groups.name ASC
       def order_by=(value)  
         @order_by_auto_joins = nil
-        @memoized_auto_joins = nil
         @order_by = get_order_by_value(value)
         @order = order_by_to_order(@order_by, @order_as)
         @order_by
@@ -122,7 +115,6 @@ module Searchgasm
       # Same as order_by= but for your priority order. See priority_order= for more informaton on priority_order.
       def priority_order_by=(value)
         @priority_order_by_auto_joins = nil
-        @memoized_auto_joins = nil
         @priority_order_by = get_order_by_value(value)
         @priority_order = order_by_to_order(@priority_order_by, @priority_order_as)
         @priority_order_by

data/lib/searchgasm/search/searching.rb

@@ -9,12 +9,6 @@ module Searchgasm
       SEARCH_METHODS = [:all, :find, :first]
       CALCULATION_METHODS = [:average, :calculate, :count, :maximum, :minimum, :sum]
       
-      def self.included(klass)
-        klass.class_eval do
-          attr_accessor :scope
-        end
-      end
-      
       (SEARCH_METHODS + CALCULATION_METHODS).each do |method|
         class_eval <<-"end_eval", __FILE__, __LINE__
           def #{method}(*args)

data/lib/searchgasm/version.rb

@@ -66,8 +66,8 @@ module Searchgasm
     end
 
     MAJOR = 1
-    MINOR = 3
-    TINY  = 5
+    MINOR = 4
+    TINY  = 0
 
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/lib/searchgasm.rb

@@ -42,12 +42,12 @@ require "searchgasm/conditions/base"
 # Condition
 require "searchgasm/condition/base"
 require "searchgasm/condition/tree"
-SEARCHGASM_CONDITIONS = [:begins_with, :blank, :child_of, :descendant_of, :ends_with, :equals, :greater_than, :greater_than_or_equal_to, :inclusive_descendant_of, :like, :nil, :not_begin_with, :not_end_with, :not_equal, :not_have_keywords, :keywords, :less_than, :less_than_or_equal_to, :sibling_of]
+SEARCHGASM_CONDITIONS = [:begins_with, :blank, :child_of, :descendant_of, :ends_with, :equals, :greater_than, :greater_than_or_equal_to, :inclusive_descendant_of, :like, :nil, :not_begin_with, :not_blank, :not_end_with, :not_equal, :not_have_keywords, :not_nil, :keywords, :less_than, :less_than_or_equal_to, :sibling_of]
 SEARCHGASM_CONDITIONS.each { |condition| require "searchgasm/condition/#{condition}" }
 
 # Modifiers
 require "searchgasm/modifiers/base"
-SEARCHGASM_MODIFIERS = [:day_of_month, :day_of_week, :day_of_year, :hour, :microseconds, :milliseconds, :minute, :month, :second, :week, :year]
+SEARCHGASM_MODIFIERS = [:absolute, :acos, :asin, :atan, :ceil, :char_length, :cos, :cot, :day_of_month, :day_of_week, :day_of_year, :degrees, :exp, :floor, :hex, :hour, :log, :log10, :log2, :lower, :ltrim, :md5, :microseconds, :milliseconds, :minute, :month, :octal, :radians, :round, :rtrim, :second, :sign, :sin, :square_root, :tan, :trim, :upper, :week, :year]
 SEARCHGASM_MODIFIERS.each { |modifier| require "searchgasm/modifiers/#{modifier}" }
 
 # Helpers

data/searchgasm.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Searchgasm-1.3.5
+# Gem::Specification for Searchgasm-1.4.0
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.3.5
+  version: 1.4.0
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
 autorequire: 
 bindir: bin
 
-date: 2008-10-08 00:00:00 -04:00
+date: 2008-10-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,10 +74,12 @@ extra_rdoc_files:
 - lib/searchgasm/condition/like.rb
 - lib/searchgasm/condition/nil.rb
 - lib/searchgasm/condition/not_begin_with.rb
+- lib/searchgasm/condition/not_blank.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/not_nil.rb
 - lib/searchgasm/condition/sibling_of.rb
 - lib/searchgasm/condition/tree.rb
 - lib/searchgasm/conditions/base.rb
@@ -112,6 +114,8 @@ extra_rdoc_files:
 - lib/searchgasm/modifiers/log.rb
 - lib/searchgasm/modifiers/log10.rb
 - lib/searchgasm/modifiers/log2.rb
+- lib/searchgasm/modifiers/lower.rb
+- lib/searchgasm/modifiers/ltrim.rb
 - lib/searchgasm/modifiers/md5.rb
 - lib/searchgasm/modifiers/microseconds.rb
 - lib/searchgasm/modifiers/milliseconds.rb
@@ -120,11 +124,14 @@ extra_rdoc_files:
 - lib/searchgasm/modifiers/octal.rb
 - lib/searchgasm/modifiers/radians.rb
 - lib/searchgasm/modifiers/round.rb
+- lib/searchgasm/modifiers/rtrim.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/trim.rb
+- lib/searchgasm/modifiers/upper.rb
 - lib/searchgasm/modifiers/week.rb
 - lib/searchgasm/modifiers/year.rb
 - lib/searchgasm/search/base.rb
@@ -164,10 +171,12 @@ files:
 - lib/searchgasm/condition/like.rb
 - lib/searchgasm/condition/nil.rb
 - lib/searchgasm/condition/not_begin_with.rb
+- lib/searchgasm/condition/not_blank.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/not_nil.rb
 - lib/searchgasm/condition/sibling_of.rb
 - lib/searchgasm/condition/tree.rb
 - lib/searchgasm/conditions/base.rb
@@ -202,6 +211,8 @@ files:
 - lib/searchgasm/modifiers/log.rb
 - lib/searchgasm/modifiers/log10.rb
 - lib/searchgasm/modifiers/log2.rb
+- lib/searchgasm/modifiers/lower.rb
+- lib/searchgasm/modifiers/ltrim.rb
 - lib/searchgasm/modifiers/md5.rb
 - lib/searchgasm/modifiers/microseconds.rb
 - lib/searchgasm/modifiers/milliseconds.rb
@@ -210,11 +221,14 @@ files:
 - lib/searchgasm/modifiers/octal.rb
 - lib/searchgasm/modifiers/radians.rb
 - lib/searchgasm/modifiers/round.rb
+- lib/searchgasm/modifiers/rtrim.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/trim.rb
+- lib/searchgasm/modifiers/upper.rb
 - lib/searchgasm/modifiers/week.rb
 - lib/searchgasm/modifiers/year.rb
 - lib/searchgasm/search/base.rb
@@ -232,12 +246,11 @@ files:
 - Rakefile
 - README.rdoc
 - test/fixtures/accounts.yml
+- test/fixtures/cats.yml
+- test/fixtures/dogs.yml
 - test/fixtures/orders.yml
 - 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
 - test/test_condition_base.rb
@@ -251,6 +264,9 @@ files:
 - test/test_search_ordering.rb
 - test/test_search_pagination.rb
 - test/test_search_protection.rb
+- test_libs/acts_as_tree.rb
+- test_libs/ordered_hash.rb
+- test_libs/rexml_fix.rb
 - TODO.rdoc
 - searchgasm.gemspec
 has_rdoc: true

data/test/fixtures/cats.yml

@@ -0,0 +1,3 @@
+pepper:
+  id: 1
+  description: pepper meows

data/test/fixtures/dogs.yml

@@ -0,0 +1,3 @@
+harry:
+  id: 2
+  description: harry is hairy

data/test/test_active_record_base.rb

@@ -85,4 +85,8 @@ class TestActiveRecordBase < Test::Unit::TestCase
     assert_equal Set.new(["id_gt", "name_contains"]), Account.protected_conditions
     Account.send(:write_inheritable_attribute, :conditions_protected, nil)
   end
+  
+  def test_includes
+    assert_nothing_raised { Account.all(:conditions => {:users => {:first_name_like => "Ben"}}, :include => :users) }
+  end
 end

data/test/test_condition_base.rb

@@ -22,21 +22,21 @@ class TestConditionBase < Test::Unit::TestCase
   end
   
   def test_initialize
-    condition = Searchgasm::Condition::Keywords.new(Account, Account.columns_hash["name"])
+    condition = Searchgasm::Condition::Keywords.new(Account, :column => Account.columns_hash["name"])
     assert_equal condition.klass, Account
     assert_equal Account.columns_hash["name"], condition.column
     
-    condition = Searchgasm::Condition::GreaterThan.new(Account, "id")
+    condition = Searchgasm::Condition::GreaterThan.new(Account, :column => "id")
     assert_equal Account.columns_hash["id"], condition.column
     
-    condition = Searchgasm::Condition::GreaterThan.new(Account, "id", :string, "some sql")
+    condition = Searchgasm::Condition::GreaterThan.new(Account, :column => "id", :column_type => :string, :column_sql_format => "some sql")
     assert_equal Account.columns_hash["id"], condition.column
     condition.value = "awesome"
     assert_equal ["some sql > ?", "awesome"], condition.sanitize
   end
   
   def test_explicitly_set_value
-    condition = Searchgasm::Condition::Keywords.new(Account, Account.columns_hash["name"])
+    condition = Searchgasm::Condition::Keywords.new(Account, :column => Account.columns_hash["name"])
     assert !condition.explicitly_set_value?
     condition.value = "test"
     assert condition.explicitly_set_value?

data/test/test_condition_types.rb

@@ -2,31 +2,31 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestConditionTypes < Test::Unit::TestCase
   def test_sanitize
-    condition = Searchgasm::Condition::BeginsWith.new(Account, Account.columns_hash["name"])
+    condition = Searchgasm::Condition::BeginsWith.new(Account, :column => Account.columns_hash["name"])
     condition.value = "Binary"
     assert_equal ["\"accounts\".\"name\" LIKE ?", "Binary%"], condition.sanitize
     
-    condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Blank.new(Account, :column => Account.columns_hash["id"])
     condition.value = "true"
     assert_equal "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = '' or \"accounts\".\"id\" = false", condition.sanitize
     
-    condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Blank.new(Account, :column => Account.columns_hash["id"])
     condition.value = "false"
     assert_equal "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != '' and \"accounts\".\"id\" != false", condition.sanitize
     
-    condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Blank.new(Account, :column => Account.columns_hash["id"])
     condition.value = true
     assert_equal "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = '' or \"accounts\".\"id\" = false", condition.sanitize
     
-    condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Blank.new(Account, :column => Account.columns_hash["id"])
     condition.value = false
     assert_equal "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != '' and \"accounts\".\"id\" != false", condition.sanitize
     
-    condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Blank.new(Account, :column => Account.columns_hash["id"])
     condition.value = nil
     assert_equal nil, condition.sanitize
     
-    condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Blank.new(Account, :column => Account.columns_hash["id"])
     condition.value = ""
     assert_equal nil, condition.sanitize
     
@@ -42,27 +42,27 @@ class TestConditionTypes < Test::Unit::TestCase
     condition.value = User.find(1)
     assert_equal ["\"users\".\"id\" = ? OR \"users\".\"id\" = ?", 2, 3], condition.sanitize
     
-    condition = Searchgasm::Condition::EndsWith.new(Account, Account.columns_hash["name"])
+    condition = Searchgasm::Condition::EndsWith.new(Account, :column => Account.columns_hash["name"])
     condition.value = "Binary"
     assert_equal ["\"accounts\".\"name\" LIKE ?", "%Binary"], condition.sanitize
     
-    condition = Searchgasm::Condition::Equals.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Equals.new(Account, :column => Account.columns_hash["id"])
     condition.value = 12
     assert_equal ["\"accounts\".\"id\" = ?", 12], condition.sanitize
     
-    condition = Searchgasm::Condition::Equals.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Equals.new(Account, :column => Account.columns_hash["id"])
     condition.value = [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 = Searchgasm::Condition::Equals.new(Account, :column => Account.columns_hash["id"])
     condition.value = (1..10)
     assert_equal ["\"accounts\".\"id\" BETWEEN ? AND ?", 1, 10], condition.sanitize
     
-    condition = Searchgasm::Condition::GreaterThan.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::GreaterThan.new(Account, :column => Account.columns_hash["id"])
     condition.value = 2
     assert_equal ["\"accounts\".\"id\" > ?", 2], condition.sanitize
     
-    condition = Searchgasm::Condition::GreaterThanOrEqualTo.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::GreaterThanOrEqualTo.new(Account, :column => Account.columns_hash["id"])
     condition.value = 2
     assert_equal ["\"accounts\".\"id\" >= ?", 2], condition.sanitize
     
@@ -70,59 +70,59 @@ class TestConditionTypes < Test::Unit::TestCase
     condition.value = User.find(1)
     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 = Searchgasm::Condition::Like.new(Account, :column => 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 = Searchgasm::Condition::Nil.new(Account, :column => Account.columns_hash["id"])
     condition.value = true
     assert_equal "\"accounts\".\"id\" is NULL", condition.sanitize
     
-    condition = Searchgasm::Condition::Nil.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Nil.new(Account, :column => Account.columns_hash["id"])
     condition.value = false
     assert_equal "\"accounts\".\"id\" is NOT NULL", condition.sanitize
     
-    condition = Searchgasm::Condition::Nil.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Nil.new(Account, :column => Account.columns_hash["id"])
     condition.value = "true"
     assert_equal "\"accounts\".\"id\" is NULL", condition.sanitize
     
-    condition = Searchgasm::Condition::Nil.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Nil.new(Account, :column => Account.columns_hash["id"])
     condition.value = "false"
     assert_equal "\"accounts\".\"id\" is NOT NULL", condition.sanitize
     
-    condition = Searchgasm::Condition::Nil.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Nil.new(Account, :column => Account.columns_hash["id"])
     condition.value = nil
     assert_equal nil, condition.sanitize
     
-    condition = Searchgasm::Condition::Nil.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Nil.new(Account, :column => Account.columns_hash["id"])
     condition.value = ""
     assert_equal nil, condition.sanitize
     
-    condition = Searchgasm::Condition::NotEqual.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::NotEqual.new(Account, :column => 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 = Searchgasm::Condition::NotEqual.new(Account, :column => 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 = Searchgasm::Condition::NotEqual.new(Account, :column => Account.columns_hash["id"])
     condition.value = (1..10)
     assert_equal ["\"accounts\".\"id\" NOT BETWEEN ? AND ?", 1, 10], condition.sanitize
     
-    condition = Searchgasm::Condition::Keywords.new(Account, Account.columns_hash["name"])
+    condition = Searchgasm::Condition::Keywords.new(Account, :column => Account.columns_hash["name"])
     condition.value = "freedom yeah, 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 = Searchgasm::Condition::Keywords.new(Account, :column => Account.columns_hash["name"])
     condition.value = "%^$*(^$)"
     assert_equal nil, condition.sanitize
     
-    condition = Searchgasm::Condition::LessThan.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::LessThan.new(Account, :column => Account.columns_hash["id"])
     condition.value = 2
     assert_equal ["\"accounts\".\"id\" < ?", 2], condition.sanitize
     
-    condition = Searchgasm::Condition::LessThanOrEqualTo.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::LessThanOrEqualTo.new(Account, :column => Account.columns_hash["id"])
     condition.value = 2
     assert_equal ["\"accounts\".\"id\" <= ?", 2], condition.sanitize
     

data/test/test_conditions_base.rb

@@ -10,7 +10,7 @@ class TestConditionsBase < Test::Unit::TestCase
   end
   
   def test_association_names
-    assert_equal ["children", "orders", "account", "parent", "user_groups"], Searchgasm::Cache::UserConditions.association_names
+    assert_equal ["dogs", "children", "user_groups", "orders", "account", "parent", "cats"], Searchgasm::Cache::UserConditions.association_names
     assert_equal ["admin", "orders", "users"], Searchgasm::Cache::AccountConditions.association_names
   end
   
@@ -218,4 +218,25 @@ class TestConditionsBase < Test::Unit::TestCase
     conditions = Searchgasm::Cache::AccountConditions.new
     assert_equal nil, conditions.id
   end
+  
+  def test_sti
+    #s = User.new_search
+    #s.conditions.dogs.description_like = "awesome"
+    #s.conditions.cats.description_like = "awesome"
+    #s.select = "ass"
+    #s.all
+    
+    joins = []
+    join_dependency = ::ActiveRecord::Associations::ClassMethods::JoinDependency.new(User, [:dogs, :cats], nil)
+    join_dependency.join_associations.each_with_index do |assoc, index|
+      #raise assoc.aliased_table_name.inspect if index == 1
+      joins << assoc.association_join
+    end
+    #raise joins.inspect
+    
+    conditions = Searchgasm::Cache::UserConditions.new
+    conditions.dogs.description_like = "Harry"
+    r = User.reflect_on_association(:dogs)
+    #raise r.inspect
+  end
 end

data/test/test_helper.rb

@@ -1,10 +1,10 @@
 require "test/unit"
 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 "active_record"
+require File.dirname(__FILE__) + '/../test_libs/acts_as_tree'
+require File.dirname(__FILE__) + '/../test_libs/ordered_hash'
+require File.dirname(__FILE__) + '/../test_libs/rexml_fix'
 require File.dirname(__FILE__) + '/../lib/searchgasm'
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
@@ -25,6 +25,8 @@ class User < ActiveRecord::Base
   acts_as_tree
   belongs_to :account
   has_many :orders, :dependent => :destroy
+  has_many :cats, :dependent => :destroy
+  has_many :dogs, :dependent => :destroy
   has_and_belongs_to_many :user_groups
 end
 
@@ -32,6 +34,16 @@ class Order < ActiveRecord::Base
   belongs_to :user
 end
 
+# STI
+class Animal < ActiveRecord::Base
+end
+
+class Dog < Animal
+end
+
+class Cat < Animal
+end
+
 class Test::Unit::TestCase
   def setup_db
     ActiveRecord::Schema.define(:version => 1) do
@@ -72,11 +84,18 @@ class Test::Unit::TestCase
         t.text      :description
         t.binary    :receipt
       end
+      
+      create_table :animals do |t|
+        t.datetime  :created_at      
+        t.datetime  :updated_at
+        t.string   :type
+        t.text     :description
+      end
     end
   end
   
   def load_fixtures
-    fixtures = [:accounts, :orders, :users, :user_groups]
+    fixtures = [:accounts, :orders, :users, :user_groups, :dogs, :cats]
     fixtures.each do |fixture|
       records = YAML.load(File.read(File.dirname(__FILE__) + "/fixtures/#{fixture.to_s}.yml"))
       records.each do |name, attributes|