searchgasm 1.1.3 → 1.2.0

data/CHANGELOG.rdoc

@@ -1,4 +1,13 @@
-== 1.1.3 released 2008-09-22
+== 1.2.0 released 2008-09-24
+
+* Added searchgasm_params and searchgasm_url helper to use outside of the control type helpers.
+* Added dup and clone methods that work properly for searchgasm objects
+* Fixed bug to remove nil scope values, HABTM likes to add :limit => nil
+* Removed unnecessary build_search methods for associations
+* Removed support for searching with conditions only. This just made things much more complicated when you can accomplish the same thing by starting a new search and only setting conditions.
+* Fixed bug when searching with *any* conditions to use left outer joins instead of inner joins.
+
+== 1.1.3 released 2008-09-23
 
 * Setting a condition to nil removes it if the condition is set to ignore blanks
 * Setting search.conditions = "some sql" will reset ALL conditions. Alternatively search.conditions => {:first_name_contains => "Ben"} will overwrite "some sql". The same goes with search.conditions.first_name_contains = "Ben".

data/Manifest

@@ -38,7 +38,7 @@ lib/searchgasm/search/conditions.rb
 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
@@ -49,6 +49,7 @@ Rakefile
 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
@@ -65,4 +66,3 @@ test/test_search_conditions.rb
 test/test_search_ordering.rb
 test/test_search_pagination.rb
 test/test_search_protection.rb
-test/text_config.rb

data/README.rdoc

@@ -177,19 +177,6 @@ Any of the options used in the above example can be used in these, but for the s
   search.conditions.first_name_contains = "Ben"
   search.per_page = 20
   search.all
-
-== Search with conditions only
-
-Don't need pagination, ordering, or any of the other options? Search with conditions only.
-
-  conditions = User.new_conditions(:age_gt => 18)
-  conditions.first_name_contains = "Ben"
-  conditions.all
-  # ... all operations above are available
-
-Pass a conditions object right into ActiveRecord:
-
-  User.all(:conditions => conditions)
   
 == Match ANY or ALL of the conditions
 
@@ -250,12 +237,11 @@ or
 
 == Always use protection...against SQL injections
 
-If there is one thing we all know, it's to always use protection against SQL injections. That's why searchgasm protects you by default. The new\_search and new\_conditions methods protect mass assignments by default (instantiation and search.options = {}). This means that various checks are done to ensure it is not possible to perform any type of SQL injection during mass assignments. But this also limits how you can search, meaning you can't write raw SQL. If you want to be daring and search without protection, all that you have to do is add ! to the end of the methods: new\_search! and new\_conditions!.
+If there is one thing we all know, it's to always use protection against SQL injections. That's why searchgasm protects you by default. The new\_search methods protect mass assignments by default (instantiation and search.options = {}). This means that various checks are done to ensure it is not possible to perform any type of SQL injection during mass assignments. But this also limits how you can search, meaning you can't write raw SQL. If you want to be daring and search without protection, all that you have to do is add ! to the end of the method: new\_search!.
 
 === Protected from SQL injections
 
   search = Account.new_search(params[:search])
-  conditions = Account.new_conditions(params[:conditions])
 
 === *NOT* protected from SQL injections
 
@@ -263,11 +249,10 @@ If there is one thing we all know, it's to always use protection against SQL inj
   accounts = Account.all(params[:search])
   account = Account.first(params[:search])
   search = Account.new_search!(params[:search])
-  conditions = Account.new_conditions!(params[:conditions])
 
 I'm sure you already knew this, but it's tempting to do this when you can pass the params hash right into these methods.
 
-Lesson learned: use new\_search and new\_conditions when passing in params as *ANY* of the options.
+Lesson learned: use new\_search when passing in params as *ANY* of the options.
 
 == Available Conditions
 

data/Rakefile

@@ -10,7 +10,7 @@ Echoe.new 'searchgasm' do |p|
   p.project = 'searchgasm'
   p.summary = "Object based ActiveRecord searching, ordering, pagination, and more!"
   p.url = "http://github.com/binarylogic/searchgasm"
-  p.dependencies = %w(activerecord activesupport)
+  p.dependencies = ['activerecord', 'activesupport >= 2.1.0']
   p.include_rakefile = true
 end
 

data/lib/searchgasm/active_record/associations.rb

@@ -11,26 +11,6 @@ module Searchgasm
           args << filter_options_with_searchgasm(options)
           find_without_searchgasm(*args)
         end
-      
-        # See build_conditions under Searchgasm::ActiveRecord::Base. This is the same thing but for associations.
-        def build_conditions(options = {}, &block)
-          @reflection.klass.send(:with_scope, :find => construct_scope[:find]) { @reflection.klass.build_conditions(options, &block) }
-        end
-      
-        # See build_conditions! under Searchgasm::ActiveRecord::Base. This is the same thing but for associations.
-        def build_conditions!(options = {}, &block)
-          @reflection.klass.send(:with_scope, :find => construct_scope[:find]) { @reflection.klass.build_conditions!(options, &block) }
-        end
-      
-        # See build_search under Searchgasm::ActiveRecord::Base. This is the same thing but for associations.
-        def build_search(options = {}, &block)
-          @reflection.klass.send(:with_scope, :find => construct_scope[:find]) { @reflection.klass.build_search(options, &block) }
-        end
-      
-        # See build_conditions! under Searchgasm::ActiveRecord::Base. This is the same thing but for associations.
-        def build_search!(options = {}, &block)
-          @reflection.klass.send(:with_scope, :find => construct_scope[:find]) { @reflection.klass.build_search!(options, &block) }
-        end
       end
       
       module Shared

data/lib/searchgasm/active_record/base.rb

@@ -11,6 +11,7 @@ module Searchgasm
       def calculate_with_searchgasm(*args)
         options = args.extract_options!
         options = filter_options_with_searchgasm(options, false)
+        args[1] = primary_key if options[:distinct] && [nil, :all].include?(args[1]) # quick fix for adding a column name if distinct is true and no specific column is provided
         args << options
         calculate_without_searchgasm(*args)
       end
@@ -47,30 +48,6 @@ module Searchgasm
         with_scope_without_searchgasm(method_scoping, action, &block)
       end
       
-      # This is a special method that Searchgasm adds in. It returns a new conditions object on the model. So you can search by conditions *only*.
-      #
-      # <b>This method is "protected". Meaning it checks the passed options for SQL injections. So trying to write raw SQL in *any* of the option will result in a raised exception. It's safe to pass a params object when instantiating.</b>
-      #
-      # === Examples
-      #
-      #   conditions = User.new_conditions
-      #   conditions.first_name_contains = "Ben"
-      #   conditions.all # can call any search method: first, find(:all), find(:first), sum("id"), etc...
-      def build_conditions(values = {}, &block)
-        conditions = searchgasm_conditions
-        conditions.protect = true
-        conditions.conditions = values
-        yield conditions if block_given?
-        conditions
-      end
-      
-      # See build_conditions. This is the same method but *without* protection. Do *NOT* pass in a params object to this method.
-      def build_conditions!(values = {}, &block)
-        conditions = searchgasm_conditions(values)
-        yield conditions if block_given?
-        conditions
-      end
-      
       # This is a special method that Searchgasm adds in. It returns a new search object on the model. So you can search via an object.
       #
       # <b>This method is "protected". Meaning it checks the passed options for SQL injections. So trying to write raw SQL in *any* of the option will result in a raised exception. It's safe to pass a params object when instantiating.</b>
@@ -86,7 +63,7 @@ module Searchgasm
       #   search.order_by = {:user_group => :name}
       #   search.all # can call any search method: first, find(:all), find(:first), sum("id"), etc...
       def build_search(options = {}, &block)
-        search = searchgasm_searcher
+        search = searchgasm_search
         search.protect = true
         search.options = options
         yield search if block_given?
@@ -97,7 +74,7 @@ module Searchgasm
       #
       # This also has an alias "new_search!"
       def build_search!(options = {}, &block)
-        search = searchgasm_searcher(options)
+        search = searchgasm_search(options)
         yield search if block_given?
         search
       end
@@ -120,7 +97,7 @@ module Searchgasm
       
       # This is the reverse of conditions_protected. You can specify conditions here and *only* these conditions will be allowed in mass assignment. Any condition not specified here will be blocked.
       def conditions_accessible(*conditions)
-        write_inheritable_attribute(:conditions_accessible, Set.new(conditions.map(&:to_s)) + (protected_conditions || []))
+        write_inheritable_attribute(:conditions_accessible, Set.new(conditions.map(&:to_s)) + (accessible_conditions || []))
       end
 
       def accessible_conditions # :nodoc:
@@ -130,7 +107,7 @@ module Searchgasm
       private
         def filter_options_with_searchgasm(options = {}, searching = true)
           return options unless Searchgasm::Search::Base.needed?(self, options)
-          search = Searchgasm::Search::Base.create_virtual_class(self).new # call explicitly to avoid merging the scopes into the searcher
+          search = Searchgasm::Search::Base.create_virtual_class(self).new # call explicitly to avoid merging the scopes into the search
           search.acting_as_filter = true
           conditions = options.delete(:conditions) || options.delete("conditions") || {}
           if conditions
@@ -145,15 +122,7 @@ module Searchgasm
           search.sanitize(searching)
         end
       
-        def searchgasm_conditions(options = {})
-          searcher = Searchgasm::Conditions::Base.create_virtual_class(self).new
-          conditions = scope(:find) && scope(:find)[:conditions]
-          searcher.scope = {:conditions => conditions} if conditions
-          searcher.conditions = options
-          searcher
-        end
-      
-        def searchgasm_searcher(options = {})
+        def searchgasm_search(options = {})
           scope = {}
           current_scope = scope(:find) && scope(:find).deep_dup
           if current_scope
@@ -162,12 +131,17 @@ module Searchgasm
               next if value.blank?
               scope[option] = value
             end
+            
+            # Delete nil values in the scope, for some reason habtm relationships like to pass :limit => nil
+            new_scope = {}
+            current_scope.each { |k, v| new_scope[k] = v unless v.nil? }
+            current_scope = new_scope
           end
-          searcher = Searchgasm::Search::Base.create_virtual_class(self).new
-          searcher.scope = scope
-          searcher.options = current_scope
-          searcher.options = options
-          searcher
+          search = Searchgasm::Search::Base.create_virtual_class(self).new
+          search.scope = scope
+          search.options = current_scope
+          search.options = options
+          search
         end
     end
   end
@@ -181,8 +155,6 @@ module ActiveRecord #:nodoc: all
       alias_method_chain :calculate, :searchgasm
       alias_method_chain :find, :searchgasm
       alias_method_chain :with_scope, :searchgasm
-      alias_method :new_conditions, :build_conditions
-      alias_method :new_conditions!, :build_conditions!
       alias_method :new_search, :build_search
       alias_method :new_search!, :build_search!
       

data/lib/searchgasm/conditions/base.rb

@@ -6,7 +6,6 @@ module Searchgasm
     # Each condition has its own file and class and the source for each condition is pretty self explanatory.
     class Base
       include Shared::Utilities
-      include Shared::Searching
       include Shared::VirtualClasses
       
       attr_accessor :any, :relationship_name
@@ -65,6 +64,8 @@ module Searchgasm
         end
         
         def needed?(model_class, conditions) # :nodoc:
+          return false if conditions.blank?
+          
           if conditions.is_a?(Hash)
             return true if conditions[:any]
             column_names = model_class.column_names
@@ -105,11 +106,11 @@ module Searchgasm
       end
       
       # A list of joins to use when searching, includes relationships
-      def joins
+      def auto_joins
         j = []
         associations.each do |association|
           next if association.conditions.blank?
-          association_joins = association.joins
+          association_joins = association.auto_joins
           j << (association_joins.blank? ? association.relationship_name.to_sym : {association.relationship_name.to_sym => association_joins})
         end
         j.blank? ? nil : (j.size == 1 ? j.first : j)
@@ -262,7 +263,7 @@ module Searchgasm
         end
         
         def reset_objects!
-          objects.each { |object| eval("@#{object.name} = nil") }
+          objects.each { |object| object.class < ::Searchgasm::Conditions::Base ? eval("@#{object.relationship_name} = nil") : eval("@#{object.name} = nil") }
           objects.clear
         end
         

data/lib/searchgasm/core_ext/hash.rb

@@ -16,6 +16,19 @@ module Searchgasm
         new_hash
       end
       
+      def deep_delete_duplicates(hash)
+        hash.each do |k, v|
+          if v.is_a?(Hash) && self[k]
+            self[k].deep_delete_duplicates(v)
+            self.delete(k) if self[k].blank?
+          else
+            self.delete(k)
+          end
+        end
+        
+        self
+      end
+      
       # assert_valid_keys was killing performance. Array.flatten was the culprit, so I rewrote this method, got a 35% performance increase
       def fast_assert_valid_keys(valid_keys)
         unknown_keys = keys - valid_keys

data/lib/searchgasm/helpers/control_types/link.rb

@@ -186,35 +186,33 @@ module Searchgasm
         
         private
           def add_order_by_link_defaults!(order_by, options = {})
-            add_searchgasm_helper_defaults!(:order_by, options)
+            add_searchgasm_control_defaults!(:order_by, options)
             options[:text] ||= determine_order_by_text(order_by)
             options[:asc_indicator] ||= Config.asc_indicator
             options[:desc_indicator] ||= Config.desc_indicator
             options[:text] += options[:search_obj].desc? ? options[:desc_indicator] : options[:asc_indicator] if options[:search_obj].order_by == order_by
-            url_hash = searchgasm_url_hash(:order_by, order_by, options)
-            url_hash[:order_as] = (options[:search_obj].order_by == order_by && options[:search_obj].asc?) ? "DESC" : "ASC"
-            options[:url] = searchgasm_url(url_hash, options)
+            options[:url] = searchgasm_params(options.merge(:search_params => {:order_by => order_by}))
             options
           end
           
           def add_order_as_link_defaults!(order_as, options = {})
-            add_searchgasm_helper_defaults!(:order_as, options)
+            add_searchgasm_control_defaults!(:order_as, options)
             options[:text] ||= order_as.to_s
-            options[:url] = searchgasm_url(searchgasm_url_hash(:order_as, order_as, options), options)
+            options[:url] = searchgasm_params(options.merge(:search_params => {:order_as => order_as}))
             options
           end
           
           def add_per_page_link_defaults!(per_page, options = {})
-            add_searchgasm_helper_defaults!(:per_page, options)
+            add_searchgasm_control_defaults!(:per_page, options)
             options[:text] ||= per_page.blank? ? "Show all" : "#{per_page} per page"
-            options[:url] = searchgasm_url(searchgasm_url_hash(:per_page, per_page, options), options)
+            options[:url] = searchgasm_params(options.merge(:search_params => {:per_page => per_page}))
             options
           end
           
           def add_page_link_defaults!(page, options = {})
-            add_searchgasm_helper_defaults!(:page, options)
+            add_searchgasm_control_defaults!(:page, options)
             options[:text] ||= page.to_s
-            options[:url] = searchgasm_url(searchgasm_url_hash(:page, page, options), options)
+            options[:url] = searchgasm_params(options.merge(:search_params => {:page => page}))
             options
           end
           

data/lib/searchgasm/helpers/control_types/links.rb

@@ -148,19 +148,19 @@ module Searchgasm
         
         private
           def add_order_by_links_defaults!(options)
-            add_searchgasm_helper_defaults!(:order_by, options)
+            add_searchgasm_control_defaults!(:order_by, options)
             options[:choices] ||= options[:search_obj].klass.column_names.map(&:humanize)
             options
           end
           
           def add_order_as_links_defaults!(options)
-            add_searchgasm_helper_defaults!(:order_as, options)
+            add_searchgasm_control_defaults!(:order_as, options)
             options[:choices] = [:asc, :desc]
             options
           end
           
           def add_per_page_links_defaults!(options)
-            add_searchgasm_helper_defaults!(:per_page, options)
+            add_searchgasm_control_defaults!(:per_page, options)
             options[:choices] ||= Config.per_page_choices.dup
             if !options[:search_obj].per_page.blank? && !options[:choices].include?(options[:search_obj].per_page)
               options[:choices] << options[:search_obj].per_page
@@ -173,7 +173,7 @@ module Searchgasm
           end
           
           def add_page_links_defaults!(options)
-            add_searchgasm_helper_defaults!(:page, options)
+            add_searchgasm_control_defaults!(:page, options)
             options[:first_page] ||= 1
             options[:last_page] ||= options[:search_obj].page_count
             options[:current_page] ||= options[:search_obj].page

data/lib/searchgasm/helpers/control_types/select.rb

@@ -13,7 +13,7 @@ module Searchgasm
         
         # Please see order_as_links. All options are the same and applicable here. The only difference is that instead of a group of links, this gets returned as a select form element that will perform the same function when the value is changed.
         def order_as_select(options = {})
-          add_order_by_select_defaults!(options)
+          add_order_as_select_defaults!(options)
           searchgasm_state_for(:order_as, options) + select(options[:params_scope], :order_as, options[:choices], options[:tag], options[:html])
         end
         
@@ -59,19 +59,14 @@ module Searchgasm
             options[:tag] ||= {}
             options[:tag][:object] = options[:search_obj]
             
-            url = searchgasm_url_hash(option, nil, options)
-            url.delete(option)
-            url = searchgasm_url(url, options)
-            url = url_for(url)
-            url_option = CGI.escape((options[:params_scope].blank? ? "#{option}" : "#{options[:params_scope]}[#{option}]")) + "='+this.value"
-            url += (url.last == "?" ? "" : (url.include?("?") ? "&" : "?")) + url_option
+            url = searchgasm_url(options.merge(:literal_search_params => {option => "'+this.value+'"}))
             
             options[:html][:onchange] ||= ""
             options[:html][:onchange] += ";"
             if !options[:remote]
-              options[:html][:onchange] += "window.location='#{url};"
+              options[:html][:onchange] += "window.location='#{url}';"
             else
-              options[:html][:onchange] += remote_function(:url => url, :method => :get).gsub(/\\'\+this.value'/, "'+this.value")
+              options[:html][:onchange] += remote_function(:url => url, :method => :get).gsub(/\\'\+this.value\+\\'/, "'+this.value+'")
             end
             options[:html][:id] ||= ""
             options

data/lib/searchgasm/helpers/utilities.rb

@@ -1,41 +1,63 @@
 module Searchgasm
   module Helpers #:nodoc:
     module Utilities # :nodoc:
+      # Builds a hash of params for creating a url.
+      def searchgasm_params(options = {})
+        add_searchgasm_defaults!(options)
+        options[:search_params] ||= {}
+        options[:literal_search_params] ||= {}
+        options[:params] ||= {}
+        params_copy = params.deep_dup.with_indifferent_access
+        search_params = options[:params_scope].blank? ? params_copy : params_copy.delete(options[:params_scope])
+        search_params ||= {}
+        search_params = search_params.with_indifferent_access
+        search_params.delete(:commit)
+        search_params.delete(:page)
+        search_params.deep_delete_duplicates(options[:literal_search_params])
+        
+        if options[:search_params]
+          search_params.deep_merge!(options[:search_params])
+          
+          if options[:search_params][:order_by] && !options[:search_params][:order_as]
+            search_params[:order_as] = (options[:search_obj].order_by == options[:search_params][:order_by] && options[:search_obj].asc?) ? "DESC" : "ASC"
+          end
+        end
+        
+        new_params = params_copy
+        new_params.deep_merge!(options[:params])
+        
+        if options[:params_scope].blank? || search_params.blank?
+          new_params
+        else
+          new_params.merge(options[:params_scope] => search_params)
+        end
+      end
+      
+      def searchgasm_url(options = {})
+        search_params = searchgasm_params(options)
+        url = url_for(search_params)
+        literal_param_strings = literal_param_strings(options[:literal_search_params], options[:params_scope].blank? ? "" : "#{options[:params_scope]}")
+        url += (url.last == "?" ? "" : (url.include?("?") ? "&" : "?")) + literal_param_strings.join("&")
+      end
+      
       private
         # Adds default options for all helper methods.
-        def add_searchgasm_helper_defaults!(option, options)
+        def add_searchgasm_defaults!(options)
           options[:params_scope] = :search unless options.has_key?(:params_scope)
           options[:search_obj] ||= instance_variable_get("@#{options[:params_scope]}")
           raise(ArgumentError, "@search object could not be inferred, please specify: :search_obj => @search or :params_scope => :search_obj_name") unless options[:search_obj].is_a?(Searchgasm::Search::Base)
+          options
+        end
+        
+        # Adds default options for all control type helper methods.
+        def add_searchgasm_control_defaults!(option, options)
+          add_searchgasm_defaults!(options)
           options[:html] ||= {}
           options[:html][:class] ||= ""
           searchgasm_add_class!(options[:html], option)
           options
         end
         
-        def searchgasm_url(url_hash, options)
-          url = options[:params_scope].blank? ? url_hash : {options[:params_scope] => url_hash}
-          !options[:url_params].is_a?(Hash) ? url : url.merge(options[:url_params])
-        end
-        
-        def searchgasm_url_hash(option, value, options)
-          params_copy = params.deep_dup.with_indifferent_access
-          params_copy.delete(:commit)
-                    
-          # Extract search params from params
-          search_params = options[:params_scope].blank? ? params_copy : params_copy[options[:params_scope]]
-          search_params ||= {}
-          search_params = search_params.with_indifferent_access
-                    
-          # Never want to keep page
-          search_params.delete(:page)
-          
-          # Use special order_by value
-          search_params[option] = option == :order_by ? searchgasm_order_by_value(value) : value
-          
-          search_params
-        end
-        
         def searchgasm_add_class!(html_options, new_class)
           new_class = new_class.to_s
           classes = html_options[:class].split(" ")
@@ -63,20 +85,22 @@ module Searchgasm
           html
         end
         
-        # Need to deep dup a hash otherwise the "child" hashes get modified as its passed around
-        def searchgasm_deep_dup(hash)
-          new_hash = {}
+        def literal_param_strings(literal_params, prefix)
+          param_strings = []
           
-          hash.each do |k, v|
+          literal_params.each do |k, v|
+            param_string = prefix.blank? ? k.to_s : "#{prefix}[#{k}]"
             case v
             when Hash
-              hash[k] = searchgasm_deep_dup(v)
+              literal_param_strings(v, param_string).each do |literal_param_string|
+                param_strings << literal_param_string
+              end
             else
-              hew_hash[k] = v
+              param_strings << (CGI.escape(param_string) + "=#{v}")
             end
           end
           
-          new_hash
+          param_strings
         end
     end
   end

data/lib/searchgasm/search/base.rb

@@ -3,10 +3,8 @@ module Searchgasm #:nodoc:
     # = Searchgasm
     #
     # Please refer the README.rdoc for usage, examples, and installation.
-    
     class Base
       include Searchgasm::Shared::Utilities
-      include Searchgasm::Shared::Searching
       include Searchgasm::Shared::VirtualClasses
       
       # Options ActiveRecord allows when searching
@@ -24,11 +22,14 @@ 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
       
       class << self
         # Used in the ActiveRecord methods to determine if Searchgasm should get involved or not.
         # This keeps Searchgasm out of the way unless it is needed.
         def needed?(model_class, options)
+          return false if options.blank?
+          
           SPECIAL_FIND_OPTIONS.each do |option|
             return true if options.symbolize_keys.keys.include?(option)
           end
@@ -52,6 +53,18 @@ module Searchgasm #:nodoc:
         @acting_as_filter == true
       end
       
+      # Specific implementation of cloning
+      def clone
+        options = {}
+        (OPTIONS - [:conditions]).each { |option| options[option] = send(option) }
+        options[:conditions] = conditions.conditions
+        obj = self.class.new(options)
+        obj.protect = protected?
+        obj.scope = scope
+        obj
+      end
+      alias_method :dup, :clone
+      
       # Makes using searchgasm in the console less annoying and keeps the output meaningful and useful
       def inspect
         current_find_options = {}
@@ -66,13 +79,8 @@ module Searchgasm #:nodoc:
         "#<#{klass}Search #{current_find_options.inspect}>"
       end
       
-      def joins=(value)
-        @memoized_joins = nil
-        @joins = value
-      end
-      
       def joins
-        @memoized_joins ||= @joins
+        merge_joins(@joins, auto_joins)
       end
       
       def limit=(value)
@@ -116,9 +124,7 @@ module Searchgasm #:nodoc:
           if searching
             find_options[:group] ||= "#{quote_table_name(klass.table_name)}.#{quote_column_name(klass.primary_key)}"
           else
-            # If we are calculating use includes because they use joins that grab uniq records. When calculating, includes don't have the
-            # performance hit that they have when searching. Plus it's cleaner.
-            find_options[:include] = merge_joins(find_options[:include], find_options.delete(:joins))
+            find_options[:distinct] = true
           end
         end
 

data/lib/searchgasm/search/conditions.rb

@@ -10,6 +10,7 @@ module Searchgasm
           alias_method_chain :initialize, :conditions
           alias_method_chain :conditions=, :conditions
           alias_method_chain :conditions, :conditions
+          alias_method_chain :auto_joins, :conditions
           alias_method_chain :joins, :conditions
           alias_method_chain :sanitize, :conditions
         end
@@ -34,7 +35,7 @@ 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_joins = nil
+        @memoized_auto_joins = nil
         case values
         when Searchgasm::Conditions::Base
           @conditions = values
@@ -44,7 +45,7 @@ module Searchgasm
       end
       
       def conditions_with_conditions
-        @memoized_joins = nil # have to assume they are calling a condition on a relationship
+        @memoized_auto_joins = nil # have to assume they are calling a condition on a relationship
         conditions_without_conditions
       end
       
@@ -52,8 +53,18 @@ module Searchgasm
       #
       # <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
+      
+      # Changes joins to use left outer joins if conditions.any == true.
       def joins_with_conditions
-        @memoized_joins ||= merge_joins(joins_without_conditions, conditions.joins)
+        if conditions.any?
+          join_dependency = ::ActiveRecord::Associations::ClassMethods::JoinDependency.new(klass, joins_without_conditions, nil)
+          join_dependency.join_associations.collect { |assoc| assoc.association_join }.join
+        else
+          joins_without_conditions
+        end
       end
       
       def sanitize_with_conditions(searching = true) # :nodoc: