searchgasm 1.5.2 → 1.5.3

data/CHANGELOG.rdoc

@@ -1,6 +1,15 @@
+== 1.5.3 released 2008-10-21
+
+* Removed ilike conditions and let the like condition determine if it should use like or ilike depending on the connection adapter.
+* Fixed bug where the keywords condition was removing foreign characters.
+* Added configuration option for specifying your javascript library, to cut down on the javascript Searchgasm adds into the form helpers
+* Fixed bug with "not" conditions to use sanitize method, like it should, instead of to_conditions.
+* Only pass :distinct option for the count calculation
+* Fixed not_nil and not_blank conditions to use boolean values configuration option.
+
 == 1.5.2 released 2008-10-21
 
-* Added ilike conditons
+* Added ilike conditions
 * Removed configatron dependency (was accidentally added)
 
 == 1.5.1 released 2008-10-20

data/Manifest

@@ -15,7 +15,6 @@ 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/ilike.rb
 lib/searchgasm/condition/inclusive_descendant_of.rb
 lib/searchgasm/condition/keywords.rb
 lib/searchgasm/condition/less_than.rb
@@ -27,7 +26,6 @@ lib/searchgasm/condition/not_blank.rb
 lib/searchgasm/condition/not_end_with.rb
 lib/searchgasm/condition/not_equal.rb
 lib/searchgasm/condition/not_have_keywords.rb
-lib/searchgasm/condition/not_ilike.rb
 lib/searchgasm/condition/not_like.rb
 lib/searchgasm/condition/not_nil.rb
 lib/searchgasm/condition/sibling_of.rb

data/README.rdoc

@@ -35,7 +35,7 @@ Now try out some of the examples below:
       :first_name_contains => "Ben",          # first_name like '%Ben%'
       :email_ends_with => "binarylogic.com",  # email like '%binarylogic.com'
       :created_after => Time.now,             # created_at > Time.now
-      :created_at_hour_gt => 5                # HOUR(created_at) > 5 (depends on DB type)
+      :hour_of_created_at => 5                # HOUR(created_at) > 5 (depends on DB type)
     },
     :per_page => 20,                        # limit 20
     :page => 3,                             # offset 40, which starts us on page 3
@@ -49,7 +49,7 @@ same as above, but object based
   search.conditions.first_name_contains = "Ben"
   search.conditions.email_ends_with = "binarylogic.com"
   search.conditions.created_after = Time.now
-  search.conditiona.created_at_hour_gt = 5
+  search.conditiona.hour_of_created_at = 5
   search.per_page = 20
   search.page = 3
   search.order_as = "ASC"

data/lib/searchgasm.rb

@@ -44,7 +44,7 @@ require "searchgasm/conditions/base"
 # Condition
 require "searchgasm/condition/base"
 require "searchgasm/condition/tree"
-SEARCHGASM_CONDITIONS = [:begins_with, :blank, :child_of, :descendant_of, :ends_with, :equals, :greater_than, :greater_than_or_equal_to, :inclusive_descendant_of, :ilike, :like, :nil, :not_begin_with, :not_blank, :not_end_with, :not_equal, :not_have_keywords, :not_ilike, :not_nil, :keywords, :less_than, :less_than_or_equal_to, :sibling_of]
+SEARCHGASM_CONDITIONS = [:begins_with, :blank, :child_of, :descendant_of, :ends_with, :equals, :greater_than, :greater_than_or_equal_to, :inclusive_descendant_of, :like, :nil, :not_begin_with, :not_blank, :not_end_with, :not_equal, :not_have_keywords, :not_nil, :keywords, :less_than, :less_than_or_equal_to, :sibling_of]
 SEARCHGASM_CONDITIONS.each { |condition| require "searchgasm/condition/#{condition}" }
 
 # Modifiers

data/lib/searchgasm/condition/base.rb

@@ -110,6 +110,10 @@ module Searchgasm
       end
       
       private
+        def like_condition_name
+          @like_condition_name ||= klass.connection.adapter_name == "PostgreSQL" ? "ILIKE" : "LIKE"
+        end
+        
         def meaningless?(v)
           case v
           when Array

data/lib/searchgasm/condition/blank.rb

@@ -11,9 +11,9 @@ module Searchgasm
       
       def to_conditions(value)
         if value == true
-          "#{column_sql} is NULL or #{column_sql} = '' or #{column_sql} = false"
+          "#{column_sql} IS NULL or #{column_sql} = '' or #{column_sql} = false"
         elsif value == false
-          "#{column_sql} is NOT NULL and #{column_sql} != '' and #{column_sql} != false"
+          "#{column_sql} IS NOT NULL and #{column_sql} != '' and #{column_sql} != false"
         end
       end
     end

data/lib/searchgasm/condition/keywords.rb

@@ -5,6 +5,7 @@ module Searchgasm
       self.join_arrays_with_or = true
       
       BLACKLISTED_WORDS = ('a'..'z').to_a + ["about", "an", "are", "as", "at", "be", "by", "com", "de", "en", "for", "from", "how", "in", "is", "it", "la", "of", "on", "or", "that", "the", "the", "this", "to", "und", "was", "what", "when", "where", "who", "will", "with", "www"] # from ranks.nl        
+      FOREIGN_CHARACTERS = 'àáâãäåßéèêëìíîïñòóôõöùúûüýÿ'
       
       class << self
         def condition_names_for_column
@@ -16,16 +17,31 @@ module Searchgasm
         strs = []
         subs = []
         
-        search_parts = value.gsub(/,/, " ").split(/ /).collect { |word| word.downcase.gsub(/[^[:alnum:]]/, ''); }.uniq.select { |word| !BLACKLISTED_WORDS.include?(word.downcase) && !word.blank? }
+        search_parts = value.gsub(/,/, " ").split(/ /)
+        replace_non_alnum_characters!(search_parts)
+        search_parts.uniq!
+        remove_blacklisted_words!(search_parts)
         return if search_parts.blank?
         
         search_parts.each do |search_part|
-          strs << "#{column_sql} LIKE ?"
+          strs << "#{column_sql} #{like_condition_name} ?"
           subs << "%#{search_part}%"
         end
         
         [strs.join(" AND "), *subs]
       end
+      
+      private
+        def replace_non_alnum_characters!(search_parts)
+          search_parts.each do |word|
+            word.downcase!
+            word.gsub!(/[^[:alnum:]#{FOREIGN_CHARACTERS}]/, '')
+          end
+        end
+        
+        def remove_blacklisted_words!(search_parts)
+          search_parts.delete_if { |word| word.blank? || BLACKLISTED_WORDS.include?(word.downcase) }
+        end
     end
   end
 end

data/lib/searchgasm/condition/like.rb

@@ -8,7 +8,7 @@ module Searchgasm
       end
       
       def to_conditions(value)
-        ["#{column_sql} LIKE ?", "%#{value}%"]
+        ["#{column_sql} #{like_condition_name} ?", "%#{value}%"]
       end
     end
   end

data/lib/searchgasm/condition/nil.rb

@@ -11,9 +11,9 @@ module Searchgasm
       
       def to_conditions(value)
         if value == true
-          "#{column_sql} is NULL"
+          "#{column_sql} IS NULL"
         elsif value == false
-          "#{column_sql} is NOT NULL"
+          "#{column_sql} IS NOT NULL"
         end
       end
     end

data/lib/searchgasm/condition/not_begin_with.rb

@@ -10,7 +10,7 @@ module Searchgasm
       def to_conditions(value)
         begin_with = BeginWith.new(klass, options)
         begin_with.value = value
-        conditions = being_with.to_conditions
+        conditions = being_with.sanitize
         return conditions if conditions.blank?
         conditions.first.gsub!(" LIKE ", " NOT LIKE ")
         conditions

data/lib/searchgasm/condition/not_blank.rb

@@ -1,6 +1,8 @@
 module Searchgasm
   module Condition
     class NotBlank < Base
+      self.value_type = :boolean
+      
       class << self
         def condition_names_for_column
           super + ["is_not_blank"]
@@ -10,7 +12,7 @@ module Searchgasm
       def to_conditions(value)
         blank = Blank.new(klass, options)
         blank.value = !value
-        blank.to_conditions
+        blank.sanitize
       end
     end
   end

data/lib/searchgasm/condition/not_end_with.rb

@@ -10,7 +10,7 @@ module Searchgasm
       def to_conditions(value)
         ends_with = EndsWith.new(klass, options)
         ends_with.value = value
-        conditions = ends_with.to_conditions
+        conditions = ends_with.sanitize
         return conditions if conditions.blank?
         conditions.first.gsub!(" LIKE ", " NOT LIKE ")
         conditions

data/lib/searchgasm/condition/not_equal.rb

@@ -14,7 +14,6 @@ module Searchgasm
         # Delegate to equals and then change
         condition = Equals.new(klass, options)
         condition.value = value
-        
         conditions_array = condition.sanitize
         conditions_array.first.gsub!(/ IS /, " IS NOT ")
         conditions_array.first.gsub!(/ BETWEEN /, " NOT BETWEEN ")

data/lib/searchgasm/condition/not_have_keywords.rb

@@ -10,9 +10,9 @@ module Searchgasm
       def to_conditions(value)
         keywords = Keywords.new(klass, options)
         keywords.value = value
-        conditions = keywords.to_conditions
+        conditions = keywords.sanitize
         return conditions if conditions.blank?
-        conditions.first.gsub!(" LIKE ", " NOT LIKE ")
+        conditions.first.gsub!(" #{like_condition_name} ", " NOT #{like_condition_name} ")
         conditions
       end
     end

data/lib/searchgasm/condition/not_like.rb

@@ -10,9 +10,9 @@ module Searchgasm
       def to_conditions(value)
         like = Like.new(klass, options)
         like.value = value
-        conditions = like.to_conditions
+        conditions = like.sanitize
         return conditions if conditions.blank?
-        conditions.first.gsub!(" LIKE ", " NOT LIKE ")
+        conditions.first.gsub!(" #{like_condition_name} ", " NOT #{like_condition_name} ")
         conditions
       end
     end

data/lib/searchgasm/condition/not_nil.rb

@@ -1,6 +1,8 @@
 module Searchgasm
   module Condition
     class NotNil < Base
+      self.value_type = :boolean
+      
       class << self
         def condition_names_for_column
           super + ["is_not_nil", "is_not_null", "not_null"]
@@ -10,7 +12,7 @@ module Searchgasm
       def to_conditions(value)
         is_nil = Nil.new(klass, options)
         is_nil.value = !value
-        is_nil.to_conditions
+        is_nil.sanitize
       end
     end
   end

data/lib/searchgasm/config/helpers.rb

@@ -17,6 +17,16 @@ module Searchgasm
           @hidden_fields ||= (Searchgasm::Search::Base::SPECIAL_FIND_OPTIONS - [:page, :priority_order])
         end
         attr_writer :hidden_fields
+        
+        # Searchgasm does some javascript magic when you use the form helpers with a Searchgasm object. To make configuration easier Searchgasm checks for the existence of Prototype and jQuery and uses the first
+        # one it finds. To cut back on the javascript output you can specify your library here.
+        #
+        # * <tt>Default:</tt> nil
+        # * <tt>Accepts:</tt> :prototype or :jquery
+        def javascript_library
+          @javascript_library
+        end
+        attr_writer :javascript_library
       
         # The class name for used in the order_as_link helper
         #

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

@@ -228,7 +228,7 @@ module Searchgasm
             
             if span
               searchgasm_add_class!(options[:html], Config.helpers.page_links_disabled_class_name)
-              searchgasm_add_class!(options[:html], "page")
+              searchgasm_add_class!(options[:html], Config.helpers.page_link_class_name)
             end
             options[:text] = text
             span ? content_tag(:span, text, options[:html]) : page_link(page, options)

data/lib/searchgasm/helpers/form.rb

@@ -13,16 +13,16 @@ module Searchgasm
     #   form_for([:admin, @search]) # is equivalent to form_for(:search, @search, :url => admin_addresses_path)
     #   form_for(:search, @search, :url => whatever_path)
     #
-    # The goal was to mimic ActiveRecord. You can also pass a Searchgasm::Conditions::Base object as well and it will function the same way.
+    # The goal was to mimic how ActiveRecord objects are treated. You can also pass a Searchgasm::Conditions::Base object as well and it will function the same way.
     #
     # === Automatic hidden fields generation
     #
-    # If you pass a Searchgasm::Search::Base object it automatically adds the :order_by, :order_as, and :per_page hidden fields. This is done so that when someone
-    # creates a new search, their options are remembered. It keeps the search consisten and is much more user friendly. If you want to override this you can pass the
+    # If you pass a Searchgasm::Search::Base object it automatically adds the :order_by, :order_as, :priority_order_by, :priority_order_as, and :per_page hidden fields. This is done so that when someone
+    # creates a new search, their options are remembered. It keeps the search consistent and is much more user friendly. If you want to override this you can pass the
     # following options or you can set this up in your configuration, see Searchgasm::Config for more details.
     #
-    # Lastly some light javascript is added to the "onsubmit" action. You will notice the order_by, per_page, and page helpers also add in a single hidden tag in the page. The form
-    # finds these elements, gets their values and updates its hidden fields so that the correct values will be submitted during the search. The end result is having the "ordering" and "per page" options remembered.
+    # Lastly some light javascript is added to the "onsubmit" action. You will notice that the control type helpers add in hidden fields in the page, as a way to declare its "state". The form
+    # finds these elements, gets their values and updates its hidden fields so that the correct values will be submitted during the search. The end result is having these search options remembered.
     #
     # === Options
     #
@@ -90,12 +90,13 @@ module Searchgasm
               if !search_options[:hidden_fields].blank?
                 options[:html][:onsubmit] ||= ""
                 options[:html][:onsubmit] += ";"
-              
-                javascript = "if(typeof(Prototype) != 'undefined') {"
-                search_options[:hidden_fields].each { |field| javascript += "field = $('#{name}_#{field}'); if(field) { $('#{name}_#{field}_hidden').value = field.value; }" }
-                javascript += "} else if(typeof(jQuery) != 'undefined') {"
-                search_options[:hidden_fields].each { |field| javascript += "field = $('##{name}_#{field}'); if(field) { $('##{name}_#{field}_hidden').val(field.val()); }" }
-                javascript += "}"
+                
+                javascript = ""
+                javascript += "if(typeof(Prototype) != 'undefined') {" if Config.helpers.javascript_library.blank?
+                search_options[:hidden_fields].each { |field| javascript += "field = $('#{name}_#{field}'); if(field) { $('#{name}_#{field}_hidden').value = field.value; }" } if Config.helpers.javascript_library.blank? || Config.helpers.javascript_library == :prototype
+                javascript += "} else if(typeof(jQuery) != 'undefined') {" if Config.helpers.javascript_library.blank?
+                search_options[:hidden_fields].each { |field| javascript += "field = $('##{name}_#{field}'); if(field) { $('##{name}_#{field}_hidden').val(field.val()); }" } if Config.helpers.javascript_library.blank? || Config.helpers.javascript_library == :jquery
+                javascript += "}" if Config.helpers.javascript_library.blank?
               
                 options[:html][:onsubmit] += javascript
               end
@@ -127,7 +128,7 @@ module Searchgasm
               # For edge rails and older version compatibility, passing a binding to concat was deprecated
               begin
                 concat(html)
-              rescue ArgumentError
+              rescue ArgumentError, NameError
                 concat(html, block.binding)
               end
             end

data/lib/searchgasm/search/searching.rb

@@ -17,7 +17,7 @@ module Searchgasm
             klass.send(:with_scope, :find => acting_as_filter? ? {} : scope) do
               options = sanitize(#{SEARCH_METHODS.include?(method)})
               if #{CALCULATION_METHODS.include?(method)}
-                options[:distinct] = true
+                options[:distinct] = true if #{method == :count} && !joins.blank? && Config.search.remove_duplicates?
                 args[0] = klass.primary_key if [nil, :all].include?(args[0])
               end
               args << options

data/lib/searchgasm/version.rb

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

data/searchgasm.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Searchgasm-1.5.2
+# Gem::Specification for Searchgasm-1.5.3
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
 autorequire: 
 bindir: bin
 
-date: 2008-10-21 00:00:00 -04:00
+date: 2008-10-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,7 +67,6 @@ extra_rdoc_files:
 - lib/searchgasm/condition/equals.rb
 - lib/searchgasm/condition/greater_than.rb
 - lib/searchgasm/condition/greater_than_or_equal_to.rb
-- lib/searchgasm/condition/ilike.rb
 - lib/searchgasm/condition/inclusive_descendant_of.rb
 - lib/searchgasm/condition/keywords.rb
 - lib/searchgasm/condition/less_than.rb
@@ -79,7 +78,6 @@ extra_rdoc_files:
 - lib/searchgasm/condition/not_end_with.rb
 - lib/searchgasm/condition/not_equal.rb
 - lib/searchgasm/condition/not_have_keywords.rb
-- lib/searchgasm/condition/not_ilike.rb
 - lib/searchgasm/condition/not_like.rb
 - lib/searchgasm/condition/not_nil.rb
 - lib/searchgasm/condition/sibling_of.rb
@@ -168,7 +166,6 @@ files:
 - lib/searchgasm/condition/equals.rb
 - lib/searchgasm/condition/greater_than.rb
 - lib/searchgasm/condition/greater_than_or_equal_to.rb
-- lib/searchgasm/condition/ilike.rb
 - lib/searchgasm/condition/inclusive_descendant_of.rb
 - lib/searchgasm/condition/keywords.rb
 - lib/searchgasm/condition/less_than.rb
@@ -180,7 +177,6 @@ files:
 - lib/searchgasm/condition/not_end_with.rb
 - lib/searchgasm/condition/not_equal.rb
 - lib/searchgasm/condition/not_have_keywords.rb
-- lib/searchgasm/condition/not_ilike.rb
 - lib/searchgasm/condition/not_like.rb
 - lib/searchgasm/condition/not_nil.rb
 - lib/searchgasm/condition/sibling_of.rb

data/test/test_active_record_associations.rb

@@ -61,7 +61,7 @@ class TestActiveRecordAssociations < Test::Unit::TestCase
     
     assert_equal User.find(1, 2), search.all
     assert_equal User.find(1), search.first
-    assert_equal 1.5, search.average("id")
+    assert_equal (1.5).to_s, search.average("id").to_s
     assert_equal 2, search.count
     
     search.conditions.first_name_contains = "Ben"

data/test/test_condition_types.rb

@@ -8,19 +8,19 @@ class TestConditionTypes < Test::Unit::TestCase
     
     condition = Searchgasm::Condition::Blank.new(Account, :column => Account.columns_hash["id"])
     condition.value = "true"
-    assert_equal "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = '' or \"accounts\".\"id\" = false", condition.sanitize
+    assert_equal "\"accounts\".\"id\" IS NULL or \"accounts\".\"id\" = '' or \"accounts\".\"id\" = false", condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, :column => Account.columns_hash["id"])
     condition.value = "false"
-    assert_equal "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != '' and \"accounts\".\"id\" != false", condition.sanitize
+    assert_equal "\"accounts\".\"id\" IS NOT NULL and \"accounts\".\"id\" != '' and \"accounts\".\"id\" != false", condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, :column => Account.columns_hash["id"])
     condition.value = true
-    assert_equal "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = '' or \"accounts\".\"id\" = false", condition.sanitize
+    assert_equal "\"accounts\".\"id\" IS NULL or \"accounts\".\"id\" = '' or \"accounts\".\"id\" = false", condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, :column => Account.columns_hash["id"])
     condition.value = false
-    assert_equal "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != '' and \"accounts\".\"id\" != false", condition.sanitize
+    assert_equal "\"accounts\".\"id\" IS NOT NULL and \"accounts\".\"id\" != '' and \"accounts\".\"id\" != false", condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, :column => Account.columns_hash["id"])
     condition.value = nil
@@ -76,19 +76,19 @@ class TestConditionTypes < Test::Unit::TestCase
     
     condition = Searchgasm::Condition::Nil.new(Account, :column => Account.columns_hash["id"])
     condition.value = true
-    assert_equal "\"accounts\".\"id\" is NULL", condition.sanitize
+    assert_equal "\"accounts\".\"id\" IS NULL", condition.sanitize
     
     condition = Searchgasm::Condition::Nil.new(Account, :column => Account.columns_hash["id"])
     condition.value = false
-    assert_equal "\"accounts\".\"id\" is NOT NULL", condition.sanitize
+    assert_equal "\"accounts\".\"id\" IS NOT NULL", condition.sanitize
     
     condition = Searchgasm::Condition::Nil.new(Account, :column => Account.columns_hash["id"])
     condition.value = "true"
-    assert_equal "\"accounts\".\"id\" is NULL", condition.sanitize
+    assert_equal "\"accounts\".\"id\" IS NULL", condition.sanitize
     
     condition = Searchgasm::Condition::Nil.new(Account, :column => Account.columns_hash["id"])
     condition.value = "false"
-    assert_equal "\"accounts\".\"id\" is NOT NULL", condition.sanitize
+    assert_equal "\"accounts\".\"id\" IS NOT NULL", condition.sanitize
     
     condition = Searchgasm::Condition::Nil.new(Account, :column => Account.columns_hash["id"])
     condition.value = nil
@@ -110,6 +110,12 @@ class TestConditionTypes < Test::Unit::TestCase
     condition.value = (1..10)
     assert_equal ["\"accounts\".\"id\" NOT BETWEEN ? AND ?", 1, 10], condition.sanitize
     
+    condition = Searchgasm::Condition::NotNil.new(Account, :column => Account.columns_hash["created_at"])
+    condition.value = "1"
+    assert_equal "\"accounts\".\"created_at\" IS NOT NULL", condition.sanitize
+    condition.value = "false"
+    assert_equal "\"accounts\".\"created_at\" IS NULL", condition.sanitize
+    
     condition = Searchgasm::Condition::Keywords.new(Account, :column => Account.columns_hash["name"])
     condition.value = "freedom yeah, freedom YEAH right"
     assert_equal ["\"accounts\".\"name\" LIKE ? AND \"accounts\".\"name\" LIKE ? AND \"accounts\".\"name\" LIKE ?", "%freedom%", "%yeah%", "%right%"], condition.sanitize
@@ -118,6 +124,10 @@ class TestConditionTypes < Test::Unit::TestCase
     condition.value = "%^$*(^$)"
     assert_equal nil, condition.sanitize
     
+    condition = Searchgasm::Condition::Keywords.new(Account, :column => Account.columns_hash["name"])
+    condition.value = "%^$*(^$) àáâãäåßéèêëìíîïñòóôõöùúûüýÿ"
+    assert_equal ["\"accounts\".\"name\" LIKE ?", "%àáâãäåßéèêëìíîïñòóôõöùúûüýÿ%"], condition.sanitize
+    
     condition = Searchgasm::Condition::LessThan.new(Account, :column => Account.columns_hash["id"])
     condition.value = 2
     assert_equal ["\"accounts\".\"id\" < ?", 2], condition.sanitize

data/test/test_conditions_base.rb

@@ -171,9 +171,9 @@ class TestConditionsBase < Test::Unit::TestCase
     conditions.dow_of_created_at_most = 5
     assert_equal ["(strftime('%w', \"accounts\".\"created_at\") <= ?) AND (strftime('%H', \"accounts\".\"created_at\") > ?)", 5, 2], conditions.sanitize
     conditions.month_of_created_at_nil = true
-    assert_equal ["(strftime('%w', \"accounts\".\"created_at\") <= ?) AND (strftime('%H', \"accounts\".\"created_at\") > ?) AND (strftime('%m', \"accounts\".\"created_at\") is NULL)", 5, 2], conditions.sanitize
+    assert_equal ["(strftime('%w', \"accounts\".\"created_at\") <= ?) AND (strftime('%H', \"accounts\".\"created_at\") > ?) AND (strftime('%m', \"accounts\".\"created_at\") IS NULL)", 5, 2], conditions.sanitize
     conditions.min_of_hour_of_month_of_created_at_nil = true
-    assert_equal ["(strftime('%w', \"accounts\".\"created_at\") <= ?) AND (strftime('%H', \"accounts\".\"created_at\") > ?) AND (strftime('%m', strftime('%H', strftime('%M', \"accounts\".\"created_at\"))) is NULL) AND (strftime('%m', \"accounts\".\"created_at\") is NULL)", 5, 2], conditions.sanitize
+    assert_equal ["(strftime('%w', \"accounts\".\"created_at\") <= ?) AND (strftime('%H', \"accounts\".\"created_at\") > ?) AND (strftime('%m', strftime('%H', strftime('%M', \"accounts\".\"created_at\"))) IS NULL) AND (strftime('%m', \"accounts\".\"created_at\") IS NULL)", 5, 2], conditions.sanitize
   end
   
   def test_objects

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-21 00:00:00 -04:00
+date: 2008-10-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,6 @@ extra_rdoc_files:
 - lib/searchgasm/condition/equals.rb
 - lib/searchgasm/condition/greater_than.rb
 - lib/searchgasm/condition/greater_than_or_equal_to.rb
-- lib/searchgasm/condition/ilike.rb
 - lib/searchgasm/condition/inclusive_descendant_of.rb
 - lib/searchgasm/condition/keywords.rb
 - lib/searchgasm/condition/less_than.rb
@@ -76,7 +75,6 @@ extra_rdoc_files:
 - lib/searchgasm/condition/not_end_with.rb
 - lib/searchgasm/condition/not_equal.rb
 - lib/searchgasm/condition/not_have_keywords.rb
-- lib/searchgasm/condition/not_ilike.rb
 - lib/searchgasm/condition/not_like.rb
 - lib/searchgasm/condition/not_nil.rb
 - lib/searchgasm/condition/sibling_of.rb
@@ -165,7 +163,6 @@ files:
 - lib/searchgasm/condition/equals.rb
 - lib/searchgasm/condition/greater_than.rb
 - lib/searchgasm/condition/greater_than_or_equal_to.rb
-- lib/searchgasm/condition/ilike.rb
 - lib/searchgasm/condition/inclusive_descendant_of.rb
 - lib/searchgasm/condition/keywords.rb
 - lib/searchgasm/condition/less_than.rb
@@ -177,7 +174,6 @@ files:
 - lib/searchgasm/condition/not_end_with.rb
 - lib/searchgasm/condition/not_equal.rb
 - lib/searchgasm/condition/not_have_keywords.rb
-- lib/searchgasm/condition/not_ilike.rb
 - lib/searchgasm/condition/not_like.rb
 - lib/searchgasm/condition/not_nil.rb
 - lib/searchgasm/condition/sibling_of.rb

data/lib/searchgasm/condition/ilike.rb

@@ -1,15 +0,0 @@
-module Searchgasm
-  module Condition
-    class Ilike < Base
-      class << self
-        def condition_names_for_column
-          super + ["icontains", "ihas"]
-        end
-      end
-      
-      def to_conditions(value)
-        ["#{column_sql} ILIKE ?", "%#{value}%"]
-      end
-    end
-  end
-end

data/lib/searchgasm/condition/not_ilike.rb

@@ -1,20 +0,0 @@
-module Searchgasm
-  module Condition
-    class NotIlike < Base
-      class << self
-        def condition_names_for_column
-          super + ["not_icontain", "not_ihave"]
-        end
-      end
-      
-      def to_conditions(value)
-        like = Ilike.new(klass, options)
-        like.value = value
-        conditions = like.to_conditions
-        return conditions if conditions.blank?
-        conditions.first.gsub!(" ILIKE ", " NOT ILIKE ")
-        conditions
-      end
-    end
-  end
-end