From 762bc5b787ce65101960578d0b7f0db98e0f922b Mon Sep 17 00:00:00 2001 From: Vincent Martinez Date: Wed, 1 Mar 2017 21:10:15 +0000 Subject: [PATCH] Simplify Search::PageSearcher#search Remove #validate_query as it's unnecessary. validate_query checks that query is not black, so we can make the same inline check. --- app/services/search/page_searcher.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/services/search/page_searcher.rb b/app/services/search/page_searcher.rb index d52ded07c..69882d91a 100644 --- a/app/services/search/page_searcher.rb +++ b/app/services/search/page_searcher.rb @@ -7,7 +7,7 @@ def initialize(params) def search [*@queries].each do |search_type, query| - if !validate_query(query) + if query.blank? next else case search_type.to_s @@ -35,11 +35,6 @@ def search private - def validate_query(query) - # if query is an empty array, nil or an empty string, skip filtering for that query - [[], nil, ''].include? query ? false : true - end - def combine_collections(collection1, collection2) # get union of unique values in collection1 and collection2 arr = (collection1 | collection2).uniq