simple_column_search 1.0.1 → 1.0.2

data/CHANGELOG

@@ -1,3 +1,5 @@
+v1.0.2. Fixed SQL injection on Rails 3, and Rails 3 compatibility on Ruby 1.9.2.
+
 v1.0.1. Rails 3 compatibility, thanks Tom Wilson [twilson63]
 
 v1.0.0. PostgreSQL support, Rit Li [rit]

data/lib/simple_column_search.rb

@@ -4,11 +4,11 @@ require 'active_record'
 module SimpleColumnSearch
   # Adds a Model.search('term1 term2') method that searches across SEARCH_COLUMNS
   # for ANDed TERMS ORed across columns.
-  #   
+  #
   #  class User
   #    simple_column_search :first_name, :last_name
   #  end
-  #  
+  #
   #  User.search('elijah')          # => anyone with first or last name elijah
   #  User.search('miller')          # => anyone with first or last name miller
   #  User.search('elijah miller')
@@ -23,29 +23,26 @@ module SimpleColumnSearch
 
     # PostgreSQL LIKE is case-sensitive, use ILIKE for case-insensitive
     like = connection.adapter_name == "PostgreSQL" ? "ILIKE" : "LIKE"
-    # Determin if ActiveRecord 3 or ActiveRecord 2.3 - probaly beter way to do it!
-    if self.methods.include?("where") 
+    # Determine if ActiveRecord 3 or ActiveRecord 2.3 - probaly beter way to do it!
+    if self.respond_to?(:where)
       scope options[:name], lambda { |terms|
-        conditions = terms.split.inject([]) do |acc, term|
+        conditions = terms.split.inject(where(nil)) do |acc, term|
           pattern = get_simple_column_pattern options[:match], term
-          acc << columns.collect { |column| "#{table_name}.#{column} #{like} '#{pattern}'" }  
-        
+          acc.where(columns.collect { |column| "#{table_name}.#{column} #{like} :pattern" }.join(' OR '), { :pattern => pattern })
         end
-      
-        where conditions.map { |c| "(" + c.join(' or ') + ")" }.join(' and ')
-      } 
+      }
     else
       named_scope options[:name], lambda { |terms|
         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 }]        
+          merge_conditions acc, [columns.collect { |column| "#{table_name}.#{column} #{like} :pattern" }.join(' OR '), { :pattern => pattern }]
         end
         { :conditions => conditions }
-      }     
+      }
     end
-    
+
   end
-  
+
   def get_simple_column_pattern(match, term)
     case(match)
     when :exact
@@ -58,8 +55,8 @@ module SimpleColumnSearch
       '%' + term
     else
       raise "Unexpected match type: #{options[:match]}"
-    end    
+    end
   end
-  
-  
+
+
 end

data/simple_column_search.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simple_column_search}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Elijah Miller"]
-  s.date = %q{2010-07-14}
+  s.date = %q{2010-08-29}
   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"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_column_search
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Elijah Miller
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 -04:00
+date: 2010-08-29 00:00:00 -04:00
 default_executable: 
 dependencies: []