Download as
Browse Code »

Commit 3b35e215936c959d3297c384fee0622512bda267

Authored by Rodrigo Souto
1 parent 43548e50
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

[search-term-improvements] Simple query normalization using downcase

Showing 5 changed files with 35 additions and 4 deletions   Show diff stats
app/controllers/public/search_controller.rb
  Diff comments   View file @3b35e21
... ... @@ -144,7 +144,7 @@ class SearchController < PublicController
144 144 end
145 145  
146 146 def suggestions
147   - render :text => find_suggestions(params[:term], environment, params[:asset]).to_json
  147 + render :text => find_suggestions(normalize_term(params[:term]), environment, params[:asset]).to_json
148 148 end
149 149  
150 150 #######################################################
... ...
app/helpers/search_term_helper.rb
  Diff comments   View file @3b35e21
... ... @@ -10,8 +10,8 @@ module SearchTermHelper
10 10 #FIXME For some reason the job is created but nothing is ran.
11 11 #handle_asynchronously :register_search_term
12 12  
13   - #TODO Think better on how to normalize them properly
  13 + #TODO Think smarter criteria to normalize search terms properly
14 14 def normalize_term(search_term)
15   - search_term
  15 + search_term.downcase
16 16 end
17 17 end
... ...
public/javascripts/application.js
  Diff comments   View file @3b35e21
... ... @@ -1070,7 +1070,7 @@ jQuery(document).ready(function(){
1070 1070 $(this).closest('form').submit();
1071 1071 },
1072 1072 source: function(request, response) {
1073   - var term = request.term;
  1073 + var term = request.term.toLowerCase();
1074 1074 if (term in suggestions_cache) {
1075 1075 response(suggestions_cache[term]);
1076 1076 return;
... ...
test/functional/search_controller_test.rb
  Diff comments   View file @3b35e21
... ... @@ -662,6 +662,14 @@ class SearchControllerTest < ActionController::TestCase
662 662 assert_equal [st1,st2].to_json, response.body
663 663 end
664 664  
  665 + should 'normalize search term for suggestions' do
  666 + st1 = 'UnIvErSe A'
  667 + st2 = 'uNiVeRsE B'
  668 + @controller.stubs(:find_suggestions).with('universe', Environment.default, 'communities').returns([st1, st2])
  669 + get :suggestions, :term => 'UNIveRSE', :asset => 'communities'
  670 + assert_equal [st1,st2].to_json, response.body
  671 + end
  672 +
665 673 protected
666 674  
667 675 def create_event(profile, options)
... ...
test/unit/search_term_helper_test.rb 0 → 100644
  Diff comments   View file @3b35e21
... ... @@ -0,0 +1,23 @@
  1 +require File.dirname(__FILE__) + '/../test_helper'
  2 +
  3 +class SearchTermTest < ActiveSupport::TestCase
  4 +
  5 + include SearchTermHelper
  6 +
  7 + should 'register search term' do
  8 + environment = Environment.default
  9 + assert_difference 'SearchTerm.count', 1 do
  10 + register_search_term('fred mercury', 10, 1, environment, 'people')
  11 + end
  12 + end
  13 +
  14 + should 'register search term normalized' do
  15 + environment = Environment.default
  16 + assert_difference 'SearchTerm.count', 1 do
  17 + register_search_term('FrEd mErCuRy', 10, 1, environment, 'people')
  18 + register_search_term('fReD MeRcUrY', 10, 1, environment, 'people')
  19 + assert SearchTerm.find_or_create('fred mercury', environment, 'people')
  20 + end
  21 + end
  22 +
  23 +end
... ...