search.rb in blacklight-spotlight-3.0.0.alpha.1

- old
+ new

@@ -3,10 +3,12 @@
 module Spotlight
   ##
   # Exhibit saved searches
   class Search < ActiveRecord::Base
     include Spotlight::Translatables
+    include Spotlight::SearchHelper
+
     extend FriendlyId
     friendly_id :title, use: [:slugged, :scoped, :finders, :history], scope: :exhibit
 
     self.table_name = 'spotlight_searches'
     belongs_to :exhibit
@@ -52,38 +54,22 @@
     def display_masthead?
       masthead && masthead.display?
     end
 
     def search_params
-      search_builder.with(query_params.with_indifferent_access).merge(facet: false, fl: default_search_fields)
+      search_service.search_builder.with(query_params.with_indifferent_access).merge(facet: false)
     end
 
     def merge_params_for_search(params, blacklight_config)
       base_query = Blacklight::SearchState.new(query_params, blacklight_config)
       user_query = Blacklight::SearchState.new(params, blacklight_config).to_h
       base_query.params_for_search(user_query).merge(user_query.slice(:page))
     end
 
     private
 
-    def search_builder_class
-      blacklight_config.search_builder_class
-    end
-
-    def search_builder
-      search_builder_class.new(self)
-    end
-
     def repository
       @repository ||= Blacklight::Solr::Repository.new(blacklight_config)
-    end
-
-    def default_search_fields
-      [
-        blacklight_config.document_model.unique_key,
-        blacklight_config.index.title_field,
-        blacklight_config.index.thumbnail_field
-      ].compact
     end
 
     def should_generate_new_friendly_id?
       return false if new_record? && slug.present?
 