simple_column_search 1.0.4 → 1.1.0

data/CHANGELOG

@@ -1,3 +1,5 @@
+v1.1.0. Support for lambdas on :match and :escape.
+
 v1.0.4. Spew an appropriate error on invalid match type.
 
 v1.0.3. General Ruby and Rails 3 compatibility.

data/README.rdoc

@@ -11,7 +11,7 @@ Add a search method to your model by calling simple_column_search with the field
   class User
     simple_column_search :first_name, :last_name
   end
- 
+
 Search for a single value across all searched columns.
 
   User.search('eli')             # => anyone with first or last name starting with eli
@@ -23,6 +23,24 @@ Refine the search by adding another search term.
     # => anyone with first or last name starting with eli AND
     #    anyone with first or last name starting with miller
 
+Specify query match mode. Use :exact, :start, :middle, or :end (default is :start).
+
+  class User
+    simple_column_search :name, :match => :exact
+  end
+
+Specify query match based on column name.
+
+  class User
+    simple_column_search :name, :email, :match => lambda { |column| column == :email ? :middle : :start },
+  end
+
+Escape query string before issuing the search request.
+
+  class User
+    simple_column_search :name, :escape => lambda { |query| query.gsub(/[^\w\s\-\.']/, '').strip }
+  end
+
 == Install
 
 As a Rails plugin.

data/lib/simple_column_search.rb

@@ -2,6 +2,8 @@ require 'rubygems'
 require 'active_record'
 
 module SimpleColumnSearch
+  class InvalidMatcher < StandardError; end
+
   # Adds a Model.search('term1 term2') method that searches across SEARCH_COLUMNS
   # for ANDed TERMS ORed across columns.
   #
@@ -21,29 +23,39 @@ module SimpleColumnSearch
     options[:match] ||= :start
     options[:name] ||= 'search'
 
-    # Test options at create time
-    get_simple_column_pattern(options[:match], 'test')
+    unless options[:match].respond_to?(:call) || [ :start, :middle, :end, :exact ].include?(options[:match])
+      raise InvalidMatcher, "Unexpected match type: #{options[:match].inspect}"
+    end
 
     # PostgreSQL LIKE is case-sensitive, use ILIKE for case-insensitive
     like = connection.adapter_name == "PostgreSQL" ? "ILIKE" : "LIKE"
-    # Determine if ActiveRecord 3 or ActiveRecord 2.3 - probaly beter way to do it!
-    if self.respond_to?(:where)
+    # Determine if ActiveRecord 3
+    if ActiveRecord::VERSION::MAJOR == 3
       scope options[:name], lambda { |terms|
+        terms = options[:escape].call(terms) if options[:escape]
         conditions = terms.split.inject(where(nil)) do |acc, term|
-          pattern = get_simple_column_pattern options[:match], term
-          acc.where(columns.collect { |column| "#{table_name}.#{column} #{like} :pattern" }.join(' OR '), { :pattern => pattern })
+          patterns = build_simple_column_patterns(columns, options[:match], term)
+          acc.where(columns.map { |column| "#{table_name}.#{column} #{like} ?" }.join(' OR '), *patterns)
         end
       }
     else
       named_scope options[:name], lambda { |terms|
+        terms = options[:escape].call(terms) if options[:escape]
         conditions = terms.split.inject(nil) do |acc, term|
-          pattern = get_simple_column_pattern options[:match], term
-          merge_conditions acc, [columns.collect { |column| "#{table_name}.#{column} #{like} :pattern" }.join(' OR '), { :pattern => pattern }]
+          patterns = build_simple_column_patterns(columns, options[:match], term)
+          merge_conditions acc, [ columns.map { |column| "#{table_name}.#{column} #{like} ?" }.join(' OR '), *patterns ]
         end
         { :conditions => conditions }
       }
     end
+  end
+
+  private
 
+  def build_simple_column_patterns(columns, match, term)
+    columns.map do |column|
+      get_simple_column_pattern(match.respond_to?(:call) ? match.call(column) : match, term)
+    end
   end
 
   def get_simple_column_pattern(match, term)
@@ -57,12 +69,9 @@ module SimpleColumnSearch
     when :end
       '%' + term
     else
-      raise InvalidMatcher, "Unexpected match type: #{match}"
+      raise InvalidMatcher, "Unexpected match type: #{match.inspect}"
     end
   end
-
-  class InvalidMatcher < StandardError; end
-
 end
 
 ActiveRecord::Base.extend(SimpleColumnSearch)

data/simple_column_search.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simple_column_search}
-  s.version = "1.0.4"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Elijah Miller"]
-  s.date = %q{2010-09-21}
+  s.date = %q{2010-10-03}
   s.description = %q{Quick and dirty multi column LIKE searches.}
   s.email = %q{elijah.miller@gmail.com}
   s.extra_rdoc_files = ["CHANGELOG", "lib/simple_column_search.rb", "README.rdoc"]

data/spec/models.rb

@@ -7,4 +7,7 @@ class Person < ActiveRecord::Base
   simple_column_search :first_name, :name => :search_first_name_start, :match => :start
   simple_column_search :first_name, :name => :search_first_name_middle, :match => :middle
   simple_column_search :first_name, :name => :search_first_name_end, :match => :end
+
+  simple_column_search :first_name, :last_name, :name => :search_escape_query, :match => :exact, :escape => lambda { |q| q.strip.split(/\s/).map(&:singularize).join(' ') }
+  simple_column_search :first_name, :last_name, :name => :search_match_lambda, :match => lambda { |c| c == :last_name ? :exact : :start }
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_column_search
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 4
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors: 
 - Elijah Miller
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 -04:00
+date: 2010-10-03 00:00:00 -04:00
 default_executable: 
 dependencies: []