wvanbergen-scoped_search 1.0.1 → 1.1.0

data/README.rdoc

@@ -1,65 +1,78 @@
 = scoped_search
 
-This simple plugin will make it easy to search your ActiveRecord models. Searching is performed using a query string, which should be passed to the named_scope *search_for* that uses SQL %LIKE% conditions for searching (ILIKE for Postgres). You can specify what fields should be used for searching.
+The <b>scoped_search</b> Rails plugin makes it easy to search your ActiveRecord models. Searching is 
+performed using a query string, which should be passed to the named_scope *search_for* that uses SQL 
+<tt>LIKE %keyword%</tt> conditions for searching (ILIKE for Postgres). You can specify what fields 
+should be used for searching.
 
 == Installing
 
-	gem install wvanbergen-scoped_search -s http://gems.github.com
+The recommended method to enable scoped_search in your project is adding the scoped_search gem to your environment. Add the following code to your Rails configuration in <tt>config/environment.rb</tt>:
+
+  Rails::Initializer.run do |config|
+    ...
+    config.gem 'wvanbergen-scoped_search', :lib => 'scoped_search', 
+                   source => 'http://gems.github.com/'
+  end
+
+Run <tt>sudo rake gems:install</tt> to install the gem.
+
+Another alternative is to install scoped_search as a Rails plugin:
+
+  script/plugin install git://github.com/wvanbergen/scoped_search.git
 
 == Usage
 
 First, you have to specify in what columns should be searched:
 
-	class User < ActiveRecord::Base
-	  searchable_on :first_name, :last_name
-	end
+  class User < ActiveRecord::Base
+    searchable_on :first_name, :last_name
+  end
 
 
 Now, the <b>search_for</b> scope is available for queries. You should pass a query string to the scope. 
 This can be empty or nil, in which case all no search conditions are set (and all records will be returned).
 
-	User.search_for(params[:q]).each { |project| ... }
+  User.search_for(params[:q]).each { |project| ... }
 
 
 You can also search on associate models.  This works with <b>belongs_to</b>, <b>has_one</b>, <b>has_many</b>, 
 <b>has_many :through</b>, and <b>HABTM</b>.  For example if a User <b>has_many</b> Notes (title, content, created_at, updated_at)
 
-	class User < ActiveRecord::Base
-	  has_many: notes
-	  searchable_on :first_name, :last_name, :notes_title, :notes_content
-	end
-
+  class User < ActiveRecord::Base
+    has_many: notes
+    searchable_on :first_name, :last_name, :notes_title, :notes_content
+  end
 
 The search query language is simple. It supports these constructs:
-* <b>words:</b> some search keywords
-* <b>phrases:</b> "a single search phrase"
-* <b>negation:</b> "look for this" -"but do not look for this phrase and this" -word
-* <b>OR words/phrases:</b> word/phrase OR word/phrase.  Example: "Hello World" OR "Hello Moon"
+* <b>words:</b> <tt>some search keywords</tt>
+* <b>phrases:</b> <tt>"a single search phrase"</tt>
+* <b>negation:</b> <tt>"look for this" -"but do not look for this phrase and this" -word</tt>
+* <b>OR words/phrases:</b> word/phrase OR word/phrase.  Example: <tt>"Hello World" OR "Hello Moon"</tt>
 * <b>dates:</b> mm/dd/yyyy, dd/mm/yyyy, yyyy/mm/dd, yyyy-mm-dd
-* <b>date ranges:</b> > date, >= date, < date, <= date, date TO date.  Examples: > mm/dd/yyyy, < yyyy-mm-dd
+* <b>date ranges:</b> > date, >= date, < date, <= date, date TO date.  Examples: <tt>> 30/05/1983</tt>, <tt>< 2009-01-30</tt>
 
-This functionality is build on named_scope. The searchable_on statement creates 
+This functionality is build on <tt>named_scope</tt>. The searchable_on statement creates 
 a named_scope *search_for*. Because of this, you can actually chain the call with
 other scopes. For example, this can be very useful if you only want to search in 
 projects that are accessible by a given user.
 
-	class Project < ActiveRecord::Base
-	  searchable_on :name, :description
-	  named_scope :accessible_by, lambda { |user| ... }
-	end
-  
-	# using chained named_scopes and will_paginate
-	Project.accessible_by(current_user).search_for(params[:q]).paginate(:page => params[:page], :include => :tasks)
+  class Project < ActiveRecord::Base
+    searchable_on :name, :description
+    named_scope :accessible_by, lambda { |user| ... }
+  end
 
+  # using chained named_scopes and will_paginate
+  Project.accessible_by(current_user).search_for(params[:q]).paginate(:page => params[:page], :include => :tasks)
 
 == Additional resources
 
-* Source code: http://github.com/wvanbergen/scoped_search
+* Source code: http://github.com/wvanbergen/scoped_search/tree/master
 * Project wiki: http://wiki.github.com/wvanbergen/scoped_search
 * RDoc documentation: http://wvanbergen.github.com/scoped_search
-* wvanbergen's blog posts: http://techblog.floorplanner.com/tag/scoped_search/
+* wvanbergen's blog posts: http://techblog.floorplanner.com/tag/scoped_search
 
 == License
 
-This plugin is released under the MIT license. Please contact (willem AT vanbergen DOT org) if you have any suggestions or remarks. 
-
+This plugin is released under the MIT license. Please contact weshays (http://github.com/weshays) 
+or wvanbergen (http://github.com/wvanbergen) for any questions.

data/Rakefile

@@ -1,43 +1,5 @@
 Dir['tasks/*.rake'].each { |file| load(file) }
  
+desc 'Default: run unit tests for only sqlite.' 
 task :default => [:test]
 
-namespace :test do
-  
-  desc "Run tests for all configured databases in test/database.yml"
-  task :all do
-    
-    databases = YAML.load(File.read(File.dirname(__FILE__) + '/test/database.yml'))
-    databases.each do |database, config|
-      puts "\nRunning testsuite on #{database} database...\n\n"
-      sh "rake test DATABASE=#{database}"
-    end
-    puts "\nFinished testing for all configured databases!"
-    puts "(Configure databases by adjusting test/database.yml)"
-  end
-  
-  task :single do
-    database = ENV['DATABASE'] || 'sqlite3'
-    puts "Running testsuite on #{database} database...\n"
-    sh "rake test DATABASE=#{database}"
-  end
-  
-  desc "Run tests on SQLite3 database"
-  task :sqlite3 do
-    puts "Running testsuite on SQLite3 database...\n"
-    sh 'rake test DATABASE=sqlite3'
-  end
-
-  desc "Run tests on MySQL database"  
-  task :mysql do
-    puts "Running testsuite on MySQL database...\n"
-    sh 'rake test DATABASE=mysql'    
-  end
-  
-  desc "Run tests on PostgrSQL database"
-  task :postgresql do
-    puts "Running testsuite on PostgreSQL database...\n"
-    sh 'rake test DATABASE=postgresql'    
-  end
-
-end

data/lib/scoped_search/query_conditions_builder.rb

@@ -44,9 +44,7 @@ module ScopedSearch
       search_conditions.each_with_index do |search_condition, index|
         keyword_name = "keyword_#{index}".to_sym
         conditions << case search_condition.last
-                        # Still thinking about this one
-                        # when :integer: integer_conditions(keyword_name, search_condition.first)
-          
+                        # :like also handles integers
                         when :like: like_condition(keyword_name, search_condition.first)
                         when :not: not_like_condition(keyword_name, search_condition.first)
             
@@ -68,17 +66,18 @@ module ScopedSearch
     
     private 
     
-    # def integer_condition(keyword_name, value)
-      # Still thinking about this one
-    # end    
-    
-    def like_condition(keyword_name, value)
-      @query_params[keyword_name] = "%#{value}%"
+    def like_condition(keyword_name, value)      
       retVal = []
       @query_fields.each do |field, field_type|  #|key,value| 
         if field_type == :string or field_type == :text
+          @query_params[keyword_name] = "%#{value}%"
           retVal << "#{field} #{@sql_like} :#{keyword_name.to_s}"
         end
+        if value.strip =~ /^[0-9]+$/ and (field_type == :int or field_type == :integer)
+          qkey = "#{keyword_name}_#{value.strip}"
+          @query_params[qkey.to_sym] = value.strip.to_i
+          retVal << "#{field} = :#{qkey}"
+        end
       end
       "(#{retVal.join(' OR ')})"
     end
@@ -101,10 +100,22 @@ module ScopedSearch
       keyword_name_b = "#{keyword_name.to_s}b".to_sym
       @query_params[keyword_name_a] = "%#{word1}%"
       @query_params[keyword_name_b] = "%#{word2}%"      
-      @query_fields.each do |field, field_type|  #|key,value| 
+      @query_fields.each do |field, field_type|  #|key,value|       
         if field_type == :string or field_type == :text
           retVal << "(#{field} #{@sql_like} :#{keyword_name_a.to_s} OR #{field} #{@sql_like} :#{keyword_name_b.to_s})"
         end
+        if (word1.strip =~ /^[0-9]+$/ and word2.strip =~ /^[0-9]+$/) and (field_type == :int or field_type == :integer)
+          qkeya = "#{keyword_name}_a_#{word1.strip}"
+          qkeyb = "#{keyword_name}_b_#{word2.strip}"
+          @query_params[qkeya] = word1.strip.to_i
+          @query_params[qkeyb] = word2.strip.to_i
+          retVal << "(#{field} = :#{qkeya} OR #{field} = :#{qkeyb})"   
+        elsif (word1.strip =~ /^[0-9]+$/ or word2.strip =~ /^[0-9]+$/) and (field_type == :int or field_type == :integer)
+          num_word = word1.strip =~ /^[0-9]+$/ ? word1.strip.to_i : word2.strip.to_i
+          qkey = "#{keyword_name}_#{num_word}"
+          @query_params[qkey.to_sym] = num_word
+          retVal << "(#{field} = :#{qkey})"
+        end             
       end 
       "(#{retVal.join(' OR ')})"     
     end

data/lib/scoped_search/query_language_parser.rb

@@ -69,7 +69,7 @@ module ScopedSearch
             end
         end
       end
-      
+
       return conditions_tree
     end
     

data/tasks/database_tests.rake

@@ -0,0 +1,20 @@
+require 'yaml' unless Object::const_defined?('YAML')
+
+namespace :test do
+  
+  databases = YAML.load(File.read(File.dirname(__FILE__) + '/../test/database.yml'))  
+  
+  desc "Run testsuite on all configured databases in test/database.yml"
+  task(:all => databases.keys.map { |db| db.to_sym }) do
+    puts "\nFinished testing on all configured databases!"
+    puts "(Configure databases by adjusting test/database.yml)"
+  end
+  
+  databases.each do |database, config|
+    desc "Run testsuite on #{database} database."
+    task database.to_sym do
+      puts "Running testsuite on #{database} database...\n\n"
+      sh "rake test DATABASE=#{database}"
+    end
+  end  
+end

data/tasks/documentation.rake

@@ -0,0 +1,33 @@
+require 'rubygems'
+require 'rake/rdoctask'
+
+desc 'Generate documentation for the acts_as_callback_logger plugin.'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'doc/html'
+  rdoc.title    = 'scoped_search'  
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.main = 'README'
+  rdoc.rdoc_files.include('LICENSE',
+                          'lib/')
+end
+
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |t|
+    t.test_files = Dir[ "test/**/*_test.rb" ]
+  end
+rescue LoadError
+  nil
+end
+
+begin
+  require 'rcov/rcovtask'
+  desc 'Runs spec:rcov and then displays the coverage/index.html file in the browswer.' 
+  task :rcov_display => [:clobber_rcov, :rcov] do 
+    system("open coverage/index.html")
+  end
+rescue LoadError
+  nil
+end
+

data/test/integration/api_test.rb

@@ -35,10 +35,11 @@ class ScopedSearch::Test::API < Test::Unit::TestCase
   def test_search_except_fields
     Foo.searchable_on :except => [:id, :ignored_field, :created_at, :updated_at]
     assert Foo.respond_to?(:search_for)
-    assert_equal Foo.scoped_search_fields.size, 3
+    assert_equal Foo.scoped_search_fields.size, 4
     assert Foo.scoped_search_fields.include?(:string_field)
     assert Foo.scoped_search_fields.include?(:text_field)
     assert Foo.scoped_search_fields.include?(:date_field)
+    assert Foo.scoped_search_fields.include?(:some_int_field)
   end  
   
   def test_search_with_only_and_except

data/test/lib/test_models.rb

@@ -2,22 +2,22 @@ module ScopedSearch::Test::Models
     
   class Foo < ActiveRecord::Base
     def self.create_corpus!
-      create!(:string_field => "Programmer 123", :text_field => nil,              :ignored_field => "123456",  :date_field => '2000-01-01')    
-      create!(:string_field => "Jim",            :text_field => "Henson",         :ignored_field => "123456a", :date_field => '2001-04-15')   
-      create!(:string_field => "Jim",            :text_field => "Bush",           :ignored_field => "123456b", :date_field => '2001-04-17')    
-      create!(:string_field => "Wes",            :text_field => "Hays",           :ignored_field => "123456c", :date_field => '1980-09-27')  
-      create!(:string_field => "Bob",            :text_field => "Hays",           :ignored_field => "123456d", :date_field => '2002-11-09')  
-      create!(:string_field => "Dogs",           :text_field => "Pit Bull",       :ignored_field => "123456e", :date_field => '2002-12-26') 
-      create!(:string_field => "Dogs",           :text_field => "Eskimo",         :ignored_field => "123456f", :date_field => '2003-03-19')
-      create!(:string_field => "Cows",           :text_field => "Farms",          :ignored_field => "123456g", :date_field => '2004-05-01')
-      create!(:string_field => "Hello World",    :text_field => "Hello Moon",     :ignored_field => "123456h", :date_field => '2004-07-11')   
-      create!(:string_field => "Hello World",    :text_field => "Goodnight Moon", :ignored_field => "123456i", :date_field => '2004-09-12')
-      create!(:string_field => "Happy Cow",      :text_field => "Sad Cow",        :ignored_field => "123456j", :date_field => '2005-02-05')
-      create!(:string_field => "Happy Frog",     :text_field => "Sad Frog",       :ignored_field => "123456k", :date_field => '2006-03-09')
-      create!(:string_field => "Excited Frog",   :text_field => "Sad Frog",       :ignored_field => "123456l", :date_field => '2006-07-15')    
-      create!(:string_field => "Man made",       :text_field => "Woman made",     :ignored_field => "123456m", :date_field => '2007-06-13')
-      create!(:string_field => "Cat Toys",       :text_field => "Frog Toys",      :ignored_field => "123456n", :date_field => '2008-03-04') 
-      create!(:string_field => "Happy Toys",     :text_field => "Sad Toys",       :ignored_field => "123456n", :date_field => '2008-05-12') 
+      create!(:string_field => "Programmer 123", :text_field => nil,              :ignored_field => "123456",  :some_int_field => 111, :date_field => '2000-01-01')    
+      create!(:string_field => "Jim",            :text_field => "Henson",         :ignored_field => "123456a", :some_int_field => 222, :date_field => '2001-04-15')   
+      create!(:string_field => "Jim",            :text_field => "Bush",           :ignored_field => "123456b", :some_int_field => 333, :date_field => '2001-04-17')    
+      create!(:string_field => "Wes",            :text_field => "Hays",           :ignored_field => "123456c", :some_int_field => 444, :date_field => '1980-09-27')  
+      create!(:string_field => "Bob",            :text_field => "Hays",           :ignored_field => "123456d", :some_int_field => 555, :date_field => '2002-11-09')  
+      create!(:string_field => "Dogs",           :text_field => "Pit Bull",       :ignored_field => "123456e", :some_int_field => 666, :date_field => '2002-12-26') 
+      create!(:string_field => "Dogs",           :text_field => "Eskimo",         :ignored_field => "123456f", :some_int_field => 777, :date_field => '2003-03-19')
+      create!(:string_field => "Cows",           :text_field => "Farms",          :ignored_field => "123456g", :some_int_field => 888, :date_field => '2004-05-01')
+      create!(:string_field => "Hello World",    :text_field => "Hello Moon",     :ignored_field => "123456h", :some_int_field => 999, :date_field => '2004-07-11')   
+      create!(:string_field => "Hello World",    :text_field => "Goodnight Moon", :ignored_field => "123456i", :some_int_field => 100, :date_field => '2004-09-12')
+      create!(:string_field => "Happy Cow",      :text_field => "Sad Cow",        :ignored_field => "123456j", :some_int_field => 200, :date_field => '2005-02-05')
+      create!(:string_field => "Happy Frog",     :text_field => "Sad Frog",       :ignored_field => "123456k", :some_int_field => 300, :date_field => '2006-03-09')
+      create!(:string_field => "Excited Frog",   :text_field => "Sad Frog",       :ignored_field => "123456l", :some_int_field => 400, :date_field => '2006-07-15')    
+      create!(:string_field => "Man made",       :text_field => "Woman made",     :ignored_field => "123456m", :some_int_field => 500, :date_field => '2007-06-13')
+      create!(:string_field => "Cat Toys",       :text_field => "Frog Toys",      :ignored_field => "123456n", :some_int_field => 600, :date_field => '2008-03-04') 
+      create!(:string_field => "Happy Toys",     :text_field => "Sad Toys",       :ignored_field => "123456n", :some_int_field => 700, :date_field => '2008-05-12') 
 
       create!(:string_field => "My son was born on 7/15/2006 and weighed 5.5 lbs",     
               :text_field => "Sad Toys",       
@@ -36,11 +36,11 @@ module ScopedSearch::Test::Models
     has_many :clients, :through => :offices
     
     def self.create_corpus!
-      create!(:first_name => 'Willem',  :last_name => 'Van Bergen', :login => 'wvanbergen', :group_id => 1, :address_id => 1) 
-      create!(:first_name => 'Wes',     :last_name => 'Hays',       :login => 'weshays',    :group_id => 1, :address_id => 2) 
-      create!(:first_name => 'John',    :last_name => 'Dell',       :login => 'jdell',      :group_id => 2, :address_id => 3) 
-      create!(:first_name => 'Ray',     :last_name => 'York',       :login => 'ryork',      :group_id => 3, :address_id => 4) 
-      create!(:first_name => 'Anna',    :last_name => 'Landis',     :login => 'alandis',    :group_id => 4, :address_id => 5) 
+      create!(:first_name => 'Willem',  :last_name => 'Van Bergen', :login => 'wvanbergen', :age => 25, :group_id => 1, :address_id => 1) 
+      create!(:first_name => 'Wes',     :last_name => 'Hays',       :login => 'weshays',    :age => 26, :group_id => 1, :address_id => 2) 
+      create!(:first_name => 'John',    :last_name => 'Dell',       :login => 'jdell',      :age => 27, :group_id => 2, :address_id => 3) 
+      create!(:first_name => 'Ray',     :last_name => 'York',       :login => 'ryork',      :age => 28, :group_id => 3, :address_id => 4) 
+      create!(:first_name => 'Anna',    :last_name => 'Landis',     :login => 'alandis',    :age => 29, :group_id => 4, :address_id => 5) 
     
       user = self.find_by_first_name('Willem')
       user.locations << ScopedSearch::Test::Models::Location.find_by_name('Office')

data/test/lib/test_schema.rb

@@ -8,12 +8,14 @@ class ScopedSearch::Test::DatabaseSchema < ActiveRecord::Migration
       t.string :string_field
       t.text :text_field
       t.string :ignored_field
+      t.integer :some_int_field
       t.date :date_field
       t.timestamps
     end
     
     create_table :users do |t|
       t.string :first_name, :last_name, :login
+      t.integer :age
       t.integer :group_id
       t.integer :address_id
     end   

data/test/unit/query_conditions_builder_test.rb

@@ -35,6 +35,15 @@ class ScopedSearch::Test::QueryConditionsBuilder < Test::Unit::TestCase
     assert_equal '%Wes%', conditions.last[:keyword_0]
   end
   
+  def test_like_search_condition_with_integer
+    search_conditions = [["26", :like]]
+    query_fields = {'some_table.age' => :integer}    
+    conditions = build_query(search_conditions, query_fields) 
+  
+    assert_equal '(some_table.age = :keyword_0_26)', conditions.first
+    assert_equal 26, conditions.last[:keyword_0_26]
+  end  
+  
   def test_not_like_search_condition
     search_conditions = [["Wes", :not]]
     query_fields = {'some_table.first_name' => :string}    
@@ -54,6 +63,16 @@ class ScopedSearch::Test::QueryConditionsBuilder < Test::Unit::TestCase
     assert_equal '%Hays%', conditions.last[:keyword_0b]
   end
   
+  def test_or_search_condition_with_integer
+    search_conditions = [["Wes OR 26", :or]]
+    query_fields = {'some_table.first_name' => :string, 'some_table.age' => :integer}    
+    conditions = build_query(search_conditions, query_fields) 
+    regExs = build_regex_for_or(['first_name', 'age'], 'keyword_0')
+    assert_match /^#{regExs}$/, conditions.first
+    assert_equal '%Wes%', conditions.last[:keyword_0a]
+    assert_equal 26, conditions.last[:keyword_0_26]       
+  end  
+  
   # ** less_than_date **
   def test_less_than_date_search_condition_with_only_a_date_field_to_search 
     search_conditions = [['< 09/27/1980', :less_than_date]]
@@ -374,12 +393,13 @@ class ScopedSearch::Test::QueryConditionsBuilder < Test::Unit::TestCase
   def build_regex_for_or(fields,keyword)
     orFields = fields.join('|')
     regParts = fields.collect { |field| 
-                 "[\(]some_table.(#{orFields}) LIKE :#{keyword}a OR some_table.(#{orFields}) LIKE :#{keyword}b[\)]" 
+                 "([(](some_table.(first_name|age) (LIKE|=) :keyword_0[a-zA-Z0-9_]+ OR )?some_table.(first_name|age) (LIKE|=) :keyword_0[a-zA-Z0-9_]+)[)]" 
                }.join('[ ]OR[ ]')
     
     "[\(]#{regParts}[\)]"
   end  
   
+  
   def build_regex_for_date(fields,keyword)
     orFields = fields.join('|')
     regParts = fields.collect { |field| 

data/test/unit/query_language_test.rb

@@ -30,12 +30,13 @@ class ScopedSearch::Test::QueryLanguage < Test::Unit::TestCase
     assert_equal 2, parsed.length
     assert_equal 'willem', parsed.last.first
     
-    parsed = parse_query("  hallo  willem   van\tbergen ")
-    assert_equal 4, parsed.length    
+    parsed = parse_query("  hallo  willem   van\tbergen 25")
+    assert_equal 5, parsed.length    
     assert_equal 'hallo',  parsed[0].first
     assert_equal 'willem', parsed[1].first
     assert_equal 'van',    parsed[2].first
     assert_equal 'bergen', parsed[3].first      
+    assert_equal '25',     parsed[4].first
   end
   
   def test_quoted_keywords
@@ -56,6 +57,10 @@ class ScopedSearch::Test::QueryLanguage < Test::Unit::TestCase
     assert_equal 2, parsed.length
     assert_equal 'hallo wi', parsed[0].first
     assert_equal 'llem',       parsed[1].first
+    
+    parsed = parse_query('"hays 25"')
+    assert_equal 1, parsed.length
+    assert_equal 'hays 25', parsed[0].first  
   end
   
   def test_quote_escaping

data/test/unit/search_for_test.rb

@@ -17,7 +17,7 @@ class ScopedSearch::Test::SearchFor < Test::Unit::TestCase
   end
   
   def test_search
-    Foo.searchable_on :string_field, :text_field, :date_field
+    Foo.searchable_on :string_field, :text_field, :date_field, :some_int_field
   
     assert_equal Foo.count, Foo.search_for('').count
     assert_equal 0, Foo.search_for('456').count   
@@ -32,6 +32,7 @@ class ScopedSearch::Test::SearchFor < Test::Unit::TestCase
     assert_equal 3, Foo.search_for('"Happy cow" OR "Sad Frog"').count
     assert_equal 3, Foo.search_for('"Man made" OR Dogs').count
     assert_equal 2, Foo.search_for('Cows OR "Frog Toys"').count   
+    assert_equal 1, Foo.search_for('700').count
   
     # ** DATES **   
     #
@@ -83,12 +84,13 @@ class ScopedSearch::Test::SearchFor < Test::Unit::TestCase
   end  
   
   def test_search_has_many_through_association
-    User.searchable_on :first_name, :last_name, :clients_first_name, :clients_last_name
+    User.searchable_on :first_name, :last_name, :age, :clients_first_name, :clients_last_name
       
     assert_equal User.count, User.search_for('').count        
     assert_equal 2, User.search_for('Smith').count     
     assert_equal 1, User.search_for('Sam').count
     assert_equal 1, User.search_for('Johnson').count
+    assert_equal 1, User.search_for('28').count
   end  
   
   def test_search_has_one_association

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wvanbergen-scoped_search
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-29 00:00:00 -08:00
+date: 2009-02-23 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -24,14 +24,10 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
-- CHANGELOG.rdoc
-- TODO.rdoc
 files: 
-- CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
 - Rakefile
-- TODO.rdoc
 - init.rb
 - lib
 - lib/scoped_search
@@ -40,6 +36,8 @@ files:
 - lib/scoped_search/query_language_parser.rb
 - lib/scoped_search/reg_tokens.rb
 - tasks
+- tasks/database_tests.rake
+- tasks/documentation.rake
 - tasks/github-gem.rake
 - test
 - test/database.yml

data/CHANGELOG.rdoc

@@ -1,13 +0,0 @@
-= Changelog for scoped_search
-
-The following changes were incorporated in each scoped_search release.
-
-== scoped_search 0.3.0
-- Detection of column types so they can be handled properly
-- Date based queries supported on date and time fields
-
-== scoped_search 0.2.0
-- OR keyword supported in query language
-
-== scoped_search 0.1.0
-- Initial version

data/TODO.rdoc

@@ -1,6 +0,0 @@
-= TODO items for scoped_search
-
-Contact me at my GitHub account (http://github.com/wvanbergen) if you want to help out.
-
-== Documentation & testing
-- Add rdoc and comments to code