blacklight-spotlight 3.5.0.3 → 3.6.0.beta1

data/app/models/spotlight/featured_image.rb

@@ -69,8 +69,7 @@ module Spotlight
       if self[:iiif_tilesource]
         self[:iiif_tilesource]
       elsif file_present?
-        riiif = Riiif::Engine.routes.url_helpers
-        riiif.info_path(self)
+        Spotlight::Engine.config.iiif_service.info_url(self)
       end
     end
 

data/app/models/spotlight/lock.rb

@@ -16,7 +16,7 @@ module Spotlight
     end
 
     def stale?
-      created_at < (Time.zone.now - 12.hours)
+      created_at < (12.hours.ago)
     end
   end
 end

data/app/models/spotlight/main_navigation.rb

@@ -19,11 +19,7 @@ module Spotlight
     end
 
     def label_or_default
-      if label.present?
-        label
-      else
-        default_label
-      end
+      label.presence || default_label
     end
 
     def default_label(**options)

data/app/models/spotlight/page.rb

@@ -7,7 +7,7 @@ module Spotlight
     MAX_PAGES = Spotlight::Engine.config.max_pages
 
     extend FriendlyId
-    # Note: This configuration also needs to be duplicated on the
+    # NOTE: This configuration also needs to be duplicated on the
     # STI models ({Spotlight::AboutPage}, {Spotlight::FeaturePage}, {Spotlight::HomePage})
     friendly_id :title, use: %i[slugged scoped finders history], scope: %i[exhibit locale], treat_reserved_as_conflict: true do |config|
       config.reserved_words&.concat(%w[update_all contacts])

data/app/models/spotlight/resources/iiif_manifest.rb

@@ -115,8 +115,8 @@ module Spotlight
       end
 
       def exhibit_custom_fields
-        @exhibit_custom_fields ||= exhibit.custom_fields.each_with_object({}) do |value, hash|
-          hash[value.label] = value
+        @exhibit_custom_fields ||= exhibit.custom_fields.index_by do |value|
+          value.label
         end
       end
 
@@ -243,14 +243,14 @@ module Spotlight
             # If any of the values have a language associated with them, the client must display all of the values associated with the language that best
             # matches the language preference.
             elsif value.any? { |v| v.is_a?(Hash) && v['@language'] == default_json_ld_language }
-              value.select { |v| v.is_a?(Hash) && v['@language'] == default_json_ld_language }.map { |v| v['@value'] }
+              value.select { |v| v.is_a?(Hash) && v['@language'] == default_json_ld_language }.pluck('@value')
             # If all of the values have a language associated with them, and none match the language preference, the client must select a language
             # and display all of the values associated with that language.
             elsif value.all? { |v| v.is_a?(Hash) && v.key?('@language') }
               selected_json_ld_language = value.find { |v| v.is_a?(Hash) && v.key?('@language') }
 
               value.select { |v| v.is_a?(Hash) && v['@language'] == selected_json_ld_language['@language'] }
-                   .map { |v| v['@value'] }
+                   .pluck('@value')
             # If some of the values have a language associated with them, but none match the language preference, the client must display all of the values
             # that do not have a language associated with them.
             else

data/app/models/spotlight/resources/iiif_service.rb

@@ -31,7 +31,7 @@ module Spotlight
 
       def self.http_client
         Faraday.new do |b|
-          b.use FaradayMiddleware::FollowRedirects
+          b.response :follow_redirects
           b.adapter Faraday.default_adapter
         end
       end

data/app/models/spotlight/resources/upload.rb

@@ -43,16 +43,13 @@ module Spotlight
       def to_solr
         return {} unless upload&.file_present?
 
-        spotlight_routes = Spotlight::Engine.routes.url_helpers
-        riiif = Riiif::Engine.routes.url_helpers
-
-        dimensions = Riiif::Image.new(upload_id).info
+        dimensions = Spotlight::Engine.config.iiif_service.info(id)
 
         {
           spotlight_full_image_width_ssm: dimensions.width,
           spotlight_full_image_height_ssm: dimensions.height,
-          Spotlight::Engine.config.thumbnail_field => riiif.image_path(upload, size: '!400,400'),
-          Spotlight::Engine.config.iiif_manifest_field => spotlight_routes.manifest_exhibit_solr_document_path(exhibit, compound_id)
+          Spotlight::Engine.config.thumbnail_field => Spotlight::Engine.config.iiif_service.thumbnail_url(upload),
+          Spotlight::Engine.config.iiif_manifest_field => Spotlight::Engine.config.iiif_service.manifest_url(exhibit, upload)
         }
       end
 

data/app/models/spotlight/search.rb

@@ -45,14 +45,14 @@ module Spotlight
       thumbnail.iiif_url
     end
 
-    def documents
+    def documents(&block)
       start = 0
       response = repository.search(search_params.start(start))
 
       return to_enum(:documents) { response['response']['numFound'] } unless block_given?
 
       while response.documents.present?
-        response.documents.each { |x| yield x }
+        response.documents.each(&block)
         start += response.documents.length
         response = repository.search(search_params.start(start))
       end

data/app/models/translation.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'i18n/backend/active_record'
+
 unless defined?(Translation)
   Translation = I18n::Backend::ActiveRecord::Translation
   Translation.include Spotlight::CustomTranslationExtension

data/app/presenters/spotlight/iiif_manifest_presenter.rb

@@ -79,7 +79,8 @@ module Spotlight
 
     def iiif_url
       # yes this is hacky, and we are appropriately ashamed.
-      controller.riiif.info_url(uploaded_resource.upload).sub(%r{/info\.json\Z}, '')
+      Spotlight::Engine.config.iiif_service.info_url(uploaded_resource.upload)
+                       .sub(%r{/info\.json\Z}, '')
     end
   end
 end

data/app/services/spotlight/iiif_resource_resolver.rb

@@ -57,20 +57,20 @@ module Spotlight
 
     def response
       @response ||= begin
-                      Spotlight::Resources::IiifService.http_client.get(iiif_manifest_url).body
-                    rescue Faraday::Error => e
-                      Rails.logger.warn("#{self.class.name} failed to fetch #{iiif_manifest_url} with: #{e}")
-                      '{}'
-                    end
+        Spotlight::Resources::IiifService.http_client.get(iiif_manifest_url).body
+      rescue Faraday::Error => e
+        Rails.logger.warn("#{self.class.name} failed to fetch #{iiif_manifest_url} with: #{e}")
+        '{}'
+      end
     end
 
     def manifest
       @manifest ||= begin
-                      JSON.parse(response)
-                    rescue JSON::ParserError => e
-                      Rails.logger.warn("#{self.class.name} failed to parse #{iiif_manifest_url} with: #{e}")
-                      {}
-                    end
+        JSON.parse(response)
+      rescue JSON::ParserError => e
+        Rails.logger.warn("#{self.class.name} failed to parse #{iiif_manifest_url} with: #{e}")
+        {}
+      end
     end
 
     class ManifestError < RuntimeError; end

data/app/uploaders/spotlight/bulk_updates_uploader.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Spotlight
+  # :nodoc:
   class BulkUpdatesUploader < CarrierWave::Uploader::Base
     storage Spotlight::Engine.config.uploader_storage
   end

data/app/views/layouts/spotlight/base.html.erb

@@ -19,6 +19,7 @@
     <%= description %>
     <%= twitter_card %>
     <%= opengraph %>
+    <%= javascript_tag "Spotlight.sirTrevorIcon = '#{asset_path('spotlight/blocks/sir-trevor-icons.svg')}'" %>
     <%= javascript_tag '$.fx.off = true;' if Rails.env.test? %>
   </head>
   <body class="<%= render_body_class %>">

data/app/views/shared/_exhibit_navbar.html.erb

@@ -12,7 +12,12 @@
     </ul>
     <% if should_render_spotlight_search_bar? %>
       <div class="navbar-right navbar-nav exhibit-search-form mt-3 mt-md-0">
-        <%= render_search_bar %>
+        <%= render Blacklight::SearchBarComponent.new(
+          url: search_action_url,
+          advanced_search_url: search_action_url(action: 'advanced_search'),
+          params: search_state.params_for_search.except(:qt),
+          autocomplete_path: suggest_index_catalog_path
+        ) %>
       </div>
     <% end %>
   </div>

data/app/views/spotlight/admin_users/index.html.erb

@@ -16,7 +16,9 @@
               <span class='badge badge-warning pending-label'><%= t('.pending') %></span>
             </td>
             <td>
-              <%= link_to(t('.destroy'), admin_user_path(user), method: :delete, class: 'btn btn-sm btn-danger float-right') unless user == current_user %>
+              <%= link_to(t('.destroy'), admin_user_path(user),
+                    data: { method: :delete, turbo_method: :delete },
+                    class: 'btn btn-sm btn-danger float-right') unless user == current_user %>
             </td>
           </tr>
         <% end %>
@@ -81,9 +83,13 @@
             </td>
             <td class="text-right">
               <% if user.superadmin? %>
-                <%= link_to(t('.destroy'), admin_user_path(user), method: :delete, class: 'btn btn-sm btn-danger') unless user == current_user %>
+                <%= link_to(t('.destroy'), admin_user_path(user),
+                      data: { method: :delete, turbo_method: :delete },
+                      class: 'btn btn-sm btn-danger') unless user == current_user %>
               <% else %>
-                <%= link_to(t('.update'), admin_user_path(user), method: :patch, class: 'btn btn-sm btn-secondary') %>
+                <%= link_to(t('.update'), admin_user_path(user), 
+                      data: { method: :patch, turbo_method: :patch },
+                      class: 'btn btn-sm btn-secondary') %>
               <% end %>
             </td>
           </tr>

data/app/views/spotlight/browse/show.html.erb

@@ -20,8 +20,8 @@
   <%= render partial: 'search_box', locals: {search: @search} %>
 <% end %>
 <% if @search.default_index_view_type && params[:view].blank? %>
-  <%= render_document_index_with_view(@search.default_index_view_type, @document_list) %>
+  <%= render_document_index_with_view(@search.default_index_view_type, @response.documents) %>
 <% else %>
-  <%= render_document_index(@document_list) %>
+  <%= render_document_index(@response.documents) %>
 <% end %>
 <%= render 'results_pagination' %>

data/app/views/spotlight/catalog/_admin_header.html.erb

@@ -4,7 +4,9 @@
   </div>
   <div class="add-items-nav clearfix">
     <div class="float-right">
-      <%= link_to t('.reindex'), reindex_all_exhibit_resources_path(current_exhibit), method: :post, class: 'btn btn-secondary' %>
+      <%= link_to t('.reindex'), reindex_all_exhibit_resources_path(current_exhibit), 
+          data: { method: :post, turbo_method: :post },
+          class: 'btn btn-secondary' %>
       <% if Spotlight::Engine.config.resource_partials.any? %>
         <%= link_to t('.new_resource'), new_exhibit_resource_path(current_exhibit), class: 'btn btn-primary' %>
       <% end %>

data/app/views/spotlight/catalog/_document_visibility_control.html.erb

@@ -1,5 +1,24 @@
 <% action = document.private?(current_exhibit) ? :make_public : :make_private %>
 
-<%= form_tag( [:visibility, current_exhibit, document], :method => document.private?(current_exhibit) ? :put : :delete, :class => "visiblity_toggle", "data-doc-id" => document.id, :'data-present' => t('.make_private.label'), :'data-absent' => t('.make_public.label'), :'data-inprogress' => t('.inprogress.label'), :'data-label-toggle-target' => "[data-label-toggle='#{document.id}']") do %>
-  <%= submit_tag(t(".#{action}.button"), :id => "visibility_toggle_#{document.id.to_s.parameterize}", :class => "visibility_#{action}") %>
+<%= form_tag([:visibility, current_exhibit, document],
+             method: document.private?(current_exhibit) ? :put : :delete,
+             class: 'visibility-toggle',
+             data: {
+               'doc-id': document.id,
+               present: t('.make_private'),
+               absent: t('.make_public'),
+               inprogress: t('.inprogress'),
+             }) do %>
+
+  <div class="checkbox toggle-visibility">
+    <label class="toggle-visibility" data-checkboxsubmit-target="label">
+      <input type="checkbox" class="toggle-visibility" data-checkboxsubmit-target="checkbox" <%= 'checked="checked"' if document.public?(current_exhibit) %>>
+      <span data-checkboxsubmit-target="span" class="sr-only">
+        <%= document.private?(current_exhibit) ? t('.make_public') : t('.make_private') %>
+      </span>
+    </label>
+  </div>
+
+  <%= submit_tag(t(".#{action}"), id: "visibility_toggle_#{document.id.to_s.parameterize}", class: "visibility-#{action}") %>
+
 <% end %>

data/app/views/spotlight/catalog/_index_compact_default.html.erb

@@ -6,7 +6,7 @@
   <%= render_document_partial document, 'admin_index_header', document_counter: document_counter %>
 
   <div class="page-links">
-  <%= view_link document, url_for_document(document) %> &middot;
+  <%= view_link document, search_state.url_for_document(document) %> &middot;
   <%= exhibit_edit_link document, [:edit, current_exhibit, document] %>
   </div>
 </td>

data/app/views/spotlight/exhibits/_confirmation_status.html.erb

@@ -4,6 +4,8 @@
               <% elsif contact_email.recently_sent? %>
                 <span class="confirmed"><%= blacklight_icon('check_circle') %> <%= t('.confirmation_sent') %></span>
               <% else %>
-                <span class="unconfirmed"><%= blacklight_icon('error') %> <%= t('.not_validated') %></span> <%= link_to t('.resend'), contact_email_confirmation_path(contact_email: {email: contact_email.email}),  method: :post %>
+                <span class="unconfirmed"><%= blacklight_icon('error') %> <%= t('.not_validated') %></span>
+                <%= link_to t('.resend'), contact_email_confirmation_path(contact_email: {email: contact_email.email}), 
+                            data: { method: :post, turbo_method: :post } %>
               <% end %>
             </div>

data/app/views/spotlight/exhibits/_contact.html.erb

@@ -12,7 +12,11 @@
           <div class="col-md-4">
             <% if contact.object.id %>
               <span class="contact-email-delete-wrapper">
-                <%= link_to exhibit_contact_email_path(exhibit_id: exhibit.id, id: contact.object.id), class: 'contact-email-delete btn btn-sm btn-danger', method: :delete, data: { confirm: t('.email_delete_confirmation'), remote: true } do %>
+                <%= link_to exhibit_contact_email_path(exhibit_id: exhibit.id, id: contact.object.id), class: 'contact-email-delete btn btn-sm btn-danger', 
+                            data: { method: :delete, turbo_method: :delete,
+                                    confirm: t('.email_delete_confirmation'),
+                                    turbo_confirm: t('.email_delete_confirmation'),
+                                    remote: true } do %>
                   <%= t('.email_delete_button') %>
                 <% end %>
               </span>

data/app/views/spotlight/shared/_exhibit_sidebar.html.erb

@@ -1,7 +1,9 @@
 <h2 class="sr-only"><%= t(:'.header') %></h2>
 <ul class="nav sidenav top-level flex-column">
   <%= nav_link t(:'spotlight.curation.sidebar.dashboard'), spotlight.exhibit_dashboard_path(current_exhibit) %>
+  <% if current_exhibit.analytics_provider&.enabled? %>
   <%= nav_link t(:'spotlight.curation.sidebar.analytics'), spotlight.analytics_exhibit_dashboard_path(current_exhibit) %>
+  <% end %>
 </ul>
 <%= render 'spotlight/shared/configuration_sidebar' if can? :update, current_exhibit %>
 <%= render 'spotlight/shared/curation_sidebar' %>

data/app/views/spotlight/shared/_report_a_problem.html.erb

@@ -3,7 +3,7 @@
     <% contact_form ||= Spotlight::ContactForm.new current_url: request.original_url %>
     <%= bootstrap_form_for contact_form, url: spotlight.exhibit_contact_form_path(current_exhibit, contact_form), layout: :horizontal, label_col: 'col-sm-3', control_col: 'col-sm-9', html: { class: 'col-md-offset-2 col-md-8 my-3 '} do |f| %>
       <h2><%= t(:'.title') %></h2>
-      <div class="alert alert-primary"><%= t('.reporting_from', url: contact_form.current_url) %></div>
+      <div class="alert alert-info"><%= t('.reporting_from', url: contact_form.current_url) %></div>
       <%= f.text_area :message, rows: 4 %>
       <%= f.text_field :name %>
       <%= render '/spotlight/shared/honeypot_field', f: f %>

data/app/views/spotlight/sir_trevor/blocks/_search_results_block.html.erb

@@ -1,7 +1,7 @@
 <% if search_results_block.searches? %>
 <div class="content-block documents">
   <% response, document_list = get_search_widget_search_results(search_results_block) %>
-  <%- unless document_list.present? %>
+  <%- unless response.documents.present? %>
     <div class="alert alert-warning">
       <strong>No items to display.</strong> There are currently no items in this exhibit that match the curator's search criteria.
     </div>
@@ -18,7 +18,7 @@
       <% end %>
 
       <h2 class="sr-only visually-hidden"><%= t('blacklight.search.search_results') %></h2>
-      <%= render_document_index_with_view(block_document_index_view_type(search_results_block), document_list) %>
+      <%= render_document_index_with_view(block_document_index_view_type(search_results_block), response.documents) %>
       <%= render 'results_pagination' %>
   <%- end %>
 </div>

data/app/views/spotlight/translations/_page.html.erb

@@ -40,7 +40,12 @@
       <%= link_to(t('.recreate'), polymorphic_path([:clone, current_exhibit, page], language: @language), data: { confirm: t('.recreate_are_you_sure') }) %>
       <% if page.feature_page? || page.about_page? %>
         &middot;
-        <%= link_to(t('.destroy'), polymorphic_path([current_exhibit, translated_page], locale: @language), method: :delete, data: { confirm: t('.destroy_are_you_sure') }) %>
+        <%= link_to(t('.destroy'), polymorphic_path([current_exhibit, translated_page], locale: @language), 
+                    data: {
+                      method: :delete, 
+                      turbo_method: :delete,
+                      confirm: t('.destroy_are_you_sure'),
+                      turbo_confirm: t('.destroy_are_you_sure') }) %>
       <% end %>
     <% end %>
   </td>

data/config/locales/spotlight.en.yml

@@ -373,14 +373,9 @@ en:
       breadcrumb:
         index: Search results
       document_visibility_control:
-        inprogress:
-          label: ''
-        make_private:
-          button: Make private
-          label: ''
-        make_public:
-          button: Make public
-          label: ''
+        inprogress: In progress
+        make_private: Make private
+        make_public: Make public
       edit_default:
         url-field:
           help: 'Valid file types: %{extensions}'
@@ -801,7 +796,7 @@ en:
         note_provenance_tesim: Provenance
         note_references_tesim: References
         note_source_tesim: Source
-        personal_name_ssim: Personal names
+        personal_name_ssm: Personal names
         search:
           all_fields: Everything
           author: Author

data/lib/generators/spotlight/install_generator.rb

@@ -10,29 +10,17 @@ module Spotlight
     class_option :solr_update_class, type: :string, default: 'Spotlight::SolrDocument::AtomicUpdates'
     class_option :mailer_default_url_host, type: :string, default: '' # e.g. localhost:3000
 
-    # we're not (yet) using webpacker, so we need to re-add sprockets functionality
+    # we're not using webpacker, so we need to re-add sprockets functionality
     def add_js_rails6
       return unless Rails.version.to_i == 6
 
-      gem 'coffee-rails', '~> 4.2'
-      gem 'uglifier', '>= 1.3.0'
-
-      append_to_file 'app/assets/config/manifest.js', "\n//= link_directory ../javascripts .js\n"
-      append_to_file 'app/assets/javascripts/application.js', "\n//= require_tree .\n"
+      # By default rails generates javascript_pack_tag, we'll change this to javascript_include_tag
       gsub_file 'app/views/layouts/application.html.erb', /pack/, 'include'
-      inject_into_file 'config/environments/production.rb', after: '  # config.assets.css_compressor = :sass' do
-        "\n  config.assets.js_compressor = :uglifier"
-      end
-
-      # but since webpacker exists in the gemfile, we still need to run the
-      # install before rails will start
-      run 'bundle exec rails webpacker:install'
     end
 
-    def add_js_rails7
-      return unless Rails.version.to_i == 7
-
+    def add_manifest
       append_to_file 'app/assets/javascripts/application.js', "\n//= require_tree .\n"
+      append_to_file 'app/assets/config/manifest.js', "\n//= link spotlight/manifest.js"
     end
 
     def inject_spotlight_routes
@@ -67,9 +55,9 @@ module Spotlight
 
       copy_file 'config/sitemap.rb', 'config/sitemap.rb'
 
-      say <<-EOS.strip_heredoc, :red
-       Added a default sitemap_generator configuration in config/sitemap.rb; please
-       update the default host to match your environment
+      say <<~EOS, :red
+        Added a default sitemap_generator configuration in config/sitemap.rb; please
+        update the default host to match your environment
       EOS
     end
 
@@ -132,14 +120,18 @@ module Spotlight
     end
 
     def add_osd_viewer
-      gem 'blacklight-gallery', '~> 4.0'
-      bundle_install
+      unless Bundler.locked_gems.dependencies.key? 'blacklight-gallery'
+        gem 'blacklight-gallery', '~> 4.0'
+        bundle_install
+      end
       generate 'blacklight_gallery:install'
     end
 
     def add_oembed
-      gem 'blacklight-oembed', '~> 1.0'
-      bundle_install
+      unless Bundler.locked_gems.dependencies.key? 'blacklight-oembed'
+        gem 'blacklight-oembed', '~> 1.0'
+        bundle_install
+      end
       generate 'blacklight_oembed:install'
       copy_file 'config/initializers/oembed.rb'
     end

data/lib/generators/spotlight/scaffold_resource_generator.rb

@@ -9,7 +9,7 @@ module Spotlight
     source_root File.expand_path('templates', __dir__)
 
     def create_model
-      create_file "app/models/#{file_name}_resource.rb", <<-FILE.strip_heredoc
+      create_file "app/models/#{file_name}_resource.rb", <<~FILE
         class #{class_name}Resource < Spotlight::Resource
           def self.indexing_pipeline
             @indexing_pipeline ||= super.dup.tap do |pipeline|
@@ -21,7 +21,7 @@ module Spotlight
     end
 
     def create_controller
-      create_file "app/controllers/#{file_name}_resources_controller.rb", <<-FILE.strip_heredoc
+      create_file "app/controllers/#{file_name}_resources_controller.rb", <<~FILE
         class #{class_name}ResourcesController < Spotlight::ResourcesController
           private
 
@@ -33,16 +33,16 @@ module Spotlight
     end
 
     def create_form
-      create_file "app/views/#{file_name}_resources/_form.html.erb", <<-FILE.strip_heredoc
-      <%= bootstrap_form_for([current_exhibit, @resource.becomes(#{class_name}Resource)], as: :resource) do |f| %>
-        <%= f.text_field :url  %>
-        <div class="form-actions">
-          <div class="primary-actions">
-            <%= cancel_link @resource, :back, class: 'btn btn-secondary' %>
-            <%= f.submit t('.add_item'), class: 'btn btn-primary' %>
+      create_file "app/views/#{file_name}_resources/_form.html.erb", <<~FILE
+        <%= bootstrap_form_for([current_exhibit, @resource.becomes(#{class_name}Resource)], as: :resource) do |f| %>
+          <%= f.text_field :url  %>
+          <div class="form-actions">
+            <div class="primary-actions">
+              <%= cancel_link @resource, :back, class: 'btn btn-secondary' %>
+              <%= f.submit t('.add_item'), class: 'btn btn-primary' %>
+            </div>
           </div>
-        </div>
-      <% end if can? :manage, @resource %>
+        <% end if can? :manage, @resource %>
       FILE
     end
   end
@@ -54,7 +54,7 @@ module Spotlight
   end
 
   def create_routes
-    route <<-FILE.strip_heredoc
+    route <<~FILE
       resources :exhibits, only: [] do
         resources :#{file_name}_resources, only: [:create, :update] do
         end

data/lib/generators/spotlight/templates/config/initializers/spotlight_initializer.rb

@@ -21,6 +21,9 @@
 # Spotlight::Engine.config.default_browse_index_view_type = :gallery
 # Spotlight::Engine.config.default_contact_email = nil
 
+# ==> IIIF configuration
+# Spotlight::Engine.config.iiif_service = Spotlight::RIIIFService
+
 # ==> Solr configuration
 # Spotlight::Engine.config.writable_index = true
 # Spotlight::Engine.config.solr_batch_size = 20

data/lib/generators/spotlight/templates/solr/conf/_rest_managed.json

@@ -0,0 +1,3 @@
+{
+  "initArgs":{},
+  "managedList":[]}

data/lib/generators/spotlight/templates/solr/conf/admin-extra.html

@@ -0,0 +1,31 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- The content of this page will be statically included into the top
+of the admin page.  Uncomment this as an example to see there the content
+will show up.
+
+<hr>
+<i>This line will appear before the first table</i>
+<tr>
+<td colspan="2">
+This row will be appended to the end of the first table
+</td>
+</tr>
+<hr>
+
+-->

data/lib/generators/spotlight/templates/solr/conf/elevate.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- If this file is found in the config directory, it will only be
+     loaded once at startup.  If it is found in Solr's data
+     directory, it will be re-loaded every commit.
+-->
+
+<elevate>
+ <query text="foo bar">
+  <doc id="1" />
+  <doc id="2" />
+  <doc id="3" />
+ </query>
+ 
+ <query text="ipod">
+   <doc id="MA147LL/A" />  <!-- put the actual ipod at the top -->
+   <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
+ </query>
+ 
+</elevate>