searchgasm 1.2.1 → 1.2.2

data/CHANGELOG.rdoc

@@ -1,4 +1,14 @@
-== 1.2.1 released 2008-09-24
+== 1.2.2 released 2008-09-29
+
+* Fixed bug when reverse engineering order to order_by, assumed ASC and DESC would always be present when they are not.
+* False is a meaningful value for some conditions, and false.blank? == true. So instead of using value.blank? to ignore conditions we use meaningless?(value), which returns false if it is false.
+* Fixed aliases for lt, lte, gt, and gte.
+* Fixed bug when writing conditions on associations via a hash with string keys
+* Added Config.remove_duplicates to turn off the "automatic" removing of duplicates if desired.
+* Updated searchgasm_state helper to insert the entire state all at once.
+* Added CSS class "ordering" to order_by_link if the search is being ordered by that.
+
+== 1.2.1 released 2008-09-25
 
 * Fixed problem when determining if an order_by_link is currently being ordered. Just "stringified" both comparable values.
 * Removed default order_by and order_as. They will ONLY have values if you specify how to order, otherwise they are nil.

data/Manifest

@@ -3,22 +3,26 @@ examples/README.rdoc
 init.rb
 lib/searchgasm/active_record/associations.rb
 lib/searchgasm/active_record/base.rb
+lib/searchgasm/active_record/connection_adapters/mysql_adapter.rb
+lib/searchgasm/active_record/connection_adapters/postgresql_adapter.rb
+lib/searchgasm/active_record/connection_adapters/sqlite_adapter.rb
 lib/searchgasm/condition/base.rb
 lib/searchgasm/condition/begins_with.rb
+lib/searchgasm/condition/blank.rb
 lib/searchgasm/condition/child_of.rb
 lib/searchgasm/condition/contains.rb
 lib/searchgasm/condition/descendant_of.rb
 lib/searchgasm/condition/does_not_equal.rb
+lib/searchgasm/condition/during_evening.rb
 lib/searchgasm/condition/ends_with.rb
 lib/searchgasm/condition/equals.rb
 lib/searchgasm/condition/greater_than.rb
 lib/searchgasm/condition/greater_than_or_equal_to.rb
 lib/searchgasm/condition/inclusive_descendant_of.rb
-lib/searchgasm/condition/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
+lib/searchgasm/condition/nil.rb
 lib/searchgasm/condition/sibling_of.rb
 lib/searchgasm/condition/tree.rb
 lib/searchgasm/conditions/base.rb
@@ -66,3 +70,4 @@ test/test_search_conditions.rb
 test/test_search_ordering.rb
 test/test_search_pagination.rb
 test/test_search_protection.rb
+TODO.rdoc

data/README.rdoc

@@ -345,7 +345,7 @@ What that rule means is that any options you pass when searching get "sanitized"
 
 Author: {Ben Johnson}[http://github.com/binarylogic] of {Binary Logic}[http://www.binarylogic.com]
 
-Credit to {Zack Ham}[http://github.com/zackham] and {Robert Malko}[http://github.com/malkomalko/] for helping with feature suggestions.
+Credit to {Zack Ham}[http://github.com/zackham] for helping with feature suggestions.
 
 
 Copyright (c) 2008 {Ben Johnson}[http://github.com/binarylogic] of {Binary Logic}[http://www.binarylogic.com], released under the MIT license 

data/Rakefile

@@ -10,6 +10,6 @@ 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 = ['activerecord', 'activesupport']
+  p.dependencies = %w(activerecord activesupport)
   p.include_rakefile = true
 end

data/TODO.rdoc

@@ -0,0 +1,5 @@
+= To Do
+
+1. Add month condition for date and datetime columns. So you can specify a specific month, by name, number, etc.
+2. Add day condition for time and datetime columns. So you can specify that the time is during the day or the night.
+3. Add weekend condition for date and datetime columns. So you can specify if the date is on a friday, saturday, or sunday

data/lib/searchgasm/active_record/connection_adapters/mysql_adapter.rb

@@ -0,0 +1,15 @@
+module Searchgasm
+  module ActiveRecord
+    module ConnectionAdapters
+      module MysqlAdapter
+        def hour_sql
+          "HOUR(?)"
+        end
+        
+        def month_sql
+          "MONTH(?)"
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/condition/base.rb

@@ -8,9 +8,8 @@ module Searchgasm
       include Shared::Utilities
       
       attr_accessor :column, :klass
-      class_inheritable_accessor :ignore_blanks, :type_cast_value
-      self.ignore_blanks = true
-      self.type_cast_value = true
+      class_inheritable_accessor :ignore_meaningless, :type_cast_sql_type
+      self.ignore_meaningless = true
     
       class << self
         # Name of the condition inferred from the class name
@@ -29,12 +28,8 @@ module Searchgasm
           []
         end
         
-        def ignore_blanks? # :nodoc:
-          ignore_blanks == true
-        end
-        
-        def type_cast_value? # :nodoc:
-          type_cast_value == true
+        def ignore_meaningless? # :nodoc:
+          ignore_meaningless == 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
@@ -48,6 +43,16 @@ module Searchgasm
           []
         end
         
+        # A utility method for using in name_for_column. Determines if a column contains a date.
+        def date_column?(column)
+          [:datetime, :date, :timestamp].include?(column.type)
+        end
+        
+        # A utility method for using in name_for_column. Determines if a column contains a date and a time.
+        def datetime_column?(column)
+          [:datetime, :timestamp, :time, :date].include?(column.type)
+        end
+        
         # A utility method for using in name_for_column. For example the keywords condition only applied to string columns, the great than condition doesnt.
         def string_column?(column)
           [:string, :text].include?(column.type)
@@ -57,6 +62,11 @@ module Searchgasm
         def comparable_column?(column)
           [:integer, :float, :decimal, :datetime, :timestamp, :time, :date].include?(column.type)
         end
+        
+        # A utility method for using in name_for_column. Determines if a column contains a time.
+        def time_column?(column)
+          [:datetime, :timestamp, :time].include?(column.type)
+        end
       end
     
       def initialize(klass, column = nil)          
@@ -118,14 +128,20 @@ module Searchgasm
     
       # The value for the condition
       def value
-        self.class.type_cast_value? && @value.is_a?(String) ? column.type_cast(@value) : @value
+        @value.is_a?(String) ? column_for_type_cast.type_cast(@value) : @value
       end
     
       # Sets the value for the condition
       def value=(v)
+        return if self.class.ignore_meaningless? && meaningless?(v)
         self.explicitly_set_value = true
         @value = v
       end
+      
+      private
+        def column_for_type_cast
+          @column_for_type_cast ||= self.class.type_cast_sql_type ? self.column.class.new(column.name, column.default.to_s, self.class.type_cast_sql_type.to_s, column.null) : column
+        end
     end
   end
 end

data/lib/searchgasm/condition/{is_blank.rb → blank.rb}

@@ -1,20 +1,19 @@
 module Searchgasm
   module Condition
-    class IsBlank < Base
-      self.ignore_blanks = false
-      self.type_cast_value = false
+    class Blank < Base
+      self.type_cast_sql_type = "boolean"
       
       class << self
         def aliases_for_column(column)
-          ["#{column.name}_blank"]
+          ["#{column.name}_is_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"
+        if value == true
           "#{quoted_table_name}.#{quoted_column_name} is NULL or #{quoted_table_name}.#{quoted_column_name} = ''"
-        elsif value == false || value == "false" || value == 0 || value == "0"
+        elsif value == false
           "#{quoted_table_name}.#{quoted_column_name} is NOT NULL and #{quoted_table_name}.#{quoted_column_name} != ''"
         end
       end

data/lib/searchgasm/condition/does_not_equal.rb

@@ -1,7 +1,7 @@
 module Searchgasm
   module Condition
     class DoesNotEqual < Base
-      self.ignore_blanks = false
+      self.ignore_meaningless = false
       
       class << self
         def aliases_for_column(column)

data/lib/searchgasm/condition/during_evening.rb

@@ -0,0 +1,32 @@
+module Searchgasm
+  module Condition
+    class DuringEvening < Base
+      class << self
+        def name_for_column(column)
+          return unless time_column?(column)
+          super
+        end
+        
+        def aliases_for_column(column)
+          column_names = [column.name]
+          column_names << column.name.gsub(/_(at|on)$/, "") if column.name =~ /_(at|on)$/
+          
+          aliases = []
+          column_names.each { |column_name| aliases += ["#{column_name}_in_the_evening", "#{column_name}_in_evening", "#{column_name}_evening"] }
+          aliases << "#{column_names.last}_during_evening" if column_names.size > 1
+          aliases
+        end
+      end
+      
+      def to_conditions(value)
+        evening_start = 17
+        evening_end = 22
+        
+        # Need to set up a funcion in each adapter for dealing with dates. Mysql uses HOUR(), sqlite uses strftime(), postgres uses date_part('hour', date). Could potentially be a pain in the ass.
+        # Also, you could set up an hour = condition, and leverage that to do this.
+        if value == true
+          ["#{quoted_table_name}.#{quoted_column_name} >= ? AND #{quoted_table_name}.#{quoted_column_name} <= ?", value]
+      end
+    end
+  end
+end

data/lib/searchgasm/condition/equals.rb

@@ -1,7 +1,7 @@
 module Searchgasm
   module Condition
     class Equals < Base
-      self.ignore_blanks = false
+      self.ignore_meaningless = false
       
       class << self
         def aliases_for_column(column)

data/lib/searchgasm/condition/greater_than.rb

@@ -9,10 +9,11 @@ module Searchgasm
         
         def aliases_for_column(column)
           column_names = [column.name]
-          column_names << column.name.gsub(/_at$/, "") if [:datetime, :timestamp, :time, :date].include?(column.type) && column.name =~ /_at$/
+          column_names << column.name.gsub(/_(at|on)$/, "") if datetime_column?(column) && column.name =~ /_(at|on)$/
           
           aliases = []
           column_names.each { |column_name| aliases += ["#{column_name}_gt", "#{column_name}_after"] }
+          aliases << "#{column_names.last}_greater_than" if column_names.size > 1
           aliases
         end
       end

data/lib/searchgasm/condition/greater_than_or_equal_to.rb

@@ -8,7 +8,13 @@ module Searchgasm
         end
         
         def aliases_for_column(column)
-          ["#{column.name}_gte", "#{column.name}_at_least"]
+          column_names = [column.name]
+          column_names << column.name.gsub(/_(at|on)$/, "") if datetime_column?(column) && column.name =~ /_(at|on)$/
+          
+          aliases = []
+          column_names.each { |column_name| aliases += ["#{column_name}_gte", "#{column_name}_at_least"] }
+          aliases << "#{column_names.last}_greater_than_or_equal_to" if column_names.size > 1
+          aliases
         end
       end
       

data/lib/searchgasm/condition/less_than.rb

@@ -9,10 +9,11 @@ module Searchgasm
         
         def aliases_for_column(column)
           column_names = [column.name]
-          column_names << column.name.gsub(/_at$/, "") if [:datetime, :timestamp, :time, :date].include?(column.type) && column.name =~ /_at$/
+          column_names << column.name.gsub(/_(at|on)$/, "") if datetime_column?(column) && column.name =~ /_(at|on)$/
           
           aliases = []
           column_names.each { |column_name| aliases += ["#{column_name}_lt", "#{column_name}_before"] }
+          aliases << "#{column_names.last}_less_than" if column_names.size > 1
           aliases
         end
       end

data/lib/searchgasm/condition/less_than_or_equal_to.rb

@@ -8,7 +8,13 @@ module Searchgasm
         end
         
         def aliases_for_column(column)
-          ["#{column.name}_lte", "#{column.name}_at_most"]
+          column_names = [column.name]
+          column_names << column.name.gsub(/_(at|on)$/, "") if datetime_column?(column) && column.name =~ /_(at|on)$/
+          
+          aliases = []
+          column_names.each { |column_name| aliases += ["#{column_name}_lte", "#{column_name}_at_most"] }
+          aliases << "#{column_names.last}_less_than_or_equal_to" if column_names.size > 1
+          aliases
         end
       end
       

data/lib/searchgasm/condition/nil.rb

@@ -0,0 +1,21 @@
+module Searchgasm
+  module Condition
+    class Nil < Base
+      self.type_cast_sql_type = "boolean"
+      
+      class << self
+        def aliases_for_column(column)
+          ["#{column.name}_is_nil", "#{column.name}_is_null", "#{column.name}_null"]
+        end
+      end
+      
+      def to_conditions(value)
+        if value == true
+          "#{quoted_table_name}.#{quoted_column_name} is NULL"
+        elsif value == false
+          "#{quoted_table_name}.#{quoted_column_name} is NOT NULL"
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/conditions/base.rb

@@ -68,8 +68,11 @@ module Searchgasm
           
           if conditions.is_a?(Hash)
             return true if conditions[:any]
+            stringified_conditions = conditions.stringify_keys
+            stringified_conditions.keys.each { |condition| return false if condition.include?(".") } # setting conditions on associations, which is just another way of writing SQL, and we ignore SQL
+            
             column_names = model_class.column_names
-            conditions.stringify_keys.keys.each do |condition|
+            stringified_conditions.keys.each do |condition|
               return true unless column_names.include?(condition)
             end
           end
@@ -132,7 +135,7 @@ module Searchgasm
         when Hash          
           assert_valid_conditions(value)
           remove_conditions_from_protected_assignement(value).each do |condition, condition_value|
-            next if condition_value.blank? # ignore blanks on mass assignments
+            next if meaningless?(condition_value) # ignore blanks on mass assignments
             send("#{condition}=", condition_value)
           end
         else
@@ -216,7 +219,7 @@ module Searchgasm
             def #{name}; #{name}_object.value; end
             
             def #{name}=(value)
-              if value.blank? && #{name}_object.class.ignore_blanks?
+              if meaningless?(value) && #{name}_object.class.ignore_meaningless?
                 reset_#{name}!
               else
                 @conditions = nil

data/lib/searchgasm/config.rb

@@ -153,6 +153,28 @@ module Searchgasm
       def per_page_choices=(value)
         @per_page_choices = value
       end
+      
+      def remove_duplicates # :nodoc:
+        return @remove_duplicates if @set_remove_duplicates
+        @remove_duplicates ||= ::ActiveRecord::VERSION::MAJOR < 2 || (::ActiveRecord::VERSION::MAJOR == 2 && ::ActiveRecord::VERSION::MINOR < 2)
+      end
+      
+      def remove_duplicates? # :nodoc:
+        remove_duplicates == true
+      end
+      
+      # If you are using ActiveRecord < 2.2.0 then ActiveRecord does not remove duplicates when using the :joins option, when it should. To fix this problem searchgasm does this for you. Searchgasm tries to act
+      # just like ActiveRecord, but in this instance it doesn't make sense.
+      #
+      # As a result, Searchgasm removes all duplicates results in *ALL* search / calculation queries. It does this by forcing the DISTINCT or GROUP BY operation in your SQL. Which might come as a surprise to you
+      # since it is not the "norm". If you don't want searchgasm to do this, set this to false.
+      #
+      # * <tt>Default:</tt> true
+      # * <tt>Accepts:</tt> Boolean
+      def remove_duplicates=(value)
+        @set_remove_duplicates = true
+        @remove_duplicates = value
+      end
     end
   end
 end

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

@@ -85,9 +85,8 @@ module Searchgasm
         # * <tt>:search_params</tt> -- default: nil, Additional search params to add to the url, must be a hash. Adds the options into the :params_scope.
         # * <tt>:exclude_search_params</tt> -- default: nil, Same as :exclude_params but for the :search_params.
         def order_by_link(order_by, options = {})
-          order_by = deep_stringify(order_by)
           add_order_by_link_defaults!(order_by, options)
-          html = searchgasm_state_for(:order_by, options) + searchgasm_state_for(:order_as, options)
+          html = searchgasm_state(options)
           
           if !options[:is_remote]
             html += link_to(options[:text], options[:url], options[:html])
@@ -119,7 +118,7 @@ module Searchgasm
         # * <tt>:exclude_search_params</tt> -- default: nil, Same as :exclude_params but for the :search_params.
         def order_as_link(order_as, options = {})
           add_order_as_link_defaults!(order_as, options)
-          html = searchgasm_state_for(:order_as, options)
+          html = searchgasm_state(options)
           
           if !options[:is_remote]
             html += link_to(options[:text], options[:url], options[:html])
@@ -159,9 +158,8 @@ module Searchgasm
         # * <tt>:search_params</tt> -- default: nil, Additional search params to add to the url, must be a hash. Adds the options into the :params_scope.
         # * <tt>:exclude_search_params</tt> -- default: nil, Same as :exclude_params but for the :search_params.
         def priority_order_by_link(priority_order_by, priority_order_as, options = {})
-          priority_order_by = deep_stringify(priority_order_by)
           add_priority_order_by_link_defaults!(priority_order_by, priority_order_as, options)
-          html = searchgasm_state_for(:priority_order_by, options) + searchgasm_state_for(:priority_order_as, options)
+          html = searchgasm_state(options)
           
           if !options[:is_remote]
             html += link_to(options[:text], options[:url], options[:html])
@@ -195,7 +193,7 @@ module Searchgasm
         # * <tt>:exclude_search_params</tt> -- default: nil, Same as :exclude_params but for the :search_params.
         def per_page_link(per_page, options = {})
           add_per_page_link_defaults!(per_page, options)
-          html = searchgasm_state_for(:per_page, options)
+          html = searchgasm_state(options)
           
           if !options[:is_remote]
             html += link_to(options[:text], options[:url], options[:html])
@@ -227,7 +225,7 @@ module Searchgasm
         # * <tt>:exclude_search_params</tt> -- default: nil, Same as :exclude_params but for the :search_params.
         def page_link(page, options = {})
           add_page_link_defaults!(page, options)
-          html = searchgasm_state_for(:page, options)
+          html = searchgasm_state(options)
           
           if !options[:is_remote]
             html += link_to(options[:text], options[:url], options[:html])
@@ -241,10 +239,12 @@ module Searchgasm
         private
           def add_order_by_link_defaults!(order_by, options = {})
             add_searchgasm_control_defaults!(:order_by, options)
+            ordering_by_this = searchgasm_ordering_by?(order_by, options)
+            searchgasm_add_class!(options[:html], "ordering") if ordering_by_this
             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 deep_stringify(options[:search_obj].order_by) == order_by
+            options[:text] += options[:search_obj].desc? ? options[:desc_indicator] : options[:asc_indicator] if ordering_by_this
             options[:url] = searchgasm_params(options.merge(:search_params => {:order_by => order_by}))
             options
           end
@@ -261,7 +261,7 @@ module Searchgasm
             options[:column_name] ||= determine_order_by_text(priority_order_by).downcase 
             options[:activate_text] ||= "Show #{options[:column_name]} first"
             options[:deactivate_text] ||= "Don't show #{options[:column_name]} first"
-            active = deep_stringify(options[:search_obj].priority_order_by) == priority_order_by && options[:search_obj].priority_order_as == priority_order_as
+            active = deep_stringify(options[:search_obj].priority_order_by) == deep_stringify(priority_order_by) && options[:search_obj].priority_order_as == priority_order_as
             options[:text] ||= active ? options[:deactivate_text] : options[:activate_text]
             if active
               options.merge!(:search_params => {:priority_order_by => nil, :priority_order_as => nil})
@@ -298,23 +298,6 @@ module Searchgasm
               determine_order_by_text(v, k)
             end
           end
-          
-          def deep_stringify(obj)
-            case obj
-            when String
-              obj
-            when Symbol
-              obj.to_s
-            when Array
-              obj.collect { |item| deep_stringify(item) }
-            when Hash
-              new_obj = {}
-              obj.each { |key, value| new_obj[key.to_s] = deep_stringify(value) }
-              new_obj
-            else
-              obj
-            end
-          end
       end
     end
   end

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(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_as_select_defaults!(options)
-          searchgasm_state_for(:order_as, options) + select(options[:params_scope], :order_as, options[:choices], options[:tag], options[:html])
+          searchgasm_state(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(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(options) + select(options[:params_scope], :page, (options[:first_page]..options[:last_page]), options[:tag], options[:html])
         end
         
         private

data/lib/searchgasm/helpers/utilities.rb

@@ -37,10 +37,12 @@ module Searchgasm
         search_params.deep_delete(options[:exclude_search_params])
         
         if options[:search_params]
+          
+          #raise params_copy.inspect if options[:search_params][:order_by] == :id
           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" 
+            search_params[:order_as] = (searchgasm_ordering_by?(options[:search_params][:order_by], options) && options[:search_obj].asc?) ? "DESC" : "ASC" 
           end
           
           [:order_by, :priority_order_by].each { |base64_field| search_params[base64_field] = searchgasm_base64_value(search_params[base64_field]) if search_params.has_key?(base64_field) }
@@ -90,6 +92,30 @@ module Searchgasm
         url += (url.last == "?" ? "" : (url.include?("?") ? "&" : "?")) + literal_param_strings.join("&")
       end
       
+      # When you set up a search form using form_for for remote_form_for searchgasm adds in some *magic* for you.
+      #
+      # Take the instance where a user orders the data by something other than the default, and then does a search. The user would expect the search to remember what the user selected to order the data by, right?
+      # What searchgasm does is add in some hidden fields, somewhere in the page, the represent the searchgasm "state". These are automatically added for you when you use the searchgasm helpers.
+      # Such as: page_links, page_link, order_by_link, per_page_select, etc. So if you are using those you do not need to worry about this helper.
+      #
+      # If for some reason you do not use any of these you need to put the searchgasm state on your page somewhere. Somewhere where the state will *always* be up-to-date, which would be most likely be in the
+      # partial that renders your search results (assuming you are using AJAX). Otherwise when the user starts a new search, the state will be reset. Meaning the order_by, per_page, etc will all be reset.
+      #
+      # === 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.
+      def searchgasm_state(options)
+        return "" if @added_searchgasm_state
+        add_searchgasm_defaults!(options)
+        html = ""
+        (Search::Base::SPECIAL_FIND_OPTIONS - [:page, :priority_order]).each do |option|
+          value = options[:search_obj].send(option)
+          html += hidden_field(options[:params_scope], option, :value => (option == :order_by ? searchgasm_base64_value(value) : value))
+        end
+        @added_searchgasm_state = true
+        html
+      end
+      
       private
         # Adds default options for all helper methods.
         def add_searchgasm_defaults!(options)
@@ -117,22 +143,17 @@ module Searchgasm
         
         def searchgasm_base64_value(order_by)
           case order_by
-          when String
+          when String, Symbol
             order_by
           when Array, Hash
             [Marshal.dump(order_by)].pack("m")
           end
         end
         
-        def searchgasm_state_for(option, options)
-          @added_state_for ||= []
-          html = ""
-          unless @added_state_for.include?(option)
-            value = options[:search_obj].send(option)
-            html = hidden_field(options[:params_scope], option, :value => (option == :order_by ? searchgasm_base64_value(value) : value))
-            @added_state_for << option
-          end
-          html
+        def searchgasm_ordering_by?(order_by, options)
+          stringified_search_order_by = deep_stringify(options[:search_obj].order_by)
+          stringified_order_by = deep_stringify(order_by)
+          (options[:search_obj].order_by.blank? && options[:search_obj].klass.primary_key == stringified_order_by) || stringified_search_order_by == stringified_order_by
         end
         
         def literal_param_strings(literal_params, prefix)
@@ -152,6 +173,23 @@ module Searchgasm
           
           param_strings
         end
+        
+        def deep_stringify(obj)
+          case obj
+          when String
+            obj
+          when Symbol
+            obj.to_s
+          when Array
+            obj.collect { |item| deep_stringify(item) }
+          when Hash
+            new_obj = {}
+            obj.each { |key, value| new_obj[key.to_s] = deep_stringify(value) }
+            new_obj
+          else
+            obj
+          end
+        end
     end
   end
 end

data/lib/searchgasm/search/base.rb

@@ -112,16 +112,18 @@ module Searchgasm #:nodoc:
           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
-            find_options[:distinct] = true
+        
+        if Config.remove_duplicates?
+          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
+              find_options[:distinct] = true
+            end
           end
         end
-
+        
         find_options
       end
       

data/lib/searchgasm/search/ordering.rb

@@ -39,7 +39,6 @@ module Searchgasm
       
       # Convenience method for determining if the ordering is ascending
       def asc?
-        return false if order_as.nil?
         !desc?
       end
       
@@ -199,7 +198,8 @@ module Searchgasm
           # Reversege engineer order, only go 1 level deep with relationships, anything beyond that is probably excessive and not good for performance
           order_parts = order.split(",").collect do |part|
             part.strip!
-            part.gsub!(/ (ASC|DESC)$/i, "").gsub!(/(.*)\./, "")
+            part.gsub!(/ (ASC|DESC)$/i, "")
+            part.gsub!(/(.*)\./, "")
             table_name = ($1 ? $1.gsub(/[^a-z0-9_]/i, "") : nil)
             part.gsub!(/[^a-z0-9_]/i, "")
             reflection = nil
@@ -223,9 +223,9 @@ module Searchgasm
             value = order_by_value.values.first
             case value
             when Hash
-              {key => build_order_by_auto_joins(value)}
+              {key.to_sym => build_order_by_auto_joins(value)}
             else
-              key
+              key.to_sym
             end
           else
             nil

data/lib/searchgasm/shared/utilities.rb

@@ -45,6 +45,16 @@ module Searchgasm
           
           new_joins.compact.uniq
         end
+        
+        # "meaningful" is subjective which is why this is not a core extension like .blank?
+        def meaningless?(value)
+          return false if value == false
+          value.blank?
+        end
+        
+        def meaningful?(value)
+          !meaningless?
+        end
     end
   end
 end

data/lib/searchgasm/version.rb

@@ -67,7 +67,7 @@ module Searchgasm
 
     MAJOR = 1
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/lib/searchgasm.rb

@@ -1,6 +1,7 @@
 $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
   
 require "active_record"
+require "active_record/version"
 require "active_support"
 
 # Core Ext
@@ -33,17 +34,17 @@ require "searchgasm/conditions/base"
 # Condition
 require "searchgasm/condition/base"
 require "searchgasm/condition/begins_with"
+require "searchgasm/condition/blank"
 require "searchgasm/condition/contains"
 require "searchgasm/condition/does_not_equal"
 require "searchgasm/condition/ends_with"
 require "searchgasm/condition/equals"
 require "searchgasm/condition/greater_than"
 require "searchgasm/condition/greater_than_or_equal_to"
-require "searchgasm/condition/is_blank"
-require "searchgasm/condition/is_nil"
 require "searchgasm/condition/keywords"
 require "searchgasm/condition/less_than"
 require "searchgasm/condition/less_than_or_equal_to"
+require "searchgasm/condition/nil"
 require "searchgasm/condition/tree"
 require "searchgasm/condition/child_of"
 require "searchgasm/condition/descendant_of"
@@ -77,7 +78,7 @@ module Searchgasm
       include Protection
     end
     
-    [:begins_with, :child_of, :contains, :descendant_of, :does_not_equal, :ends_with, :equals, :greater_than, :greater_than_or_equal_to, :inclusive_descendant_of, :is_blank, :is_nil, :keywords, :less_than, :less_than_or_equal_to, :sibling_of].each do |condition|
+    [:begins_with, :blank, :child_of, :contains, :descendant_of, :does_not_equal, :ends_with, :equals, :greater_than, :greater_than_or_equal_to, :inclusive_descendant_of, :nil, :keywords, :less_than, :less_than_or_equal_to, :sibling_of].each do |condition|
       Base.register_condition("Searchgasm::Condition::#{condition.to_s.camelize}".constantize)
     end
   end

data/searchgasm.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Searchgasm-1.2.1
+# Gem::Specification for Searchgasm-1.2.2
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
 autorequire: 
 bindir: bin
 
-date: 2008-09-26 00:00:00 -04:00
+date: 2008-09-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,22 +55,26 @@ extra_rdoc_files:
 - CHANGELOG.rdoc
 - lib/searchgasm/active_record/associations.rb
 - lib/searchgasm/active_record/base.rb
+- lib/searchgasm/active_record/connection_adapters/mysql_adapter.rb
+- lib/searchgasm/active_record/connection_adapters/postgresql_adapter.rb
+- lib/searchgasm/active_record/connection_adapters/sqlite_adapter.rb
 - lib/searchgasm/condition/base.rb
 - lib/searchgasm/condition/begins_with.rb
+- lib/searchgasm/condition/blank.rb
 - lib/searchgasm/condition/child_of.rb
 - lib/searchgasm/condition/contains.rb
 - lib/searchgasm/condition/descendant_of.rb
 - lib/searchgasm/condition/does_not_equal.rb
+- lib/searchgasm/condition/during_evening.rb
 - lib/searchgasm/condition/ends_with.rb
 - lib/searchgasm/condition/equals.rb
 - lib/searchgasm/condition/greater_than.rb
 - lib/searchgasm/condition/greater_than_or_equal_to.rb
 - lib/searchgasm/condition/inclusive_descendant_of.rb
-- lib/searchgasm/condition/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
+- lib/searchgasm/condition/nil.rb
 - lib/searchgasm/condition/sibling_of.rb
 - lib/searchgasm/condition/tree.rb
 - lib/searchgasm/conditions/base.rb
@@ -96,28 +100,33 @@ extra_rdoc_files:
 - lib/searchgasm/version.rb
 - lib/searchgasm.rb
 - README.rdoc
+- TODO.rdoc
 files: 
 - CHANGELOG.rdoc
 - examples/README.rdoc
 - init.rb
 - lib/searchgasm/active_record/associations.rb
 - lib/searchgasm/active_record/base.rb
+- lib/searchgasm/active_record/connection_adapters/mysql_adapter.rb
+- lib/searchgasm/active_record/connection_adapters/postgresql_adapter.rb
+- lib/searchgasm/active_record/connection_adapters/sqlite_adapter.rb
 - lib/searchgasm/condition/base.rb
 - lib/searchgasm/condition/begins_with.rb
+- lib/searchgasm/condition/blank.rb
 - lib/searchgasm/condition/child_of.rb
 - lib/searchgasm/condition/contains.rb
 - lib/searchgasm/condition/descendant_of.rb
 - lib/searchgasm/condition/does_not_equal.rb
+- lib/searchgasm/condition/during_evening.rb
 - lib/searchgasm/condition/ends_with.rb
 - lib/searchgasm/condition/equals.rb
 - lib/searchgasm/condition/greater_than.rb
 - lib/searchgasm/condition/greater_than_or_equal_to.rb
 - lib/searchgasm/condition/inclusive_descendant_of.rb
-- lib/searchgasm/condition/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
+- lib/searchgasm/condition/nil.rb
 - lib/searchgasm/condition/sibling_of.rb
 - lib/searchgasm/condition/tree.rb
 - lib/searchgasm/conditions/base.rb
@@ -165,6 +174,7 @@ files:
 - test/test_search_ordering.rb
 - test/test_search_pagination.rb
 - test/test_search_protection.rb
+- TODO.rdoc
 - searchgasm.gemspec
 has_rdoc: true
 homepage: http://github.com/binarylogic/searchgasm
@@ -186,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - "="
+  - - ">="
     - !ruby/object:Gem::Version 
       version: "1.2"
   version: 

data/test/test_active_record_base.rb

@@ -11,6 +11,7 @@ class TestActiveRecordBase < Test::Unit::TestCase
     assert_equal 1, Account.find(:first).id
     assert_equal [1,2,3], Account.find(:all, nil).map(&:id)
     assert_equal [1,2,3], Account.find(:all, {}).map(&:id)
+    assert_equal [1,2,3], Account.find(:all, :select => "id, name").map(&:id)
   end
   
   def test_standard_calculations

data/test/test_condition_base.rb

@@ -12,16 +12,18 @@ class TestConditionBase < Test::Unit::TestCase
     assert_equal nil, Searchgasm::Condition::Keywords.name_for_column(Account.columns_hash["id"])
   end
   
-  def test_ignore_blanks?
-    assert !Searchgasm::Condition::Equals.ignore_blanks?
-    assert Searchgasm::Condition::Keywords.ignore_blanks?
+  def test_ignore_meaningless?
+    assert !Searchgasm::Condition::Equals.ignore_meaningless?
+    assert Searchgasm::Condition::Keywords.ignore_meaningless?
+    assert !Searchgasm::Condition::DoesNotEqual.ignore_meaningless?
   end
   
-  def test_type_cast_value?
-    assert Searchgasm::Condition::Equals.type_cast_value?
-    assert Searchgasm::Condition::Keywords.type_cast_value?
-    assert !Searchgasm::Condition::IsNil.type_cast_value?
-    assert !Searchgasm::Condition::IsBlank.type_cast_value?
+  def test_type_cast_sql_type
+    assert_equal nil, Searchgasm::Condition::Equals.type_cast_sql_type
+    assert_equal nil, Searchgasm::Condition::Keywords.type_cast_sql_type
+    assert_equal "boolean", Searchgasm::Condition::Nil.type_cast_sql_type
+    assert_equal "boolean", Searchgasm::Condition::Blank.type_cast_sql_type
+    assert_equal nil, Searchgasm::Condition::GreaterThan.type_cast_sql_type
   end
   
   def test_string_column

data/test/test_condition_types.rb

@@ -6,6 +6,30 @@ class TestConditionTypes < Test::Unit::TestCase
     condition.value = "Binary"
     assert_equal condition.sanitize, ["\"accounts\".\"name\" LIKE ?", "Binary%"]
     
+    condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
+    condition.value = true
+    assert_equal condition.sanitize, "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = ''"
+    
+    condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
+    condition.value = false
+    assert_equal condition.sanitize, "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != ''"
+    
+    condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
+    condition.value = "true"
+    assert_equal condition.sanitize, "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = ''"
+    
+    condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
+    condition.value = "false"
+    assert_equal condition.sanitize, "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != ''"
+    
+    condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
+    condition.value = nil
+    assert_equal condition.sanitize, nil
+    
+    condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
+    condition.value = ""
+    assert_equal condition.sanitize, nil
+    
     condition = Searchgasm::Condition::ChildOf.new(User)
     condition.value = User.first.id
     assert_equal condition.sanitize, ["\"users\".\"parent_id\" = ?", User.first.id]
@@ -62,51 +86,27 @@ class TestConditionTypes < Test::Unit::TestCase
     condition.value = User.find(1)
     assert_equal condition.sanitize, ["(\"users\".\"id\" = ?) OR (\"users\".\"id\" = ? OR \"users\".\"id\" = ?)", 1, 2, 3]
     
-    condition = Searchgasm::Condition::IsBlank.new(Account, Account.columns_hash["id"])
-    condition.value = true
-    assert_equal condition.sanitize, "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = ''"
-    
-    condition = Searchgasm::Condition::IsBlank.new(Account, Account.columns_hash["id"])
-    condition.value = false
-    assert_equal condition.sanitize, "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != ''"
-    
-    condition = Searchgasm::Condition::IsBlank.new(Account, Account.columns_hash["id"])
-    condition.value = "true"
-    assert_equal condition.sanitize, "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = ''"
-    
-    condition = Searchgasm::Condition::IsBlank.new(Account, Account.columns_hash["id"])
-    condition.value = "false"
-    assert_equal condition.sanitize, "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != ''"
-    
-    condition = Searchgasm::Condition::IsBlank.new(Account, Account.columns_hash["id"])
-    condition.value = nil
-    assert_equal condition.sanitize, nil
-    
-    condition = Searchgasm::Condition::IsBlank.new(Account, Account.columns_hash["id"])
-    condition.value = ""
-    assert_equal condition.sanitize, nil
-    
-    condition = Searchgasm::Condition::IsNil.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Nil.new(Account, Account.columns_hash["id"])
     condition.value = true
     assert_equal condition.sanitize, "\"accounts\".\"id\" is NULL"
     
-    condition = Searchgasm::Condition::IsNil.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Nil.new(Account, Account.columns_hash["id"])
     condition.value = false
     assert_equal condition.sanitize, "\"accounts\".\"id\" is NOT NULL"
     
-    condition = Searchgasm::Condition::IsNil.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Nil.new(Account, Account.columns_hash["id"])
     condition.value = "true"
     assert_equal condition.sanitize, "\"accounts\".\"id\" is NULL"
     
-    condition = Searchgasm::Condition::IsNil.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Nil.new(Account, Account.columns_hash["id"])
     condition.value = "false"
     assert_equal condition.sanitize, "\"accounts\".\"id\" is NOT NULL"
     
-    condition = Searchgasm::Condition::IsNil.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Nil.new(Account, Account.columns_hash["id"])
     condition.value = nil
     assert_equal condition.sanitize, nil
     
-    condition = Searchgasm::Condition::IsNil.new(Account, Account.columns_hash["id"])
+    condition = Searchgasm::Condition::Nil.new(Account, Account.columns_hash["id"])
     condition.value = ""
     assert_equal condition.sanitize, nil
     

data/test/test_conditions_base.rb

@@ -22,6 +22,7 @@ class TestConditionsBase < Test::Unit::TestCase
     assert !Searchgasm::Conditions::Base.needed?(User, {})
     assert !Searchgasm::Conditions::Base.needed?(User, {:first_name => "Ben"})
     assert Searchgasm::Conditions::Base.needed?(User, {:first_name_contains => "Awesome"})
+    assert !Searchgasm::Conditions::Base.needed?(User, {"orders.id" => 2})
   end
   
   def test_initialize

data/test/test_search_base.rb

@@ -180,6 +180,10 @@ class TestSearchBase < Test::Unit::TestCase
     assert_equal [Account.find(1)], search.find(:all)
     assert_equal Account.find(1), search.first
     assert_equal Account.find(1), search.find(:first)
+    
+    search = Account.new_search
+    search.select = "id, name"
+    assert_equal Account.all, search.all
   end
 
   def test_calculations

data/test/test_search_ordering.rb

@@ -1,6 +1,18 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestSearchOrdering < Test::Unit::TestCase
+  def test_order_to_order_by
+    search = Account.new_search
+    search.order = "name"
+    assert_equal "name", search.order_by
+    search.order = "users.first_name"
+    assert_equal({"users" => "first_name"}, search.order_by)
+    search.order = "\"users\".\"first_name\""
+    assert_equal({"users" => "first_name"}, search.order_by)
+    search.order = "\"users\".\"first_name\", name ASC"
+    assert_equal([{"users" => "first_name"}, "name"], search.order_by)
+  end
+  
   def test_order_by
     search = Account.new_search
     assert_equal nil, search.order
@@ -55,7 +67,8 @@ class TestSearchOrdering < Test::Unit::TestCase
     search = Account.new_search
     assert_equal nil, search.order
     assert_equal nil, search.order_as
-    assert !search.asc?
+    assert search.asc?
+    assert !search.desc?
     
     search.order_as = "DESC"
     assert_equal nil, search.order_as

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-26 00:00:00 -04:00
+date: 2008-09-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,22 +52,26 @@ extra_rdoc_files:
 - CHANGELOG.rdoc
 - lib/searchgasm/active_record/associations.rb
 - lib/searchgasm/active_record/base.rb
+- lib/searchgasm/active_record/connection_adapters/mysql_adapter.rb
+- lib/searchgasm/active_record/connection_adapters/postgresql_adapter.rb
+- lib/searchgasm/active_record/connection_adapters/sqlite_adapter.rb
 - lib/searchgasm/condition/base.rb
 - lib/searchgasm/condition/begins_with.rb
+- lib/searchgasm/condition/blank.rb
 - lib/searchgasm/condition/child_of.rb
 - lib/searchgasm/condition/contains.rb
 - lib/searchgasm/condition/descendant_of.rb
 - lib/searchgasm/condition/does_not_equal.rb
+- lib/searchgasm/condition/during_evening.rb
 - lib/searchgasm/condition/ends_with.rb
 - lib/searchgasm/condition/equals.rb
 - lib/searchgasm/condition/greater_than.rb
 - lib/searchgasm/condition/greater_than_or_equal_to.rb
 - lib/searchgasm/condition/inclusive_descendant_of.rb
-- lib/searchgasm/condition/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
+- lib/searchgasm/condition/nil.rb
 - lib/searchgasm/condition/sibling_of.rb
 - lib/searchgasm/condition/tree.rb
 - lib/searchgasm/conditions/base.rb
@@ -93,28 +97,33 @@ extra_rdoc_files:
 - lib/searchgasm/version.rb
 - lib/searchgasm.rb
 - README.rdoc
+- TODO.rdoc
 files: 
 - CHANGELOG.rdoc
 - examples/README.rdoc
 - init.rb
 - lib/searchgasm/active_record/associations.rb
 - lib/searchgasm/active_record/base.rb
+- lib/searchgasm/active_record/connection_adapters/mysql_adapter.rb
+- lib/searchgasm/active_record/connection_adapters/postgresql_adapter.rb
+- lib/searchgasm/active_record/connection_adapters/sqlite_adapter.rb
 - lib/searchgasm/condition/base.rb
 - lib/searchgasm/condition/begins_with.rb
+- lib/searchgasm/condition/blank.rb
 - lib/searchgasm/condition/child_of.rb
 - lib/searchgasm/condition/contains.rb
 - lib/searchgasm/condition/descendant_of.rb
 - lib/searchgasm/condition/does_not_equal.rb
+- lib/searchgasm/condition/during_evening.rb
 - lib/searchgasm/condition/ends_with.rb
 - lib/searchgasm/condition/equals.rb
 - lib/searchgasm/condition/greater_than.rb
 - lib/searchgasm/condition/greater_than_or_equal_to.rb
 - lib/searchgasm/condition/inclusive_descendant_of.rb
-- lib/searchgasm/condition/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
+- lib/searchgasm/condition/nil.rb
 - lib/searchgasm/condition/sibling_of.rb
 - lib/searchgasm/condition/tree.rb
 - lib/searchgasm/conditions/base.rb
@@ -162,6 +171,7 @@ files:
 - test/test_search_ordering.rb
 - test/test_search_pagination.rb
 - test/test_search_protection.rb
+- TODO.rdoc
 - searchgasm.gemspec
 has_rdoc: true
 homepage: http://github.com/binarylogic/searchgasm
@@ -183,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - "="
+  - - ">="
     - !ruby/object:Gem::Version 
       version: "1.2"
   version: 

data/lib/searchgasm/condition/is_nil.rb

@@ -1,23 +0,0 @@
-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