searchlogic 1.6.4 → 1.6.5

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+== 1.6.5 released 2009-04-2
+
+* Skip all associations defined with the :finder_sql option, since conditions can not be chained to them, etc.
+* Fixed bug when using non string values for the keywords condition.
+* Fixed undefined methods link_options error.
+* Return blank conditions when trying to scope blank conditions. Fixes the issue with groups that return a blank SQL string.
+* Fixed issue with blank condition comparing boolean values to non boolean columns.
+* Add utf-8 magic comment for ruby 1.9
+
 == 1.6.4 released 2009-01-22
 
 * Fixed calling attribute_condition with newer versions of rails.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007 Ben Johnson of Binary Logic (binarylogic.com)
+Copyright (c) 2008 Ben Johnson of Binary Logic (binarylogic.com)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/searchlogic/condition/blank.rb

@@ -10,10 +10,13 @@ module Searchlogic
       end
       
       def to_conditions(value)
-        if value == true
-          "(#{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)"
+        case column.type
+        when :boolean
+          return "(#{column_sql} IS NULL or #{column_sql} = '' or #{column_sql} = false)" if value == true
+          return "(#{column_sql} IS NOT NULL and #{column_sql} != '' and #{column_sql} != false)" if value == false
+        else
+          return "(#{column_sql} IS NULL or #{column_sql} = '')" if value == true
+          return "(#{column_sql} IS NOT NULL and #{column_sql} != '')" if value == false
         end
       end
     end

data/lib/searchlogic/condition/keywords.rb

@@ -1,23 +1,28 @@
+# coding: utf-8
 module Searchlogic
   module Condition
     class Keywords < Base
-      # Because be default it joins with AND, so padding an array just gives you more options. Joining with and is no different than combining all of the words.
-      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        
-      ALLOWED_CHARACTERS = 'àáâãäåßéèêëìíîïñòóôõöùúûüýÿ\-_\.@'
-      
       class << self
         def condition_names_for_column
           super + ["kwords", "kw"]
         end
+        
+        attr_accessor :blacklisted_words, :allowed_characters
       end
       
+      # Because be default it joins with AND, so padding an array just gives you more options. Joining with and is no different than combining all of the words.
+      self.join_arrays_with_or = true
+      
+      self.blacklisted_words ||= []
+      self.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 
+      self.allowed_characters ||= ""
+      self.allowed_characters += 'àáâãäåßéèêëìíîïñòóôõöùúûüýÿ\-_\.@'
+      
       def to_conditions(value)
         strs = []
         subs = []
         
-        search_parts = value.gsub(/,/, " ").split(/ /)
+        search_parts = value.to_s.gsub(/,/, " ").split(/ /)
         replace_non_alnum_characters!(search_parts)
         search_parts.uniq!
         remove_blacklisted_words!(search_parts)
@@ -35,12 +40,12 @@ module Searchlogic
         def replace_non_alnum_characters!(search_parts)
           search_parts.each do |word|
             word.downcase!
-            word.gsub!(/[^[:alnum:]#{ALLOWED_CHARACTERS}]/, '')
+            word.gsub!(/[^[:alnum:]#{self.class.allowed_characters}]/, '')
           end
         end
         
         def remove_blacklisted_words!(search_parts)
-          search_parts.delete_if { |word| word.blank? || BLACKLISTED_WORDS.include?(word.downcase) }
+          search_parts.delete_if { |word| word.blank? || self.class.blacklisted_words.include?(word.downcase) }
         end
     end
   end

data/lib/searchlogic/conditions/magic_methods.rb

@@ -54,6 +54,7 @@ module Searchlogic
             return true if self.class.added_associations
           
             klass.reflect_on_all_associations.each do |association|
+              next if !association.options[:finder_sql].nil? # associations with finder_sql should not be added since conditions can not be chained to them, etc.
               self.class.class_eval <<-"end_eval", __FILE__, __LINE__
                 def #{association.name}
                   return @#{association.name} unless @#{association.name}.nil?

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

@@ -20,7 +20,7 @@ module Searchlogic
           links_options.delete(:choices)
           html = ""
           options[:choices].each do |choice|
-            link_options = links_option.deep_dup
+            link_options = links_options.deep_dup
             text, value = option_text_and_value(choice)
             link_options[:text] ||= text
             html += order_by_link(value, link_options)
@@ -46,7 +46,7 @@ module Searchlogic
           links_options.delete(:choices)
           html = ""
           options[:choices].each do |choice|
-            link_options = links_option.deep_dup
+            link_options = links_options.deep_dup
             text, value = option_text_and_value(choice)
             link_options[:text] ||= text
             html += order_as_link(value, link_options)

data/lib/searchlogic/search/protection.rb

@@ -82,7 +82,7 @@ module Searchlogic
         
         def frisk!(options)
           options.symbolize_keys.fast_assert_valid_keys(SAFE_OPTIONS)
-          raise(ArgumentError, ":order_by can only contain colum names in the string, hash, or array format") unless order_by_safe?(get_order_by_value(options[:order_by]))
+          raise(ArgumentError, ":order_by can only contain colum names and relationships in the string, hash, or array format. You are trying to pass a value that does not meet this criteria.") unless order_by_safe?(get_order_by_value(options[:order_by]))
         end
     end    
   end

data/lib/searchlogic/shared/utilities.rb

@@ -29,6 +29,7 @@ module Searchlogic
         end
         
         def scope_condition(condition)
+          return condition if condition.blank?
           arr_condition = condition.is_a?(Array) ? condition : [condition]
           arr_condition[0] = "(#{arr_condition[0]})"
           arr_condition.size == 1 ? arr_condition.first : arr_condition

data/lib/searchlogic/version.rb

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

data/searchlogic.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "1.6.4"
+  s.version = "1.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]
-  s.date = %q{2009-02-22}
+  s.date = %q{2009-04-02}
   s.description = %q{Object based ActiveRecord searching, ordering, pagination, and more!}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/searchlogic/active_record/associations.rb", "lib/searchlogic/active_record/base.rb", "lib/searchlogic/active_record/connection_adapters/mysql_adapter.rb", "lib/searchlogic/active_record/connection_adapters/postgresql_adapter.rb", "lib/searchlogic/active_record/connection_adapters/sqlite_adapter.rb", "lib/searchlogic/condition/base.rb", "lib/searchlogic/condition/begins_with.rb", "lib/searchlogic/condition/blank.rb", "lib/searchlogic/condition/child_of.rb", "lib/searchlogic/condition/descendant_of.rb", "lib/searchlogic/condition/ends_with.rb", "lib/searchlogic/condition/equals.rb", "lib/searchlogic/condition/greater_than.rb", "lib/searchlogic/condition/greater_than_or_equal_to.rb", "lib/searchlogic/condition/inclusive_descendant_of.rb", "lib/searchlogic/condition/keywords.rb", "lib/searchlogic/condition/less_than.rb", "lib/searchlogic/condition/less_than_or_equal_to.rb", "lib/searchlogic/condition/like.rb", "lib/searchlogic/condition/nested_set.rb", "lib/searchlogic/condition/nil.rb", "lib/searchlogic/condition/not_begin_with.rb", "lib/searchlogic/condition/not_blank.rb", "lib/searchlogic/condition/not_end_with.rb", "lib/searchlogic/condition/not_equal.rb", "lib/searchlogic/condition/not_have_keywords.rb", "lib/searchlogic/condition/not_like.rb", "lib/searchlogic/condition/not_nil.rb", "lib/searchlogic/condition/sibling_of.rb", "lib/searchlogic/conditions/any_or_all.rb", "lib/searchlogic/conditions/base.rb", "lib/searchlogic/conditions/groups.rb", "lib/searchlogic/conditions/magic_methods.rb", "lib/searchlogic/conditions/multiparameter_attributes.rb", "lib/searchlogic/conditions/protection.rb", "lib/searchlogic/config/helpers.rb", "lib/searchlogic/config/search.rb", "lib/searchlogic/config.rb", "lib/searchlogic/core_ext/hash.rb", "lib/searchlogic/core_ext/object.rb", "lib/searchlogic/helpers/control_types/link.rb", "lib/searchlogic/helpers/control_types/links.rb", "lib/searchlogic/helpers/control_types/remote_link.rb", "lib/searchlogic/helpers/control_types/remote_links.rb", "lib/searchlogic/helpers/control_types/remote_select.rb", "lib/searchlogic/helpers/control_types/select.rb", "lib/searchlogic/helpers/form.rb", "lib/searchlogic/helpers/utilities.rb", "lib/searchlogic/modifiers/absolute.rb", "lib/searchlogic/modifiers/acos.rb", "lib/searchlogic/modifiers/asin.rb", "lib/searchlogic/modifiers/atan.rb", "lib/searchlogic/modifiers/avg.rb", "lib/searchlogic/modifiers/base.rb", "lib/searchlogic/modifiers/ceil.rb", "lib/searchlogic/modifiers/char_length.rb", "lib/searchlogic/modifiers/cos.rb", "lib/searchlogic/modifiers/cot.rb", "lib/searchlogic/modifiers/count.rb", "lib/searchlogic/modifiers/day_of_month.rb", "lib/searchlogic/modifiers/day_of_week.rb", "lib/searchlogic/modifiers/day_of_year.rb", "lib/searchlogic/modifiers/degrees.rb", "lib/searchlogic/modifiers/exp.rb", "lib/searchlogic/modifiers/floor.rb", "lib/searchlogic/modifiers/hex.rb", "lib/searchlogic/modifiers/hour.rb", "lib/searchlogic/modifiers/log.rb", "lib/searchlogic/modifiers/log10.rb", "lib/searchlogic/modifiers/log2.rb", "lib/searchlogic/modifiers/lower.rb", "lib/searchlogic/modifiers/ltrim.rb", "lib/searchlogic/modifiers/md5.rb", "lib/searchlogic/modifiers/microseconds.rb", "lib/searchlogic/modifiers/milliseconds.rb", "lib/searchlogic/modifiers/minute.rb", "lib/searchlogic/modifiers/month.rb", "lib/searchlogic/modifiers/octal.rb", "lib/searchlogic/modifiers/radians.rb", "lib/searchlogic/modifiers/round.rb", "lib/searchlogic/modifiers/rtrim.rb", "lib/searchlogic/modifiers/second.rb", "lib/searchlogic/modifiers/sign.rb", "lib/searchlogic/modifiers/sin.rb", "lib/searchlogic/modifiers/square_root.rb", "lib/searchlogic/modifiers/sum.rb", "lib/searchlogic/modifiers/tan.rb", "lib/searchlogic/modifiers/trim.rb", "lib/searchlogic/modifiers/upper.rb", "lib/searchlogic/modifiers/week.rb", "lib/searchlogic/modifiers/year.rb", "lib/searchlogic/search/base.rb", "lib/searchlogic/search/conditions.rb", "lib/searchlogic/search/ordering.rb", "lib/searchlogic/search/pagination.rb", "lib/searchlogic/search/protection.rb", "lib/searchlogic/search/searching.rb", "lib/searchlogic/shared/utilities.rb", "lib/searchlogic/shared/virtual_classes.rb", "lib/searchlogic/version.rb", "lib/searchlogic.rb", "README.rdoc", "TODO.rdoc"]

data/test/active_record_tests/associations_test.rb

@@ -38,7 +38,7 @@ module ActiveRecordTests
       search = binary_logic.orders.new_search
       assert_kind_of Searchlogic::Search::Base, search
       assert_equal Order, search.klass
-      assert_equal({:joins => "INNER JOIN users ON orders.user_id = users.id   ", :conditions => "(\"users\".account_id = #{binary_logic.id})"}, search.scope)
+      assert_equal({:conditions => "(\"users\".account_id = 431064614)", :joins => "INNER JOIN \"users\" ON \"orders\".user_id = \"users\".id   "}, search.scope)
       
       bens_order = orders(:bens_order)
       assert_equal [bens_order], search.all

data/test/active_record_tests/base_test.rb

@@ -37,7 +37,7 @@ module ActiveRecordTests
     end
     
     def test_valid_ar_options
-      assert_equal [:conditions, :include, :joins, :limit, :offset, :order, :select, :readonly, :group, :from, :lock], ActiveRecord::Base.valid_find_options
+      assert_equal [:conditions, :include, :joins, :limit, :offset, :order, :select, :readonly, :group, :having, :from, :lock], ActiveRecord::Base.valid_find_options
       assert_equal [:conditions, :joins, :order, :select, :group, :having, :distinct, :limit, :offset, :include, :from], ActiveRecord::Base.valid_calculations_options
     end
     

data/test/condition_tests/blank_test.rb

@@ -5,19 +5,19 @@ module ConditionTests
     def test_sanitize
       condition = Searchlogic::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\" = '')", condition.sanitize
     
       condition = Searchlogic::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\" != '')", condition.sanitize
     
-      condition = Searchlogic::Condition::Blank.new(Account, :column => Account.columns_hash["id"])
+      condition = Searchlogic::Condition::Blank.new(Account, :column => Account.columns_hash["active"])
       condition.value = true
-      assert_equal "(\"accounts\".\"id\" IS NULL or \"accounts\".\"id\" = '' or \"accounts\".\"id\" = false)", condition.sanitize
+      assert_equal "(\"accounts\".\"active\" IS NULL or \"accounts\".\"active\" = '' or \"accounts\".\"active\" = false)", condition.sanitize
     
-      condition = Searchlogic::Condition::Blank.new(Account, :column => Account.columns_hash["id"])
+      condition = Searchlogic::Condition::Blank.new(Account, :column => Account.columns_hash["active"])
       condition.value = false
-      assert_equal "(\"accounts\".\"id\" IS NOT NULL and \"accounts\".\"id\" != '' and \"accounts\".\"id\" != false)", condition.sanitize
+      assert_equal "(\"accounts\".\"active\" IS NOT NULL and \"accounts\".\"active\" != '' and \"accounts\".\"active\" != false)", condition.sanitize
     
       condition = Searchlogic::Condition::Blank.new(Account, :column => Account.columns_hash["id"])
       condition.value = nil

data/test/test_helper.rb

@@ -107,10 +107,11 @@ end
 class Cat < Animal
 end
 
-class Test::Unit::TestCase
+class ActiveSupport::TestCase
+  include ActiveRecord::TestFixtures
   self.fixture_path = File.dirname(__FILE__) + "/fixtures"
-  self.use_transactional_fixtures = true
+  self.use_transactional_fixtures = false
   self.use_instantiated_fixtures  = false
-  self.pre_loaded_fixtures = true
+  self.pre_loaded_fixtures = false
   fixtures :all
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-22 00:00:00 -05:00
+date: 2009-04-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency