searchgasm 1.1.1 → 1.1.2

data/lib/searchgasm/search/conditions.rb

@@ -9,7 +9,7 @@ module Searchgasm
         klass.class_eval do
           alias_method_chain :initialize, :conditions
           alias_method_chain :conditions=, :conditions
-          alias_method_chain :include, :conditions
+          alias_method_chain :joins, :conditions
           alias_method_chain :sanitize, :conditions
         end
       end
@@ -33,7 +33,6 @@ module Searchgasm
       # now you can create the rest of your search and your "scope" will get merged into your final SQL.
       # What this does is determine if the value a hash or a conditions object, if not it sets it up as a scope.
       def conditions_with_conditions=(values)
-        
         case values
         when Searchgasm::Conditions::Base
           @conditions = values
@@ -42,13 +41,12 @@ module Searchgasm
         end
       end
       
-      # Tells searchgasm was relationships to include during the search. This is based on what conditions you set.
+      # Tells searchgasm what relationships to join during the search. This is based on what conditions you set.
       #
       # <b>Be careful!</b>
       # ActiveRecord associations can be an SQL train wreck. Make sure you think about what you are searching and that you aren't joining a table with a million records.
-      def include_with_conditions
-        includes = [include_without_conditions, conditions.includes].flatten.compact.uniq
-        includes.blank? ? nil : (includes.size == 1 ? includes.first : includes)
+      def joins_with_conditions
+        merge_joins(joins_without_conditions, conditions.joins)
       end
       
       def sanitize_with_conditions(searching = true) # :nodoc:
@@ -59,14 +57,6 @@ module Searchgasm
         end
         find_options
       end
-      
-      def scope # :nodoc:
-        conditions.scope
-      end
-      
-      def scope=(value) # :nodoc:
-        conditions.scope = value
-      end
     end
   end
 end

data/lib/searchgasm/search/ordering.rb

@@ -18,18 +18,19 @@ module Searchgasm
     module Ordering
       def self.included(klass)
         klass.class_eval do
-          alias_method_chain :include, :ordering
+          alias_method_chain :joins, :ordering
           alias_method_chain :order=, :ordering
         end
       end
       
-      def include_with_ordering # :nodoc:
-        includes = [include_without_ordering, order_by_includes].flatten.compact.uniq
-        includes.blank? ? nil : (includes.size == 1 ? includes.first : includes)
+      def joins_with_ordering # :nodoc:
+        merge_joins(joins_without_ordering, order_by_joins)
       end
       
       def order_with_ordering=(value) # :nodoc
         @order_by = nil
+        @order_as = nil
+        self.order_by_joins.clear
         self.order_without_ordering = value
       end
       
@@ -45,8 +46,7 @@ module Searchgasm
       
       # Determines how the search is being ordered: as DESC or ASC
       def order_as
-        return "ASC" if order.blank?
-        order =~ /ASC$/i ? "ASC" : "DESC"
+        @order_as ||= (order.blank? || order =~ /ASC$/i) ? "ASC" : "DESC"
       end
       
       # Sets how the results will be ordered: ASC or DESC
@@ -55,12 +55,12 @@ module Searchgasm
         raise(ArgumentError, "order_as only accepts a string as ASC or DESC") unless ["ASC", "DESC"].include?(value)
         
         if order.blank?
-          self.order = order_by_to_order(order_by, value)
+          @order = order_by_to_order(order_by, value)
         else
-          self.order.gsub!(/(ASC|DESC)/i, value)
+          @order.gsub!(/(ASC|DESC)/i, value)
         end
         
-        value
+        @order_as = value
       end
       
       # Determines by what columns the search is being ordered. This is nifty in that is reverse engineers the order SQL to determine this, only
@@ -84,9 +84,9 @@ module Searchgasm
               part
             end
           end.compact
-          order_parts.size <= 1 ? order_parts.first : order_parts
+          @order_by = order_parts.size <= 1 ? order_parts.first : order_parts
         else
-          klass.primary_key
+          @order_by = klass.primary_key
         end
       end
       
@@ -99,22 +99,23 @@ module Searchgasm
       #   order_by = :id # => users.id ASC
       #   order_by = [:id, name] # => users.id ASC, user.name ASC
       #   order_by = [:id, {:user_group => :name}] # => users.id ASC, user_groups.name ASC
-      def order_by=(value)        
+      def order_by=(value)  
+        self.order_by_joins.clear
         @order_by = get_order_by_value(value)
-        @order = order_by_to_order(@order_by, order_as) # use @order so @order_by doesnt get reset
+        @order = order_by_to_order(@order_by, order_as)
         @order_by
       end
       
-      # Returns the includes neccessary for the "order" statement so that we don't get an SQL error
-      def order_by_includes
-        @order_by_includes ||= []
-        @order_by_includes.compact!
-        @order_by_includes.uniq!
-        @order_by_includes
+      # Returns the joins neccessary for the "order" statement so that we don't get an SQL error
+      def order_by_joins
+        @order_by_joins ||= []
+        @order_by_joins.compact!
+        @order_by_joins.uniq!
+        @order_by_joins
       end
       
       private
-        def order_by_to_order(order_by, order_as, alt_klass = nil, new_includes = [])
+        def order_by_to_order(order_by, order_as, alt_klass = nil, new_joins = [])
           k = alt_klass || klass
           table_name = k.table_name
           sql_parts = []
@@ -127,23 +128,23 @@ module Searchgasm
             key = order_by.keys.first
             reflection = k.reflect_on_association(key.to_sym)
             value = order_by.values.first
-            new_includes << key.to_sym
-            sql_parts << order_by_to_order(value, order_as, reflection.klass, new_includes) # using eval, better performance, protection makes sure nothing fishy goes on here
+            new_joins << key.to_sym
+            sql_parts << order_by_to_order(value, order_as, reflection.klass, new_joins)
           when Symbol, String
-            new_include = build_order_by_includes(new_includes)
-            self.order_by_includes << new_include if new_include
+            new_join = build_order_by_joins(new_joins)
+            self.order_by_joins << new_join if new_join
             sql_parts << "#{quote_table_name(table_name)}.#{quote_column_name(order_by)} #{order_as}"
           end
           
           sql_parts.join(", ")
         end
         
-        def build_order_by_includes(includes)
-          return includes.first if includes.size <= 1
-          includes = includes.dup
+        def build_order_by_joins(joins)
+          return joins.first if joins.size <= 1
+          joins = joins.dup
           
-          key = includes.shift
-          {key => build_order_by_includes(includes)}
+          key = joins.shift
+          {key => build_order_by_joins(joins)}
         end
         
         def get_order_by_value(value)

data/lib/searchgasm/search/pagination.rb

@@ -15,38 +15,46 @@ module Searchgasm
       
       def limit_with_pagination=(value) # :nodoc:
         r_value = self.limit_without_pagination = value
-        self.page = @page unless @page.nil? # retry page now that the limit has changed
+        @page_count = nil
+        if @set_page
+          self.page = (@queued_page || @page) # retry setting page
+        else
+          @page = nil # the memoized page is invalid, so reset it
+        end
         r_value
       end
       
       def offset_with_pagination=(value) #:nodoc
         r_value = self.offset_without_pagination = value
-        @page = nil
+        @set_page = @queued_page = @page = nil
         r_value
       end
       
       # The current page that the search is on
       def page
-        return 1 if offset.blank? || limit.blank?
-        (offset.to_f / limit).floor + 1
+        @page ||= (offset.blank? || limit.blank?) ? 1 : (offset.to_f / limit).floor + 1
       end
       alias_method :current_page, :page
       
       # Lets you change the page for the next search
       def page=(value)
-        # Have to use @offset, since self.offset= resets @page
+        @set_page = true
+        
         if value.blank?
           value = nil
           @page = value
-          return @offset = value
+          return @offset = @page
         end
         
         v = value.to_i
-        @page = v
         
         if limit.blank?
+          @queued_page = v
+          @page = 1
           @offset = nil
         else
+          @queued_page = nil
+          @page = v
           v -= 1 unless v == 0
           @offset = v * limit
         end
@@ -55,9 +63,7 @@ module Searchgasm
       
       # The total number of pages in your next search
       def page_count
-        return 1 if per_page.blank? || per_page <= 0
-        # Letting AR caching kick in with the count query
-        (count / per_page.to_f).ceil
+        @page_count ||= (per_page.blank? || per_page <= 0) ? 1 : (count / per_page.to_f).ceil
       end
       alias_method :page_total, :page_count
       

data/lib/searchgasm/shared/searching.rb

@@ -9,30 +9,32 @@ module Searchgasm
       SEARCH_METHODS = [:all, :find, :first]
       CALCULATION_METHODS = [:average, :calculate, :count, :maximum, :minimum, :sum]
       
-      # Setup methods for searching
-      SEARCH_METHODS.each do |method|
-        class_eval <<-"end_eval", __FILE__, __LINE__
-          def #{method}(*args)
-            options = args.extract_options!
-            klass.send(:with_scope, :find => options) do
-              args << (self.class < Searchgasm::Conditions::Base ? {:conditions => sanitize} : sanitize)
-              klass.#{method}(*args)
-            end
-          end
-        end_eval
+      def self.included(klass)
+        klass.class_eval do
+          attr_accessor :scope
+        end
       end
-
-      # Setup methods for calculating
-      CALCULATION_METHODS.each do |method|
+      
+      (SEARCH_METHODS + CALCULATION_METHODS).each do |method|
         class_eval <<-"end_eval", __FILE__, __LINE__
           def #{method}(*args)
+            find_options = {}
             options = args.extract_options!
-            klass.send(:with_scope, :find => options) do
-              find_options = (self.class < Searchgasm::Conditions::Base ? {:conditions => sanitize} : sanitize(false))
-              [:select, :limit, :offset].each { |option| find_options.delete(option) }
-              args << find_options
-              klass.#{method}(*args)
+            with_scopes = [scope, (self.class < Searchgasm::Conditions::Base ? {:conditions => sanitize} : sanitize(#{SEARCH_METHODS.include?(method)})), options].compact
+            with_scopes.each do |with_scope|
+              klass.send(:with_scope, :find => find_options) do
+                klass.send(:with_scope, :find => with_scope) do
+                  find_options = klass.send(:scope, :find)
+                end
+              end
+            end
+            
+            if self.class < Searchgasm::Search::Base
+              (find_options.symbolize_keys.keys - #{SEARCH_METHODS.include?(method) ? "Search::Base::AR_FIND_OPTIONS" : "Search::Base::AR_CALCULATIONS_OPTIONS"}).each { |option| find_options.delete(option) }
             end
+            
+            args << find_options
+            klass.#{method}(*args)
           end
         end_eval
       end

data/lib/searchgasm/shared/utilities.rb

@@ -27,6 +27,24 @@ module Searchgasm
         
           [conditions_str, *conditions_subs]
         end
+        
+        def merge_joins(*joins)
+          joins.delete_if { |join| join.blank? }
+          return if joins.blank?
+          return joins.first if joins.size == 1
+          
+          new_joins = []
+          joins.each do |join|
+            case join
+            when Array
+              new_joins += join
+            else
+              new_joins << join
+            end
+          end
+          
+          new_joins.compact.uniq
+        end
     end
   end
 end

data/lib/searchgasm/version.rb

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

data/lib/searchgasm.rb

@@ -39,6 +39,8 @@ 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"
@@ -74,7 +76,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, :keywords, :less_than, :less_than_or_equal_to, :sibling_of].each do |condition|
+    [: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|
       Base.register_condition("Searchgasm::Condition::#{condition.to_s.camelize}".constantize)
     end
   end

data/searchgasm.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Searchgasm-1.1.1
+# Gem::Specification for Searchgasm-1.1.2
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
 autorequire: 
 bindir: bin
 
-date: 2008-09-19 00:00:00 -04:00
+date: 2008-09-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,7 +55,6 @@ extra_rdoc_files:
 - CHANGELOG.rdoc
 - 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
@@ -67,6 +66,8 @@ extra_rdoc_files:
 - 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
@@ -82,16 +83,13 @@ extra_rdoc_files:
 - 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
@@ -104,7 +102,6 @@ files:
 - 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
@@ -116,6 +113,8 @@ files:
 - 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
@@ -131,16 +130,13 @@ files:
 - 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/test/test_active_record_associations.rb

@@ -16,10 +16,10 @@ class TestActiveRecordAssociations < Test::Unit::TestCase
     search = Account.find(1).users.build_search
     assert_kind_of Searchgasm::Search::Base, search
     assert_equal User, search.klass
-    assert_equal "\"users\".account_id = 1", search.conditions.sql
+    assert_equal({:conditions => "\"users\".account_id = 1"}, search.scope)
     
     search.conditions.first_name_contains = "Ben"
-    assert_equal({:conditions => ["(\"users\".\"first_name\" LIKE ?) AND (\"users\".account_id = 1)", "%Ben%"]}, search.sanitize)
+    assert_equal({:conditions => ["\"users\".\"first_name\" LIKE ?", "%Ben%"]}, search.sanitize)
   end
   
   def test_searching

data/test/test_condition_base.rb

@@ -49,10 +49,10 @@ class TestConditionBase < Test::Unit::TestCase
   
   def test_ignore_blanks?
     condition = Searchgasm::Condition::Equals.new(Account, Account.columns_hash["id"])
-    assert !condition.ignore_blanks?
+    assert !condition.class.ignore_blanks?
     
     condition = Searchgasm::Condition::Keywords.new(Account, Account.columns_hash["name"])
-    assert condition.ignore_blanks?
+    assert condition.class.ignore_blanks?
   end
   
   def test_value

data/test/test_condition_types.rb

@@ -73,6 +73,54 @@ 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.value = true
+    assert_equal condition.sanitize, "\"accounts\".\"id\" is NULL"
+    
+    condition = Searchgasm::Condition::IsNil.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.value = "true"
+    assert_equal condition.sanitize, "\"accounts\".\"id\" is NULL"
+    
+    condition = Searchgasm::Condition::IsNil.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.value = nil
+    assert_equal condition.sanitize, nil
+    
+    condition = Searchgasm::Condition::IsNil.new(Account, Account.columns_hash["id"])
+    condition.value = ""
+    assert_equal condition.sanitize, nil
+    
     condition = Searchgasm::Condition::Keywords.new(Account, Account.columns_hash["name"])
     condition.value = "freedom yeah, freedom YEAH right"
     assert_equal condition.sanitize, ["\"accounts\".\"name\" LIKE ? AND \"accounts\".\"name\" LIKE ? AND \"accounts\".\"name\" LIKE ?", "%freedom%", "%yeah%", "%right%"]

data/test/test_conditions_base.rb

@@ -71,18 +71,18 @@ class TestConditionsBase < Test::Unit::TestCase
     assert_equal conditions.users.last_name_begins_with, "Ben"
   end
   
-  def test_includes
+  def test_joins
     conditions = Account.new_conditions
-    assert_equal conditions.includes, nil
+    assert_equal conditions.joins, nil
     
     conditions.name_like = "Binary"
-    assert_equal conditions.includes, nil
+    assert_equal conditions.joins, nil
     
     conditions.users.first_name_like = "Ben"
-    assert_equal conditions.includes, :users
+    assert_equal conditions.joins, :users
     
     conditions.users.orders.description_like = "apple"
-    assert_equal conditions.includes, {:users => :orders} 
+    assert_equal conditions.joins, {:users => :orders} 
   end
   
   def test_objects

data/test/test_search_base.rb

@@ -109,20 +109,20 @@ class TestSearchBase < Test::Unit::TestCase
     assert_equal search.lock, true
   end
 
-  def test_include
+  def test_joins
     search = Account.new_search
-    assert_equal nil, search.include
+    assert_equal nil, search.joins
     search.conditions.name_contains = "Binary"
-    assert_equal nil, search.include
+    assert_equal nil, search.joins
     search.conditions.users.first_name_contains = "Ben"
-    assert_equal(:users, search.include)
+    assert_equal(:users, search.joins)
     search.conditions.users.orders.id_gt = 2
-    assert_equal({:users => :orders}, search.include)
+    assert_equal({:users => :orders}, search.joins)
     search.conditions.users.reset_orders!
-    assert_equal(:users, search.include)
+    assert_equal(:users, search.joins)
     search.conditions.users.orders.id_gt = 2
     search.conditions.reset_users!
-    assert_equal nil, search.include
+    assert_equal nil, search.joins
   end
 
   def test_limit
@@ -151,7 +151,7 @@ class TestSearchBase < Test::Unit::TestCase
     search.conditions.users.id_greater_than = 2
     search.page = 3
     search.readonly = true
-    assert_equal({:include => :users, :offset => 4, :readonly => true, :conditions => ["(\"accounts\".\"name\" LIKE ?) AND (\"users\".\"id\" > ?)", "%Binary%", 2], :limit => 2 }, search.sanitize)
+    assert_equal({:joins => :users, :group => "\"accounts\".\"id\"", :offset => 4, :readonly => true, :conditions => ["(\"accounts\".\"name\" LIKE ?) AND (\"users\".\"id\" > ?)", "%Binary%", 2], :limit => 2 }, search.sanitize)
   end
 
   def test_scope

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-19 00:00:00 -04:00
+date: 2008-09-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,7 +52,6 @@ extra_rdoc_files:
 - CHANGELOG.rdoc
 - 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
@@ -64,6 +63,8 @@ extra_rdoc_files:
 - 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
@@ -79,16 +80,13 @@ extra_rdoc_files:
 - 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
@@ -101,7 +99,6 @@ files:
 - 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
@@ -113,6 +110,8 @@ files:
 - 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
@@ -128,16 +127,13 @@ files:
 - 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