nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

returning nothing on empty query and limit the returning of the query to 90

Browse source
This commit is contained in:
zhitomirskiyi 2010-11-23 10:02:01 -08:00
parent 9d98afb94f
commit ebaf2c081e
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/person.rb
View file

@ -50,7 +50,7 @@ class Person
attr_accessible :profile attr_accessible :profile
def self.search(query) def self.search(query)
return Person.searchable.all if query.to_s.empty? return [] if query.to_s.empty?
query_tokens = query.to_s.strip.split(" ") query_tokens = query.to_s.strip.split(" ")
full_query_text = Regexp.escape(query.to_s.strip) full_query_text = Regexp.escape(query.to_s.strip)
@ -58,9 +58,9 @@ class Person
query_tokens.each do |token| query_tokens.each do |token|
q = Regexp.escape(token.to_s.strip) q = Regexp.escape(token.to_s.strip)
p = Person.searchable.all('profile.first_name' => /^#{q}/i) \ p = Person.searchable.all('profile.first_name' => /^#{q}/i, 'limit' => 30) \
| Person.searchable.all('profile.last_name' => /^#{q}/i) \ | Person.searchable.all('profile.last_name' => /^#{q}/i, 'limit' => 30) \
| Person.searchable.all('diaspora_handle' => /^#{q}/i) \ | Person.searchable.all('diaspora_handle' => /^#{q}/i, 'limit' => 30) \
| p | p
end end

5
spec/models/person_spec.rb
View file

@ -164,6 +164,11 @@ describe Person do
@connected_person_four.save @connected_person_four.save
end end
it 'should return nothing on an emprty query' do
people = Person.search("")
people.empty?.should be true
end
it 'should yield search results on partial names' do it 'should yield search results on partial names' do
people = Person.search("Eu") people = Person.search("Eu")
people.include?(@connected_person_two).should == true people.include?(@connected_person_two).should == true