@@ -8,7 +8,7 @@ module Shooter module ClassMethods def acts_as_searchable(options = {}) unless searchable? - cattr_accessor :searchable_attributes, :comparison_operator, :searchable_scope_options + cattr_accessor :searchable_attributes, :comparison_operator, :searchable_scope_options, :wildcards include InstanceMethods end @@ -18,6 +18,7 @@ module Shooter self.comparison_operator = options.delete(:comparison) || :like self.searchable_scope_options ||= {} self.searchable_scope_options.update(options) {|k,v1,v2| k.to_sym == :include ? [v1 << v2].flatten.compact.uniq : v2 } + self.wildcards = options.delete(:wildcards) || ["*"] end def searchable? @@ -28,7 +29,7 @@ module Shooter module InstanceMethods def self.included(base) if base.respond_to?(:named_scope) - base.named_scope :search, lambda { |query| base.searchable_scope_options.merge(:conditions => [base.searchable_attributes.map {|attribute| "#{"#{base.table_name}." unless attribute.to_s.include?(".")}#{attribute} #{base.comparison_operator.to_s.upcase} :query"}.join(" OR "), {:query => query}])} + base.named_scope :search, lambda { |query| base.wildcards.each {|w| query = query.gsub(w, "%").gsub(/\%+/, "%") }; base.searchable_scope_options.merge(:conditions => [base.searchable_attributes.map {|attribute| "#{"#{base.table_name}." unless attribute.to_s.include?(".")}#{attribute} #{base.comparison_operator.to_s.upcase} :query"}.join(" OR "), {:query => query}])} else base.extend ClassMethods end @@ -36,6 +37,7 @@ module Shooter module ClassMethods def search(query = nil, options = {}) + self.wildcards.each {|w| query = query.gsub(w, "%").gsub(/\%+/, "%") } with_scope(:find => self.searchable_scope_options.merge(:conditions => [self.searchable_attributes.map {|attribute| "#{"#{table_name}." unless attribute.to_s.include?(".")}#{attribute} #{self.comparison_operator.to_s.upcase} :query"}.join(" OR "), {:query => query}])) do block_given? ? yield(options) : find(:all, options) end lib/acts_as_searchable.rb fbaf267c51cdf6b76b5a1afb3e33e681947e2bc9 Joshua Clayton jclayton@fusionary.com http://github.com/joshuaclayton/acts_as_searchable/commit/6cda7d114194f9252afec58e803340533acecfb7 6cda7d114194f9252afec58e803340533acecfb7 2009-03-11T08:30:15-07:00 2009-03-11T08:30:15-07:00 Allow asterisks as wildcards (by default) b8a717c5ca68642fd695a2e404330fd857b5bcb3 Joshua Clayton jclayton@fusionary.com