refactoring search service and model

app/controllers/v1/search_controller.rb

@@ -4,30 +4,27 @@ class V1::SearchController < ApplicationController
   # GET v1/search
   # GET v1/search.json
   def index
-    render json: ActiveModel::ArraySerializer.new(SearchService.search(@search, current_user)), status: :ok
-  rescue => e
-    if e.message == 'Invalid search'
-      render json: @search.errors, status: :bad_request
-    else
-      render nothing: true, status: :internal_server_error
-    end
+    render json: SearchService.search(@search, current_user), status: :ok
+  rescue SearchService::InvalidSearchError => e
+    render json: @search.errors, status: :bad_request
   end
 
   # GET v1/search/autocomplete
   # GET v1/search/autocomplete.json
   def autocomplete
-    render json: ActiveModel::ArraySerializer.new(SearchService.autocomplete(@search, current_user)), status: :ok
-  rescue => e
-    if e.message == 'Invalid search'
-      render json: @search.errors, status: :bad_request
-    else
-      render nothing: true, status: :internal_server_error
-    end
+    render json: ArraySerializer.new(SearchService.autocomplete(@search, current_user)), status: :ok
+  rescue SearchService::InvalidSearchError => e
+    render json: @search.errors, status: :bad_request
   end
 
   private
 
   def set_search
-    @search = Search.new(params)
+    @search = Search.new(search_params)
+  end
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def search_params
+    params.require(:search).permit(:page, :results_per_page, :order, :query, :search_class)
   end
 end

app/models/search.rb

@@ -4,7 +4,7 @@ class Search
 
   validates_presence_of :query, :results_per_page, :order, :search_class
   validates_numericality_of :results_per_page, greater_than: 0
-  validates :search_class, inclusion: { in: %w(LearningObject Collection User) }
+  validates :search_class, inclusion: { in: ::SearchService::SEARCH_CLASSES }
 
   def initialize(params = {})
     super(defaults.merge(params.select { |key, _value| respond_to? key }))

app/services/search_service.rb

 module SearchService
+  SEARCH_CLASSES = %w(LearningObject Collection User)
+
+  class InvalidSearchError < StandardError; end;
+
   def self.search(search, user)
     model = instance(search, user)
     model.search.results
@@ -9,8 +13,10 @@ module SearchService
     model.autocomplete
   end
 
+  private
+
   def self.instance(search, user)
-    raise 'Invalid search' unless search.valid?
+    raise InvalidSearchError unless search.valid?
     "SearchService::#{search.search_class}".constantize.new(search, user)
   end
 end

config/routes.rb

@@ -71,8 +71,11 @@ Rails.application.routes.draw do
     end
 
     # search routes
-    get :search, to: 'search#index'
-    get 'search/autocomplete', to: 'search#autocomplete'
+    resources :search, only: :index do
+      collection do
+        get :autocomplete
+      end
+    end
 
     resources :collections, concerns: [:followable, :sociable, :reviewable, :taggable, :versionable, :deletable, :highlights]
     resources :learning_objects, concerns: [:sociable, :reviewable, :taggable, :versionable, :deletable, :highlights] do

test/controllers/v1/search_controller_test.rb

@@ -9,23 +9,20 @@ class V1::SearchControllerTest < ActionController::TestCase
     auth_application
   end
 
-  test 'should get index and return :ok' do
-    get :index, search_class: 'LearningObject'
-    assert_response :ok
+  test 'should search return :ok' do
+    SearchService::SEARCH_CLASSES.each do |search_class|
+      get :index, search: {search_class: search_class}
+      assert_response :ok
+    end
   end
 
-  test 'should get index and return :bad_request' do
-    get :index
+  test 'should search with invalid class and return :bad_request' do
+    get :index, search: {search_class: 'invalid'}
     assert_response :bad_request
   end
 
-  test 'should get autocomplete and return :ok' do
-    get :autocomplete, search_class: 'LearningObject'
-    assert_response :ok
-  end
-
-  test 'should get autocomplete and return :bad_request' do
-    get :autocomplete
+  test 'should autocomplete with invalid class and return :bad_request' do
+    get :autocomplete, search: {search_class: 'invalid'}
     assert_response :bad_request
   end