simple_column_search 1.0.0 → 1.0.1

data/CHANGELOG

@@ -1,3 +1,5 @@
+v1.0.1. Rails 3 compatibility, thanks Tom Wilson [twilson63]
+
 v1.0.0. PostgreSQL support, Rit Li [rit]
 
 v0.1.2. Fixed initialization when used as a plugin.

data/README.rdoc

@@ -31,10 +31,13 @@ As a Rails plugin.
 
 Prefer gems? Add this to your environment.rb and run the following command.
 
-  config.gem 'simple_column_search', :source => 'http://gemcutter.org'
+  config.gem 'simple_column_search'
 
   $ rake gems:install
 
+== Docs
 
-Homepage:: http://github.com/jqr/simple_column_search/tree/master  
+http://rdoc.info/projects/jqr/simple_column_search
+
+Homepage:: http://github.com/jqr/simple_column_search
 License:: Copyright (c) 2008 Elijah Miller <mailto:elijah.miller@gmail.com>, released under the MIT license.

data/Rakefile

@@ -1,4 +1,4 @@
-require 'spec/rake/spectask'
+#require 'spec/rake/spectask'
 
 require 'echoe'
 Echoe.new 'simple_column_search' do |p|

data/lib/simple_column_search.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'activerecord'
+require 'active_record'
 
 module SimpleColumnSearch
   # Adds a Model.search('term1 term2') method that searches across SEARCH_COLUMNS
@@ -23,27 +23,43 @@ 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") 
+      scope options[:name], lambda { |terms|
+        conditions = terms.split.inject([]) do |acc, term|
+          pattern = get_simple_column_pattern options[:match], term
+          acc << columns.collect { |column| "#{table_name}.#{column} #{like} '#{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 }]        
+        end
+        { :conditions => conditions }
+      }     
+    end
     
-    named_scope options[:name], lambda { |terms|
-      conditions = terms.split.inject(nil) do |acc, term|
-        pattern = 
-          case(options[:match])
-          when :exact
-            term
-          when :start
-            term + '%'
-          when :middle
-            '%' + term + '%'
-          when :end
-            '%' + term
-          else
-            raise "Unexpected match type: #{options[:match]}"
-          end
-        merge_conditions  acc, [columns.collect { |column| "#{table_name}.#{column} #{like} :pattern" }.join(' OR '), { :pattern => pattern }]
-      end
-    
-      { :conditions => conditions }
-    }
   end
   
+  def get_simple_column_pattern(match, term)
+    case(match)
+    when :exact
+      term
+    when :start
+      term + '%'
+    when :middle
+      '%' + term + '%'
+    when :end
+      '%' + term
+    else
+      raise "Unexpected match type: #{options[:match]}"
+    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.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Elijah Miller"]
-  s.date = %q{2009-12-03}
+  s.date = %q{2010-07-14}
   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"]
@@ -15,14 +15,14 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Simple_column_search", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{simple_column_search}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Quick and dirty multi column LIKE searches.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_column_search
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  hash: 21
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Elijah Miller
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-03 00:00:00 -05:00
+date: 2010-07-14 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -48,21 +54,28 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
+      segments: 
+      - 1
+      - 2
       version: "1.2"
-  version: 
 requirements: []
 
 rubyforge_project: simple_column_search
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Quick and dirty multi column LIKE searches.