@@ -1,5 +1,5 @@ .DS_Store -scoped_search-*.gem +*scoped_search-*.gem /tmp /doc /pkg .gitignore @@ -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 lib/scoped_search/query_conditions_builder.rb @@ -69,7 +69,7 @@ module ScopedSearch end end end - + return conditions_tree end lib/scoped_search/query_language_parser.rb @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'scoped_search' - s.version = '1.0.1' + s.version = '1.1.0' s.date = '2009-01-29' s.summary = "A Rails plugin to search your models using a named_scope" scoped_search.gemspec @@ -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 test/integration/api_test.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') test/lib/test_models.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 test/lib/test_schema.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| test/unit/query_conditions_builder_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 test/unit/query_language_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 test/unit/search_for_test.rb fd0392adf25b3ffaf815a44dc4a3dd8ae3569efa Wes Hays weshays@gbdev.com http://github.com/wvanbergen/scoped_search/commit/13cce4b70e9b48178c90686109e16cac1d7855e3 13cce4b70e9b48178c90686109e16cac1d7855e3 2009-02-23T12:14:44-08:00 2009-02-23T12:14:44-08:00 Added support for integer|int fields f2dcd9bd06e90d257992d75384c45a767076ea67 Wes Hays weshays@gbdev.com