searchgasm 1.1.1 → 1.1.2

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+== 1.1.2 released 2008-09-22
+
+* Fixed bug with select control types not using :search_obj to determine its select values.
+* Added is_nil and is_blank condition types.
+* "memoized" various attributes for performance enhancements
+* Removed the :order option from calculation options when :order is useless and just slows down query.
+* Switched from using :include to :joins, big performance increase
+
 == 1.1.1 released 2008-09-19
 
 * Fixed typo in "next page" button.

data/Manifest

@@ -3,7 +3,6 @@ examples/README.rdoc
 init.rb
 lib/searchgasm/active_record/associations.rb
 lib/searchgasm/active_record/base.rb
-lib/searchgasm/active_record.rb
 lib/searchgasm/condition/base.rb
 lib/searchgasm/condition/begins_with.rb
 lib/searchgasm/condition/child_of.rb
@@ -15,6 +14,8 @@ 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/is_blank.rb
+lib/searchgasm/condition/is_nil.rb
 lib/searchgasm/condition/keywords.rb
 lib/searchgasm/condition/less_than.rb
 lib/searchgasm/condition/less_than_or_equal_to.rb
@@ -30,16 +31,13 @@ lib/searchgasm/helpers/control_types/remote_link.rb
 lib/searchgasm/helpers/control_types/remote_links.rb
 lib/searchgasm/helpers/control_types/remote_select.rb
 lib/searchgasm/helpers/control_types/select.rb
-lib/searchgasm/helpers/control_types.rb
 lib/searchgasm/helpers/form.rb
 lib/searchgasm/helpers/utilities.rb
-lib/searchgasm/helpers.rb
 lib/searchgasm/search/base.rb
 lib/searchgasm/search/conditions.rb
 lib/searchgasm/search/ordering.rb
 lib/searchgasm/search/pagination.rb
 lib/searchgasm/search/protection.rb
-lib/searchgasm/search.rb
 lib/searchgasm/shared/searching.rb
 lib/searchgasm/shared/utilities.rb
 lib/searchgasm/shared/virtual_classes.rb

data/README.rdoc

@@ -9,6 +9,7 @@ Searchgasm is orgasmic. Maybe not orgasmic, but you will get aroused. So go grab
 *	<b>Documentation:</b> http://searchgasm.rubyforge.org
 *	<b>Easy pagination, ordering, and searching tutorial:</b> http://www.binarylogic.com/2008/9/7/tutorial-pagination-ordering-and-searching-with-searchgasm
 *	<b>Live example of the tutorial above (with source):</b> http://searchgasm_example.binarylogic.com
+* <b>Bugs / feature suggestions:</b> http://binarylogic.lighthouseapp.com/projects/16601-searchgasm
 
 == Install and use
 
@@ -288,6 +289,8 @@ Some of these conditions come with aliases, so you have your choice how to call
 
   :equals                     => :is
   :does_not_equal             => :is_not, :not
+  :is_nil                     => :nil, :is_null, :null
+  :is_blank                   => :blank
   :begins_with                => :starts_with, :sw, :bw, :start
   :contains                   => :like, :has
   :ends_with                  => :ew, :ends, :end
@@ -353,10 +356,6 @@ ActiveRecord should never know about Searchgasm
 
 What that rule means is that any options you pass when searching get "sanitized" down into options ActiveRecord can understand. Searchgasm serves as a transparent filter between you and ActiveRecord. It doesn't dig into the ActiveRecord internals, it only uses what is publicly available. It jumps in and helps out <em>only</em> when needed, otherwise it sits back and stays completely out of the way. Between that and the extensive tests, this is a solid and fast plugin.
 
-== Reporting problems / bugs
-
-http://binarylogic.lighthouseapp.com/projects/16601-searchgasm
-
 == Credits
 
 Author: {Ben Johnson}[http://github.com/binarylogic] of {Binary Logic}[http://www.binarylogic.com]

data/lib/searchgasm/active_record/base.rb

@@ -1,4 +1,8 @@
 module Searchgasm
+  # == Searchgasm ActiveRecord
+  #
+  # Hooks into ActiveRecord to add all of the searchgasm functionality into your models. Only uses what is publically available, doesn't dig into internals, and
+  # searchgasm only gets involved when needed.
   module ActiveRecord
     # = Searchgasm ActiveRecord Base
     # Adds in base level functionality to ActiveRecord
@@ -6,7 +10,7 @@ module Searchgasm
       # This is an alias method chain. It hook into ActiveRecord's "calculate" method and checks to see if Searchgasm should get involved.
       def calculate_with_searchgasm(*args)
         options = args.extract_options!
-        options = filter_options_with_searchgasm(options)
+        options = filter_options_with_searchgasm(options, false)
         args << options
         calculate_without_searchgasm(*args)
       end
@@ -124,7 +128,7 @@ module Searchgasm
       end
     
       private
-        def filter_options_with_searchgasm(options = {})
+        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.acting_as_filter = true
@@ -138,32 +142,31 @@ module Searchgasm
             end
           end
           search.options = options
-          search.sanitize
+          search.sanitize(searching)
         end
       
         def searchgasm_conditions(options = {})
-          searcher = nil
-          conditions = nil
-          conditions = options.delete(:conditions) if options[:conditions].is_a?(Hash)
-          
-          with_scope(:find => {:conditions => options[:conditions]}) do
-            searcher = Searchgasm::Conditions::Base.create_virtual_class(self).new(scope(:find)[:conditions])
-            searcher.conditions = conditions unless conditions.nil?
-          end
-          
+          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 = {})
-          searcher = nil
-          conditions = nil
-          conditions = options.delete(:conditions) if options[:conditions].is_a?(Hash)
-          
-          with_scope(:find => options) do
-            searcher = Searchgasm::Search::Base.create_virtual_class(self).new(scope(:find))
-            searcher.conditions = conditions unless conditions.nil?
+          scope = {}
+          current_scope = scope(:find) && scope(:find).deep_dup
+          if current_scope
+            [:conditions, :include, :joins].each do |option|
+              value = current_scope.delete(option)
+              next if value.blank?
+              scope[option] = value
+            end
           end
-          
+          searcher = Searchgasm::Search::Base.create_virtual_class(self).new
+          searcher.scope = scope
+          searcher.options = current_scope
+          searcher.options = options
           searcher
         end
     end

data/lib/searchgasm/condition/base.rb

@@ -9,6 +9,9 @@ module Searchgasm
       
       attr_accessor :column, :klass
       attr_reader :value
+      class_inheritable_accessor :ignore_blanks, :type_cast_value
+      self.ignore_blanks = true
+      self.type_cast_value = true
     
       class << self
         # Name of the condition inferred from the class name
@@ -27,6 +30,14 @@ module Searchgasm
           []
         end
         
+        def ignore_blanks? # :nodoc:
+          ignore_blanks == true
+        end
+        
+        def type_cast_value? # :nodoc:
+          type_cast_value == true
+        end
+        
         # Sane as name_for_column but for the class as a whole. For example the tree methods apply to the class as a whole and not
         # specific columns. Any condition that applies to columns should probably return nil here.
         def name_for_klass(klass)
@@ -64,11 +75,6 @@ module Searchgasm
         @explicitly_set_value == true
       end
       
-      # In most cases a blank value should be ignored, except for conditions like equals. A blank value is meaningful there, but a blank value for they keyswords condition is not.
-      def ignore_blanks?
-        true
-      end
-      
       # A convenience method for the name of the method for that specific column or klass
       def name
         column ? self.class.name_for_column(column) : self.class.name_for_klass(klass)
@@ -110,15 +116,20 @@ module Searchgasm
           to_conditions(v)
         end
       end
+      
+      # Should the value be automatically type casted
+      def type_cast_value?
+        true
+      end
     
       # The value for the condition
       def value
-        @value.is_a?(String) ? column.type_cast(@value) : @value
+        self.class.type_cast_value? && @value.is_a?(String) ? column.type_cast(@value) : @value
       end
     
       # Sets the value for the condition, will ignore place if ignore_blanks?
       def value=(v)
-        return if ignore_blanks? && v.blank?
+        return if self.class.ignore_blanks? && v.blank?
         self.explicitly_set_value = true
         @value = v
       end

data/lib/searchgasm/condition/does_not_equal.rb

@@ -1,16 +1,14 @@
 module Searchgasm
   module Condition
     class DoesNotEqual < Base
+      self.ignore_blanks = false
+      
       class << self
         def aliases_for_column(column)
           ["#{column.name}_is_not", "#{column.name}_not"]
         end
       end
       
-      def ignore_blanks?
-        false
-      end
-      
       def to_conditions(value)
         # Delegate to equals and then change
         condition = Equals.new(klass, column)

data/lib/searchgasm/condition/equals.rb

@@ -1,16 +1,14 @@
 module Searchgasm
   module Condition
     class Equals < Base
+      self.ignore_blanks = false
+      
       class << self
         def aliases_for_column(column)
           ["#{column.name}", "#{column.name}_is"]
         end
       end
       
-      def ignore_blanks?
-        false
-      end
-      
       def to_conditions(value)
         # Let ActiveRecord handle this
         klass.send(:sanitize_sql_hash_for_conditions, {column.name => value})

data/lib/searchgasm/condition/is_blank.rb

@@ -0,0 +1,23 @@
+module Searchgasm
+  module Condition
+    class IsBlank < Base
+      self.ignore_blanks = false
+      self.type_cast_value = false
+      
+      class << self
+        def aliases_for_column(column)
+          ["#{column.name}_blank"]
+        end
+      end
+      
+      def to_conditions(value)
+        # Some databases handle null values differently, let AR handle this
+        if value == true || value == "true" || value == 1 || value == "1"
+          "#{quoted_table_name}.#{quoted_column_name} is NULL or #{quoted_table_name}.#{quoted_column_name} = ''"
+        elsif value == false || value == "false" || value == 0 || value == "0"
+          "#{quoted_table_name}.#{quoted_column_name} is NOT NULL and #{quoted_table_name}.#{quoted_column_name} != ''"
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/condition/is_nil.rb

@@ -0,0 +1,23 @@
+module Searchgasm
+  module Condition
+    class IsNil < Base
+      self.ignore_blanks = false
+      self.type_cast_value = false
+      
+      class << self
+        def aliases_for_column(column)
+          ["#{column.name}_nil", "#{column.name}_is_null", "#{column.name}_null"]
+        end
+      end
+      
+      def to_conditions(value)
+        # Some databases handle null values differently, let AR handle this
+        if value == true || value == "true" || value == 1 || value == "1"
+          "#{quoted_table_name}.#{quoted_column_name} is NULL"
+        elsif value == false || value == "false" || value == 0 || value == "0"
+          "#{quoted_table_name}.#{quoted_column_name} is NOT NULL"
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/conditions/base.rb

@@ -5,9 +5,9 @@ module Searchgasm
     # Represents a collection of conditions and performs various tasks on that collection. For information on each condition see Searchgasm::Condition.
     # Each condition has its own file and class and the source for each condition is pretty self explanatory.
     class Base
-      include Searchgasm::Shared::Utilities
-      include Searchgasm::Shared::Searching
-      include Searchgasm::Shared::VirtualClasses
+      include Shared::Utilities
+      include Shared::Searching
+      include Shared::VirtualClasses
       
       attr_accessor :any, :relationship_name, :sql
       
@@ -104,15 +104,15 @@ module Searchgasm
         @any == true || @any == "true" || @any == "1" || @any == "yes"
       end
       
-      # A list of includes to use when searching, includes relationships
-      def includes
-        i = []
+      # A list of joins to use when searching, includes relationships
+      def joins
+        j = []
         associations.each do |association|
           next if association.conditions.blank?
-          association_includes = association.includes
-          i << (association_includes.blank? ? association.relationship_name.to_sym : {association.relationship_name.to_sym => association_includes})
+          association_joins = association.joins
+          j << (association_joins.blank? ? association.relationship_name.to_sym : {association.relationship_name.to_sym => association_joins})
         end
-        i.blank? ? nil : (i.size == 1 ? i.first : i)
+        j.blank? ? nil : (j.size == 1 ? j.first : j)
       end
       
       def inspect

data/lib/searchgasm/config.rb

@@ -43,6 +43,18 @@ module Searchgasm
         @desc_indicator = value
       end
       
+      def hidden_fields # :nodoc:
+        @hidden_fields ||= (Search::Base::SPECIAL_FIND_OPTIONS - [:page])
+      end
+      
+      # Which hidden fields to automatically include when creating a form with a Searchgasm object. See Searchgasm::Helpers::Form for more info.
+      #
+      # * <tt>Default:</tt> [:order_by, :order_as, :per_page]
+      # * <tt>Accepts:</tt> Array, nil, false
+      def hidden_fields=(value)
+        @hidden_fields = value
+      end
+      
       def page_links_first # :nodoc:
         @page_links_first
       end
@@ -80,7 +92,7 @@ module Searchgasm
       end
       
       def page_links_outer_spread # :nodoc:
-        @page_links_outer_spread ||= 2
+        @page_links_outer_spread ||= 1
       end
       
       # The default for the :outer_spread option for the page_links helper.
@@ -116,7 +128,7 @@ module Searchgasm
       end
       
       def per_page # :nodoc:
-        @per_page ||= per_page_choices[2]
+        @per_page ||= per_page_choices[1]
       end
       
       # The default for per page. This is only applicaple for protected searches. Meaning you start the search with new_search or new_conditions.
@@ -141,18 +153,6 @@ module Searchgasm
       def per_page_choices=(value)
         @per_page_choices = value
       end
-      
-      def hidden_fields # :nodoc:
-        @hidden_fields ||= (Search::Base::SPECIAL_FIND_OPTIONS - [:page])
-      end
-      
-      # Which hidden fields to automatically include when creating a form with a Searchgasm object. See Searchgasm::Helpers::Form for more info.
-      #
-      # * <tt>Default:</tt> [:order_by, :order_as, :per_page]
-      # * <tt>Accepts:</tt> Array, nil, false
-      def hidden_fields=(value)
-        @hidden_fields = value
-      end
     end
   end
 end

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

@@ -1,5 +1,56 @@
 module Searchgasm
   module Helpers
+    # = Control Type Helpers
+    #
+    # The purpose of these helpers is to make ordering and paginating data, in your view, a breeze. Everyone has their own flavor of displaying data, so I made these helpers extra flexible, just for you.
+    #
+    # === Tutorial
+    #
+    # Check out my tutorial on how to implement searchgasm into a rails app: http://www.binarylogic.com/2008/9/7/tutorial-pagination-ordering-and-searching-with-searchgasm
+    #
+    # === How it's organized
+    #
+    # If we break it down, you can do 4 different things with your data in your view:
+    #
+    # 1. Order your data by a single column or an array of columns
+    # 2. Descend or ascend your data
+    # 3. Change how many items are on each page
+    # 4. Paginate through your data
+    #
+    # Each one of these actions comes with 3 different types of helpers:
+    #
+    # 1. Link - A single link for a single value. Requires that you pass a value as the first parameter.
+    # 2. Links - A group of single links.
+    # 3. Select - A select with choices that perform an action once selected. Basically the same thing as a group of links, but just as a select form element
+    # 4. Remote - lets you prefix any of these helpers with "remote_" and it will use the built in rails ajax helpers. I highly recommend unobstrusive javascript though, using jQuery.
+    #
+    # === Examples
+    #
+    # Sometimes the best way to explain something is with some examples. Let's pretend we are performing these actions on a User model. Check it out:
+    #
+    #   order_by_link(:name)
+    #   => produces a single link that when clicked will order by the name column, and each time its clicked alternated between "ASC" and "DESC"
+    #
+    #   order_by_links
+    #   => produces a group of links for all of the columns in your users table, each link is basically order_by_link(column.name)
+    #
+    #   order_by_select
+    #   => produces a select form element with all of the user's columns as choices, when the value is change (onchange) it will act as if they clicked a link.
+    #   => This is just order_by_links as a select form element, nothing fancy
+    #
+    # What about paginating? I got you covered:
+    #
+    #   page_link(2)
+    #   => creates a link to page 2
+    #
+    #   page_links
+    #   => creates a group of links for pages, similar to a flickr style of pagination
+    #
+    #   page_select
+    #   => creates a drop down instead of a group of links. The user can select the page in the drop down and it will be as if they clicked a link for that page.
+    #
+    # You can apply the _link, _links, or _select to any of the following: order_by, order_as, per_page, page. You have your choice on how you want to set up the interface. For more information and options on these individual
+    # helpers check out their source files. Look at the sub modules under this one (Ex: Searchgasm::Helpers::ControlTypes::Select)
     module ControlTypes
       # = Link Control Types
       #
@@ -29,6 +80,7 @@ module Searchgasm
         # === Advanced Options
         # * <tt>:params_scope</tt> -- default: :search, this is the scope in which your search params will be preserved (params[:search]). If you don't want a scope and want your options to be at base leve in params such as params[:page], params[:per_page], etc, then set this to nil.
         # * <tt>:search_obj</tt> -- default: @#{params_scope}, this is your search object, everything revolves around this. It will try to infer the name from your params_scope. If your params_scope is :search it will try to get @search, etc. If it can not be inferred by this, you need to pass the object itself.
+        # * <tt>:url_params</tt> -- default: nil, Additional params to add to the url, must be a hash
         def order_by_link(order_by, options = {})
           order_by = deep_stringify(order_by)
           add_order_by_link_defaults!(order_by, options)
@@ -58,6 +110,7 @@ module Searchgasm
         # === Advanced Options
         # * <tt>:params_scope</tt> -- default: :search, this is the scope in which your search params will be preserved (params[:search]). If you don't want a scope and want your options to be at base leve in params such as params[:page], params[:per_page], etc, then set this to nil.
         # * <tt>:search_obj</tt> -- default: @#{params_scope}, this is your search object, everything revolves around this. It will try to infer the name from your params_scope. If your params_scope is :search it will try to get @search, etc. If it can not be inferred by this, you need to pass the object itself.
+        # * <tt>:url_params</tt> -- default: nil, Additional params to add to the url, must be a hash
         def order_as_link(order_as, options = {})
           add_order_as_link_defaults!(order_as, options)
           html = searchgasm_state_for(:order_as, options)
@@ -88,6 +141,7 @@ module Searchgasm
         # === Advanced Options
         # * <tt>:params_scope</tt> -- default: :search, this is the scope in which your search params will be preserved (params[:search]). If you don't want a scope and want your options to be at base leve in params such as params[:page], params[:per_page], etc, then set this to nil.
         # * <tt>:search_obj</tt> -- default: @#{params_scope}, this is your search object, everything revolves around this. It will try to infer the name from your params_scope. If your params_scope is :search it will try to get @search, etc. If it can not be inferred by this, you need to pass the object itself.
+        # * <tt>:url_params</tt> -- default: nil, Additional params to add to the url, must be a hash
         def per_page_link(per_page, options = {})
           add_per_page_link_defaults!(per_page, options)
           html = searchgasm_state_for(:per_page, options)
@@ -116,6 +170,7 @@ module Searchgasm
         # === Advanced Options
         # * <tt>:params_scope</tt> -- default: :search, this is the scope in which your search params will be preserved (params[:search]). If you don't want a scope and want your options to be at base leve in params such as params[:page], params[:per_page], etc, then set this to nil.
         # * <tt>:search_obj</tt> -- default: @#{params_scope}, this is your search object, everything revolves around this. It will try to infer the name from your params_scope. If your params_scope is :search it will try to get @search, etc. If it can not be inferred by this, you need to pass the object itself.
+        # * <tt>:url_params</tt> -- default: nil, Additional params to add to the url, must be a hash
         def page_link(page, options = {})
           add_page_link_defaults!(page, options)
           html = searchgasm_state_for(:page, options)

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

@@ -90,15 +90,10 @@ module Searchgasm
         #
         # Please look at per_page_link. All options there are applicable here and are passed onto each option.
         #
-        # * <tt>:inner_spread</tt> -- default: 3, set to nil to show all pages, this represents how many choices available on each side of the current page
-        # * <tt>:outer_spread</tt> -- default: 1, set to nil to disable, this represents how many choices are in the "outer" spread. If set to 0, the separator will be present with no page links. This option changes the links from 
-        # *                  "< Prev 2 3 4 [5] 6 7 8 Next >" with 10 total pages to:
-        # *                  "< Prev ... 3 4 [5] 6 7 ... Next >" for :outer_spread = 0 and :inner_spread = 3
-        # *                  "< Prev 1 ... 3 4 [5] 6 7 ... 10 Next >" for :outer_spread = 1 and :inner_spread = 3
-        # *                  "< Prev 1 2 ... 3 4 [5] 6 7 ... 9 10 Next >" for :outer_spread = 2 and :inner_spread = 3 (outer_spread = number of absolute pages on each side)
-        # *                  Outer spread pages will not be visible unless the current_page is more than :inner_spread away from the first or last page.
-        # * <tt>:prev</tt> -- default: < Prev, set to nil to omit. This is an extra link on the left side of the page links that will go to the previous page
-        # * <tt>:next</tt> -- default: Next >, set to nil to omit. This is an extra link on the right side of the page links that will go to the next page
+        # * <tt>:inner_spread</tt> -- default: 3, set to nil to show all pages, set 0 to show no page links. This represents how many choices available on each side of the current page
+        # * <tt>:outer_spread</tt> -- default: 1, set to nil to disable, set to 0 show no outer spread but the separator will still be present. This represents how many choices are in the "outer" spread.
+        # * <tt>:prev</tt> -- default: "< Prev", set to nil to omit. This is an extra link on the left side of the page links that will go to the previous page
+        # * <tt>:next</tt> -- default: "Next >", set to nil to omit. This is an extra link on the right side of the page links that will go to the next page
         # * <tt>:first</tt> -- default: nil, set to nil to omit. This is an extra link on thefar left side of the page links that will go to the first page
         # * <tt>:last</tt> -- default: nil, set to nil to omit. This is an extra link on the far right side of the page links that will go to the last page
         def page_links(options = {})

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

@@ -8,25 +8,25 @@ module Searchgasm
         # Please see order_by_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_by_select(options = {})
           add_order_by_select_defaults!(options)
-          searchgasm_state_for(:order_by, options) + select(options[:params_scope], :order_by, options[:choices], options[:tag] || {}, options[:html] || {})
+          searchgasm_state_for(:order_by, options) + select(options[:params_scope], :order_by, options[:choices], options[:tag], options[:html] || {})
         end
         
         # 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)
-          searchgasm_state_for(:order_as, options) + select(options[:params_scope], :order_as, options[:choices], options[:tag] || {}, options[:html])
+          searchgasm_state_for(:order_as, options) + select(options[:params_scope], :order_as, options[:choices], options[:tag], options[:html])
         end
         
         # Please see per_page_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 per_page_select(options = {})
           add_per_page_select_defaults!(options)
-          searchgasm_state_for(:per_page, options) + select(options[:params_scope], :per_page, options[:choices], options[:tag] || {}, options[:html])
+          searchgasm_state_for(:per_page, options) + select(options[:params_scope], :per_page, options[:choices], options[:tag], options[:html])
         end
         
         # Please see page_links. All options are the same and applicable here, excep the :prev, :next, :first, and :last options. 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 page_select(options = {})
           add_page_select_defaults!(options)
-          searchgasm_state_for(:page, options) + select(options[:params_scope], :page, (options[:first_page]..options[:last_page]), options[:tag] || {}, options[:html])
+          searchgasm_state_for(:page, options) + select(options[:params_scope], :page, (options[:first_page]..options[:last_page]), options[:tag], options[:html])
         end
         
         private
@@ -56,6 +56,9 @@ module Searchgasm
           end
           
           def add_searchgasm_select_defaults!(option, options)
+            options[:tag] ||= {}
+            options[:tag][:object] = options[:search_obj]
+            
             url = searchgasm_url_hash(option, nil, options)
             url.delete(option)
             url = searchgasm_url(url, options)

data/lib/searchgasm/helpers/form.rb

@@ -92,9 +92,9 @@ module Searchgasm
                 options[:html][:onsubmit] += ";"
               
                 javascript = "if(typeof(Prototype) != 'undefined') {"
-                search_options[:hidden_fields].each { |field| javascript += "$('#{name}_#{field}_hidden').value = $('#{name}_#{field}').value;" }
+                search_options[:hidden_fields].each { |field| javascript += "field = $('#{name}_#{field}'); if(field) { $('#{name}_#{field}_hidden').value = field.value; }" }
                 javascript += "} else if(jQuery) {"
-                search_options[:hidden_fields].each { |field| javascript += "$('##{name}_#{field}_hidden').val($('##{name}_#{field}').val());" }
+                search_options[:hidden_fields].each { |field| javascript += "field = $('##{name}_#{field}'); if(field) { $('##{name}_#{field}_hidden').val(field.val()); }" }
                 javascript += "}"
               
                 options[:html][:onsubmit] += javascript

data/lib/searchgasm/helpers/utilities.rb

@@ -6,7 +6,7 @@ module Searchgasm
         def add_searchgasm_helper_defaults!(option, 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") unless options[:search_obj].is_a?(Searchgasm::Search::Base)
+          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[:html] ||= {}
           options[:html][:class] ||= ""
           searchgasm_add_class!(options[:html], option)
@@ -14,7 +14,8 @@ module Searchgasm
         end
         
         def searchgasm_url(url_hash, options)
-          options[:params_scope].blank? ? url_hash : {options[:params_scope] => url_hash}
+          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)

data/lib/searchgasm/search/base.rb

@@ -13,7 +13,7 @@ module Searchgasm #:nodoc:
       AR_FIND_OPTIONS = ::ActiveRecord::Base.valid_find_options
       
       # Options ActiveRecord allows when performing calculations
-      AR_CALCULATIONS_OPTIONS = ::ActiveRecord::Base.valid_calculations_options
+      AR_CALCULATIONS_OPTIONS = (::ActiveRecord::Base.valid_calculations_options - [:select, :limit, :offset, :order, :group])
       
       AR_OPTIONS = (AR_FIND_OPTIONS + AR_CALCULATIONS_OPTIONS).uniq
       
@@ -64,6 +64,11 @@ module Searchgasm #:nodoc:
         "#<#{klass}Search #{current_find_options.inspect}>"
       end
       
+      # need to remote any duplicate joins that are specified in includes
+      #def joins
+      #  # If includes are specified, remove the joins
+      #end
+      
       def limit=(value)
         @set_limit = true
         @limit = value.blank? || value == 0 ? nil : value.to_i
@@ -77,7 +82,7 @@ module Searchgasm #:nodoc:
       def offset=(value)
         @offset = value.blank? ? nil : value.to_i
       end
-      
+
       def options=(values)
         return unless values.is_a?(Hash)
         values.symbolize_keys.fast_assert_valid_keys(OPTIONS)
@@ -93,11 +98,24 @@ module Searchgasm #:nodoc:
       # Sanitizes everything down into options ActiveRecord::Base.find can understand
       def sanitize(searching = true)
         find_options = {}
+        
         (searching ? AR_FIND_OPTIONS : AR_CALCULATIONS_OPTIONS).each do |find_option|
           value = send(find_option)
           next if value.blank?
           find_options[find_option] = value
         end
+
+        unless find_options[:joins].blank?
+          # The following is to return uniq records since we are using joins instead of includes
+          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))
+          end
+        end
+
         find_options
       end