blacklight-spotlight 0.19.1 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fcd8fc066ada25ea481ac2794e080804013a3dd
-  data.tar.gz: b915e2ddab7b609f7359cca735298a04433fd5a3
+  metadata.gz: 38fb99b5c2366b2cf6ac5a264e215ed7b0611c43
+  data.tar.gz: 72ba109b5f3c5d257de360f0faf3b8a6eee1b24b
 SHA512:
-  metadata.gz: 9a905461d224104c93c8d6d215088e50e5c450e2abe82ca0db2d13e7c16f2e6abf0fad2eb41bb6cb4af872a1a130ab40fdf63e044645eeb46a1c2c7c0f58047e
-  data.tar.gz: bad97d38c3b0ddf5917e688068d64d6a6d22bfa5fbd6d4b2e96f8993250e008dea0900d6cec5a92ad843c35f509a4a41b3339356370125229475b18ffc1bf3fb
+  metadata.gz: 029fc6b6a22f5e5b12c71d50a2721a6f638a808988dbfdc2e3fafa614fb670d11eedd62fe45a15da36aa1262b1c8098efa16bb659594a65998065605520da1ad
+  data.tar.gz: dfccd052193692da330ee70c0bc9b728961fd36ab8855884d7a9ff7cdd2a495370a99ebc66a4574904f6092f90edc5c5349c0aa7b87eb6554b75108d606db50b

data/app/assets/stylesheets/spotlight/_bootstrap_overrides.scss

@@ -50,18 +50,6 @@ h1,h2,h3,h4,h5,h6 {
   }
 }
 
-.dropdown-toggle {
-  .glyphicon {
-    line-height: 1.5;
-  }
-}
-
- .search-btn, .view-type-group {
-  .glyphicon {
-    line-height: 1.45;
-  }
- }
-
 #content > .page-header:first-child {
   margin-top: 0;
 }

data/app/models/concerns/spotlight/resources/open_graph.rb

@@ -23,10 +23,6 @@ module Spotlight
           ["#{k.parameterize('_')}_tesim", v]
         end]
       end
-
-      def to_solr
-        super.merge(opengraph_properties)
-      end
     end
   end
 end

data/app/models/spotlight/resource.rb

@@ -5,6 +5,9 @@ module Spotlight
     include Spotlight::SolrDocument::AtomicUpdates
     include ActiveSupport::Benchmarkable
 
+    class_attribute :document_builder_class
+    self.document_builder_class = SolrDocumentBuilder
+
     extend ActiveModel::Callbacks
     define_model_callbacks :index
 
@@ -40,66 +43,8 @@ module Spotlight
       Spotlight::ReindexJob.perform_later(self)
     end
 
-    concerning :GeneratingSolrDocuments do
-      ##
-      # @abstract
-      # Convert this resource into zero-to-many new solr documents. The data here
-      # should be merged into the resource-specific {#to_solr} data.
-      #
-      # @return [Hash] a single solr document hash
-      # @return [Enumerator<Hash>] multiple solr document hashes. This can be a
-      #   simple array, or an lazy enumerator
-      def to_solr
-        (exhibit_specific_solr_data || {}).merge(spotlight_resource_metadata_for_solr || {})
-      end
-
-      protected
-
-      ##
-      # @return an enumerator of all the indexable documents for this resource
-      def documents_to_index
-        data = to_solr
-        return [] if data.blank?
-        data &&= [data] if data.is_a? Hash
-
-        return to_enum(:documents_to_index) { data.size } unless block_given?
-
-        data.lazy.reject(&:blank?).each do |doc|
-          yield doc.reverse_merge(existing_solr_doc_hash(doc[unique_key]) || {})
-        end
-      end
-
-      private
-
-      ##
-      # Get any exhibit-specific metadata stored in e.g. sidecars, tags, etc
-      # This needs the generated solr document
-      def existing_solr_doc_hash(id)
-        document_model.new(unique_key => id).to_solr if document_model && id.present?
-      end
-
-      def unique_key
-        if document_model
-          document_model.unique_key.to_sym
-        else
-          :id
-        end
-      end
-
-      def exhibit_specific_solr_data
-        exhibit.solr_data if exhibit
-      end
-
-      def spotlight_resource_metadata_for_solr
-        {
-          Spotlight::Engine.config.resource_global_id_field => (to_global_id.to_s if persisted?),
-          document_model.resource_type_field => self.class.to_s.tableize
-        }
-      end
-
-      def document_model
-        exhibit.blacklight_config.document_model if exhibit
-      end
+    def document_model
+      exhibit.blacklight_config.document_model if exhibit
     end
 
     concerning :Indexing do
@@ -112,7 +57,7 @@ module Spotlight
           count = 0
 
           run_callbacks :index do
-            documents_to_index.each_slice(batch_size) do |batch|
+            document_builder.documents_to_index.each_slice(batch_size) do |batch|
               write_to_index(batch)
               update(last_indexed_count: (count += batch.length))
             end
@@ -122,13 +67,17 @@ module Spotlight
         end
       end
 
+      def document_builder
+        @document_builder ||= document_builder_class.new(self)
+      end
+
       protected
 
       def reindex_with_logging
         time_start = Time.zone.now
 
         update(indexed_at: time_start,
-               last_indexed_estimate: documents_to_index.size,
+               last_indexed_estimate: document_builder.documents_to_index.size,
                last_indexed_finished: nil,
                last_index_elapsed_time: nil)
 

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

@@ -10,6 +10,8 @@ module Spotlight
       # we want to do this before reindexing
       after_create :update_document_sidecar
 
+      self.document_builder_class = UploadSolrDocumentBuilder
+
       def self.fields(exhibit)
         @fields ||= {}
         @fields[exhibit] ||= begin
@@ -18,54 +20,18 @@ module Spotlight
         end
       end
 
-      def configured_fields
-        self.class.fields(exhibit)
+      def compound_id
+        "#{exhibit_id}-#{id}"
       end
 
-      def to_solr
-        store_url! # so that #url doesn't return the tmp directory
-
-        solr_hash = super
-
-        add_default_solr_fields solr_hash
-
-        add_image_dimensions solr_hash
-
-        add_file_versions solr_hash
-
-        add_sidecar_fields solr_hash
-
-        solr_hash
+      def sidecar
+        @sidecar ||= document_model.new(id: compound_id).sidecar(exhibit)
       end
 
       private
 
-      def add_default_solr_fields(solr_hash)
-        solr_hash[exhibit.blacklight_config.document_model.unique_key.to_sym] = compound_id
-      end
-
-      def add_image_dimensions(solr_hash)
-        dimensions = ::MiniMagick::Image.open(url.file.file)[:dimensions]
-        solr_hash[:spotlight_full_image_width_ssm] = dimensions.first
-        solr_hash[:spotlight_full_image_height_ssm] = dimensions.last
-      end
-
-      def add_file_versions(solr_hash)
-        spotlight_image_derivatives.each do |config|
-          solr_hash[config[:field]] = if config[:version]
-                                        url.send(config[:version]).url
-                                      else
-                                        url.url
-                                      end
-        end
-      end
-
-      def add_sidecar_fields(solr_hash)
-        solr_hash.merge! sidecar.to_solr
-      end
-
-      def compound_id
-        "#{exhibit_id}-#{id}"
+      def configured_fields
+        self.class.fields(exhibit)
       end
 
       def update_document_sidecar
@@ -83,10 +49,6 @@ module Spotlight
       def configured_fields_data
         data.slice(*configured_fields.map(&:field_name).map(&:to_s)).select { |_k, v| v.present? }
       end
-
-      def sidecar
-        @sidecar ||= document_model.new(id: compound_id).sidecar(exhibit)
-      end
     end
   end
 end

data/app/services/spotlight/solr_document_builder.rb

@@ -0,0 +1,67 @@
+module Spotlight
+  # Creates solr documents for the documents in a resource
+  class SolrDocumentBuilder
+    def initialize(resource)
+      @resource = resource
+    end
+
+    attr_reader :resource
+    delegate :exhibit, :document_model, to: :resource
+
+    ##
+    # @return an enumerator of all the indexable documents for this resource
+    def documents_to_index
+      data = to_solr
+      return [] if data.blank?
+      data &&= [data] if data.is_a? Hash
+
+      return to_enum(:documents_to_index) { data.size } unless block_given?
+
+      data.lazy.reject(&:blank?).each do |doc|
+        yield doc.reverse_merge(existing_solr_doc_hash(doc[unique_key]) || {})
+      end
+    end
+
+    protected
+
+    ##
+    # @abstract
+    # Convert this resource into zero-to-many new solr documents. The data here
+    # should be merged into the resource-specific {#to_solr} data.
+    #
+    # @return [Hash] a single solr document hash
+    # @return [Enumerator<Hash>] multiple solr document hashes. This can be a
+    #   simple array, or an lazy enumerator
+    def to_solr
+      (exhibit_specific_solr_data || {}).merge(spotlight_resource_metadata_for_solr || {})
+    end
+
+    private
+
+    ##
+    # Get any exhibit-specific metadata stored in e.g. sidecars, tags, etc
+    # This needs the generated solr document
+    def existing_solr_doc_hash(id)
+      document_model.new(unique_key => id).to_solr if document_model && id.present?
+    end
+
+    def unique_key
+      if document_model
+        document_model.unique_key.to_sym
+      else
+        :id
+      end
+    end
+
+    def exhibit_specific_solr_data
+      exhibit.solr_data if exhibit
+    end
+
+    def spotlight_resource_metadata_for_solr
+      {
+        Spotlight::Engine.config.resource_global_id_field => (resource.to_global_id.to_s if resource.persisted?),
+        document_model.resource_type_field => resource.class.to_s.tableize
+      }
+    end
+  end
+end

data/app/services/spotlight/upload_solr_document_builder.rb

@@ -0,0 +1,48 @@
+module Spotlight
+  # Creates solr documents for the uploaded documents in a resource
+  class UploadSolrDocumentBuilder < SolrDocumentBuilder
+    delegate :compound_id, to: :resource
+
+    def to_solr
+      resource.store_url! # so that #url doesn't return the tmp directory
+
+      solr_hash = super
+
+      add_default_solr_fields solr_hash
+
+      add_image_dimensions solr_hash
+
+      add_file_versions solr_hash
+
+      add_sidecar_fields solr_hash
+
+      solr_hash
+    end
+
+    private
+
+    def add_default_solr_fields(solr_hash)
+      solr_hash[exhibit.blacklight_config.document_model.unique_key.to_sym] = compound_id
+    end
+
+    def add_image_dimensions(solr_hash)
+      dimensions = ::MiniMagick::Image.open(resource.url.file.file)[:dimensions]
+      solr_hash[:spotlight_full_image_width_ssm] = dimensions.first
+      solr_hash[:spotlight_full_image_height_ssm] = dimensions.last
+    end
+
+    def add_file_versions(solr_hash)
+      resource.spotlight_image_derivatives.each do |config|
+        solr_hash[config[:field]] = if config[:version]
+                                      resource.url.send(config[:version]).url
+                                    else
+                                      resource.url.url
+                                    end
+      end
+    end
+
+    def add_sidecar_fields(solr_hash)
+      solr_hash.merge! resource.sidecar.to_solr
+    end
+  end
+end

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

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html lang="en" class="no-js">
   <head>
     <meta charset="utf-8">

data/lib/spotlight/version.rb

@@ -1,3 +1,3 @@
 module Spotlight
-  VERSION = '0.19.1'.freeze
+  VERSION = '0.19.2'.freeze
 end

data/spec/models/spotlight/resource_spec.rb

@@ -4,21 +4,6 @@ describe Spotlight::Resource, type: :model do
   end
   let(:exhibit) { FactoryGirl.create(:exhibit) }
 
-  describe '#to_solr' do
-    before do
-      allow(subject).to receive(:exhibit).and_return(exhibit)
-      allow(subject).to receive_messages(type: 'Spotlight::Resource::Something', id: 15, persisted?: true)
-    end
-    it 'includes a reference to the resource' do
-      expect(subject.to_solr).to include spotlight_resource_id_ssim: subject.to_global_id.to_s
-    end
-
-    it 'includes exhibit-specific data' do
-      allow(exhibit).to receive(:solr_data).and_return(exhibit_data: true)
-      expect(subject.to_solr).to include exhibit_data: true
-    end
-  end
-
   describe '#reindex' do
     context 'with a provider that generates ids' do
       subject do
@@ -31,7 +16,7 @@ describe Spotlight::Resource, type: :model do
         SolrDocument.new(id: 123).sidecars.create!(exhibit: exhibit, data: { document_data: true })
         allow(subject).to receive_messages(to_global_id: '')
 
-        allow(subject).to receive(:to_solr).and_return(solr_response)
+        allow(subject.document_builder).to receive(:to_solr).and_return(solr_response)
       end
 
       it 'includes exhibit document-specific data' do

data/spec/models/spotlight/resources/open_graph_spec.rb

@@ -1,7 +1,12 @@
-
 describe Spotlight::Resources::OpenGraph, type: :model do
+  class TestDocBuilder < Spotlight::SolrDocumentBuilder
+    def to_solr
+      super.merge(resource.opengraph_properties)
+    end
+  end
+
   class TestResource < Spotlight::Resource
-    include Spotlight::Resources::Web
+    self.document_builder_class = TestDocBuilder
     include Spotlight::Resources::OpenGraph
   end
 
@@ -14,7 +19,7 @@ describe Spotlight::Resources::OpenGraph, type: :model do
       allow(subject).to receive_messages id: 15, opengraph_properties: {}, exhibit: exhibit, persisted?: true
     end
 
-    let(:solr_doc) { subject.to_solr }
+    let(:solr_doc) { subject.document_builder.to_solr }
 
     it 'includes this record id' do
       expect(solr_doc).to include spotlight_resource_id_ssim: subject.to_global_id.to_s

data/spec/models/spotlight/resources/upload_spec.rb

@@ -2,9 +2,8 @@
 describe Spotlight::Resources::Upload, type: :model do
   let!(:exhibit) { FactoryGirl.create :exhibit }
   let!(:custom_field) { FactoryGirl.create :custom_field, exhibit: exhibit }
-  before do
-    subject.exhibit = exhibit
-  end
+  let(:resource) { described_class.new(exhibit: exhibit) }
+  let(:doc_builder) { resource.document_builder }
 
   let(:configured_fields) { [title_field] + described_class.fields(exhibit) }
   let(:title_field) { OpenStruct.new(field_name: 'configured_title_field') }
@@ -19,22 +18,23 @@ describe Spotlight::Resources::Upload, type: :model do
   end
 
   before do
-    allow(subject).to receive(:configured_fields).and_return configured_fields
+    allow(resource).to receive(:configured_fields).and_return configured_fields
     allow(described_class).to receive(:fields).and_return configured_fields
 
-    allow(subject.send(:blacklight_solr)).to receive(:update)
+    allow(resource.send(:blacklight_solr)).to receive(:update)
     allow(Spotlight::Engine.config).to receive(:upload_title_field).and_return(title_field)
-    subject.data = upload_data
-    subject.url = File.open(File.join(FIXTURES_PATH, '800x600.png'))
-    subject.save
+    resource.data = upload_data
+    resource.url = File.open(File.join(FIXTURES_PATH, '800x600.png'))
+    resource.save
   end
 
   context 'with a custom upload title field' do
     let(:title_field) { OpenStruct.new(field_name: 'configured_title_field', solr_field: :some_other_field) }
+    subject { doc_builder.to_solr }
 
     describe '#to_solr' do
       it 'stores the title field in the provided solr field' do
-        expect(subject.to_solr[:some_other_field]).to eq 'Title Data'
+        expect(subject[:some_other_field]).to eq 'Title Data'
       end
     end
   end
@@ -51,42 +51,46 @@ describe Spotlight::Resources::Upload, type: :model do
     end
 
     describe '#to_solr' do
+      subject { doc_builder.to_solr }
+
       it 'maps a single uploaded field to multiple solr fields' do
-        expect(subject.to_solr['a']).to eq 'value'
-        expect(subject.to_solr['b']).to eq 'value'
+        expect(subject['a']).to eq 'value'
+        expect(subject['b']).to eq 'value'
       end
     end
   end
 
   describe '#to_solr' do
+    subject { doc_builder.to_solr }
+
     it 'has the exhibit id and the upload id as the solr id' do
-      expect(subject.to_solr[:id]).to eq "#{subject.exhibit.id}-#{subject.id}"
+      expect(subject[:id]).to eq "#{resource.exhibit.id}-#{resource.id}"
     end
 
     it 'has a title field using the exhibit specific blacklight_config' do
-      expect(subject.to_solr['configured_title_field']).to eq 'Title Data'
+      expect(subject['configured_title_field']).to eq 'Title Data'
     end
 
     it 'has the other additional configured fields' do
-      expect(subject.to_solr[:spotlight_upload_description_tesim]).to eq 'Description Data'
-      expect(subject.to_solr[:spotlight_upload_attribution_tesim]).to eq 'Attribution Data'
-      expect(subject.to_solr[:spotlight_upload_date_tesim]).to eq 'Date Data'
+      expect(subject[:spotlight_upload_description_tesim]).to eq 'Description Data'
+      expect(subject[:spotlight_upload_attribution_tesim]).to eq 'Attribution Data'
+      expect(subject[:spotlight_upload_date_tesim]).to eq 'Date Data'
     end
 
     it 'has a spotlight_resource_type field' do
-      expect(subject.to_solr[:spotlight_resource_type_ssim]).to eq 'spotlight/resources/uploads'
+      expect(subject[:spotlight_resource_type_ssim]).to eq 'spotlight/resources/uploads'
     end
     it 'has the various image fields' do
-      expect(subject.to_solr).to have_key Spotlight::Engine.config.full_image_field
-      expect(subject.to_solr).to have_key Spotlight::Engine.config.thumbnail_field
-      expect(subject.to_solr).to have_key Spotlight::Engine.config.square_image_field
+      expect(subject).to have_key Spotlight::Engine.config.full_image_field
+      expect(subject).to have_key Spotlight::Engine.config.thumbnail_field
+      expect(subject).to have_key Spotlight::Engine.config.square_image_field
     end
     it 'has the full image dimensions fields' do
-      expect(subject.to_solr[:spotlight_full_image_height_ssm]).to eq 600
-      expect(subject.to_solr[:spotlight_full_image_width_ssm]).to eq 800
+      expect(subject[:spotlight_full_image_height_ssm]).to eq 600
+      expect(subject[:spotlight_full_image_width_ssm]).to eq 800
     end
     it 'has fields representing exhibit specific custom fields' do
-      expect(subject.to_solr[custom_field.solr_field]).to eq 'Custom Field Data'
+      expect(subject[custom_field.solr_field]).to eq 'Custom Field Data'
     end
   end
 end

data/spec/services/spotlight/solr_document_builder_spec.rb

@@ -0,0 +1,22 @@
+describe Spotlight::SolrDocumentBuilder do
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:doc_builder) { described_class.new(resource) }
+  let(:resource) { Spotlight::Resource.new }
+
+  describe '#to_solr' do
+    subject { doc_builder.send(:to_solr) }
+
+    before do
+      allow(resource).to receive(:exhibit).and_return(exhibit)
+      allow(resource).to receive_messages(type: 'Spotlight::Resource::Something', id: 15, persisted?: true)
+    end
+    it 'includes a reference to the resource' do
+      expect(subject).to include spotlight_resource_id_ssim: resource.to_global_id.to_s
+    end
+
+    it 'includes exhibit-specific data' do
+      allow(exhibit).to receive(:solr_data).and_return(exhibit_data: true)
+      expect(subject).to include exhibit_data: true
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.19.2
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -249,14 +249,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: roar-rails
   requirement: !ruby/object:Gem::Requirement
@@ -913,6 +913,8 @@ files:
 - app/serializers/spotlight/main_navigation_representer.rb
 - app/serializers/spotlight/page_representer.rb
 - app/services/spotlight/carrierwave_file_resolver.rb
+- app/services/spotlight/solr_document_builder.rb
+- app/services/spotlight/upload_solr_document_builder.rb
 - app/uploaders/spotlight/attachment_uploader.rb
 - app/uploaders/spotlight/avatar_uploader.rb
 - app/uploaders/spotlight/featured_image_uploader.rb
@@ -925,7 +927,6 @@ files:
 - app/views/blacklight/nav/_search_history.html.erb
 - app/views/catalog/_image_default.html.erb
 - app/views/catalog/_save_search.html.erb
-- app/views/catalog/_search_form.html.erb
 - app/views/devise/confirmations/new.html.erb
 - app/views/devise/mailer/invitation_instructions.html.erb
 - app/views/layouts/spotlight/home.html.erb
@@ -1292,6 +1293,7 @@ files:
 - spec/routing/spotlight/pages_routing_spec.rb
 - spec/serializers/spotlight/exhibit_export_serializer_spec.rb
 - spec/services/spotlight/carrierwave_file_resolver_spec.rb
+- spec/services/spotlight/solr_document_builder_spec.rb
 - spec/spec_helper.rb
 - spec/support/controllers/engine_helpers.rb
 - spec/support/features/test_features_helpers.rb
@@ -1383,221 +1385,222 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections
   to create attractive, feature-rich websites that feature these collections.
 test_files:
-- spec/views/_user_util_links.html.erb_spec.rb
-- spec/views/shared/_footer.html.erb_spec.rb
-- spec/views/shared/_exhibit_navbar.html.erb_spec.rb
-- spec/views/shared/_analytics.html.erb_spec.rb
-- spec/views/shared/_header_navbar.html.erb_spec.rb
-- spec/views/shared/_masthead.html.erb_spec.rb
-- spec/views/spotlight/home_pages/_empty.html.erb_spec.rb
-- spec/views/spotlight/home_pages/_sidebar.html.erb_spec.rb
-- spec/views/spotlight/roles/index.html.erb_spec.rb
-- spec/views/spotlight/dashboards/analytics.html.erb_spec.rb
-- spec/views/spotlight/dashboards/_analytics.html.erb_spec.rb
-- spec/views/spotlight/exhibits/_exhibit_card_front.html.erb_spec.rb
-- spec/views/spotlight/exhibits/edit.html.erb_spec.rb
-- spec/views/spotlight/exhibits/index.html.erb_spec.rb
-- spec/views/spotlight/sites/edit_exhibits.html.erb_spec.rb
-- spec/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb_spec.rb
-- spec/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb_spec.rb
-- spec/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb_spec.rb
-- spec/views/spotlight/sir_trevor/blocks/_iframe_block.html.erb_spec.rb
-- spec/views/spotlight/sir_trevor/blocks/_rule_block.html.erb_spec.rb
-- spec/views/spotlight/sir_trevor/blocks/_browse_block.html.erb_spec.rb
-- spec/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb_spec.rb
-- spec/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb_spec.rb
-- spec/views/spotlight/feature_pages/_empty.html.erb_spec.rb
-- spec/views/spotlight/feature_pages/_sidebar.html.erb_spec.rb
-- spec/views/spotlight/search_configurations/_facet_metadata.html.erb_spec.rb
-- spec/views/spotlight/search_configurations/_sort.html.erb_spec.rb
-- spec/views/spotlight/search_configurations/_search_fields.html.erb_spec.rb
-- spec/views/spotlight/about_pages/_empty.html.erb_spec.rb
-- spec/views/spotlight/about_pages/_sidebar.html.erb_spec.rb
-- spec/views/spotlight/about_pages/index.html.erb_spec.rb
-- spec/views/spotlight/searches/_search.html.erb_spec.rb
-- spec/views/spotlight/searches/edit.html.erb_spec.rb
-- spec/views/spotlight/searches/index.html.erb_spec.rb
-- spec/views/spotlight/contacts/edit.html.erb_spec.rb
-- spec/views/spotlight/browse/_search.html.erb_spec.rb
-- spec/views/spotlight/browse/_sort_and_per_page.html.erb_spec.rb
-- spec/views/spotlight/browse/show.html.erb_spec.rb
-- spec/views/spotlight/browse/index.html.erb_spec.rb
-- spec/views/spotlight/metadata_configurations/_metadata_field.html.erb_spec.rb
-- spec/views/spotlight/metadata_configurations/edit.html.erb_spec.rb
-- spec/views/spotlight/catalog/admin.html.erb_spec.rb
-- spec/views/spotlight/catalog/edit.html.erb_spec.rb
-- spec/views/spotlight/catalog/_edit_default.html.erb_spec.rb
-- spec/views/spotlight/resources/new.html.erb_spec.rb
-- spec/views/spotlight/resources/_external_resources_form.html.erb_spec.rb
-- spec/views/spotlight/pages/new.html.erb_spec.rb
-- spec/views/spotlight/pages/show.html.erb_spec.rb
-- spec/views/spotlight/pages/edit.html.erb_spec.rb
-- spec/views/spotlight/pages/index.html.erb_spec.rb
-- spec/views/spotlight/tags/index.html.erb_spec.rb
-- spec/support/views/test_view_helpers.rb
-- spec/support/controllers/engine_helpers.rb
-- spec/support/helpers/controller_level_helpers.rb
-- spec/support/features/test_features_helpers.rb
 - spec/controllers/application_controller_spec.rb
-- spec/controllers/spotlight/contacts_controller_spec.rb
-- spec/controllers/spotlight/exhibits_controller_spec.rb
+- spec/controllers/spotlight/about_pages_controller_spec.rb
+- spec/controllers/spotlight/admin_users_controller_spec.rb
+- spec/controllers/spotlight/appearances_controller_spec.rb
 - spec/controllers/spotlight/application_controller_spec.rb
-- spec/controllers/spotlight/versions_controller_spec.rb
 - spec/controllers/spotlight/attachments_controller_spec.rb
-- spec/controllers/spotlight/appearances_controller_spec.rb
-- spec/controllers/spotlight/search_configurations_controller_spec.rb
-- spec/controllers/spotlight/admin_users_controller_spec.rb
 - spec/controllers/spotlight/browse_controller_spec.rb
-- spec/controllers/spotlight/feature_pages_controller_spec.rb
-- spec/controllers/spotlight/sites_controller_spec.rb
-- spec/controllers/spotlight/tags_controller_spec.rb
-- spec/controllers/spotlight/confirmations_controller_spec.rb
-- spec/controllers/spotlight/home_pages_controller_spec.rb
-- spec/controllers/spotlight/resources/upload_controller_spec.rb
-- spec/controllers/spotlight/resources/csv_upload_controller_spec.rb
-- spec/controllers/spotlight/roles_controller_spec.rb
 - spec/controllers/spotlight/catalog_controller_spec.rb
-- spec/controllers/spotlight/about_pages_controller_spec.rb
-- spec/controllers/spotlight/solr_controller_spec.rb
+- spec/controllers/spotlight/confirmations_controller_spec.rb
 - spec/controllers/spotlight/contact_forms_controller_spec.rb
+- spec/controllers/spotlight/contacts_controller_spec.rb
 - spec/controllers/spotlight/custom_fields_controller_spec.rb
-- spec/controllers/spotlight/filters_controller_spec.rb
 - spec/controllers/spotlight/dashboards_controller_spec.rb
+- spec/controllers/spotlight/exhibits_controller_spec.rb
+- spec/controllers/spotlight/feature_pages_controller_spec.rb
+- spec/controllers/spotlight/filters_controller_spec.rb
+- spec/controllers/spotlight/home_pages_controller_spec.rb
 - spec/controllers/spotlight/metadata_configurations_controller_spec.rb
+- spec/controllers/spotlight/resources/csv_upload_controller_spec.rb
+- spec/controllers/spotlight/resources/upload_controller_spec.rb
 - spec/controllers/spotlight/resources_controller_spec.rb
-- spec/controllers/spotlight/view_configurations_controller_spec.rb
+- spec/controllers/spotlight/roles_controller_spec.rb
+- spec/controllers/spotlight/search_configurations_controller_spec.rb
 - spec/controllers/spotlight/searches_controller_spec.rb
-- spec/fixtures/sample_solr_documents.yml
-- spec/fixtures/avatar.png
-- spec/fixtures/csv-upload-fixture.csv
-- spec/fixtures/800x600.png
-- spec/jobs/spotlight/rename_sidecar_field_job_spec.rb
-- spec/jobs/spotlight/default_thumbnail_job_spec.rb
-- spec/jobs/spotlight/reindex_job_spec.rb
-- spec/helpers/spotlight/search_configurations_helper_spec.rb
-- spec/helpers/spotlight/jcrop_helper_spec.rb
-- spec/helpers/spotlight/pages_helper_spec.rb
-- spec/helpers/spotlight/application_helper_spec.rb
-- spec/helpers/spotlight/browse_helper_spec.rb
-- spec/helpers/spotlight/roles_helper_spec.rb
-- spec/helpers/spotlight/title_helper_spec.rb
-- spec/helpers/spotlight/main_app_helpers_spec.rb
-- spec/helpers/spotlight/navbar_helper_spec.rb
-- spec/helpers/spotlight/crud_link_helpers_spec.rb
-- spec/uploaders/spotlight/item_uploader_spec.rb
-- spec/test_app_templates/catalog_controller.rb
-- spec/test_app_templates/spotlight_test.rake
-- spec/test_app_templates/lib/generators/test_app_generator.rb
-- spec/test_app_templates/carrierwave.rb
-- spec/features/edit_search_fields_spec.rb
-- spec/features/browse_category_admin_spec.rb
-- spec/features/exhibits/add_tags_spec.rb
-- spec/features/exhibits/edit_metadata_fields_spec.rb
-- spec/features/exhibits/custom_metadata_fields_spec.rb
-- spec/features/exhibits/administration_spec.rb
-- spec/features/site_admin_management_spec.rb
+- spec/controllers/spotlight/sites_controller_spec.rb
+- spec/controllers/spotlight/solr_controller_spec.rb
+- spec/controllers/spotlight/tags_controller_spec.rb
+- spec/controllers/spotlight/versions_controller_spec.rb
+- spec/controllers/spotlight/view_configurations_controller_spec.rb
+- spec/factories/contacts.rb
+- spec/factories/custom_fields.rb
+- spec/factories/exhibits.rb
+- spec/factories/featured_images.rb
+- spec/factories/pages.rb
+- spec/factories/resources.rb
+- spec/factories/roles.rb
+- spec/factories/searches.rb
+- spec/factories/tags.rb
+- spec/factories/users.rb
 - spec/features/about_page_spec.rb
-- spec/features/curator_items.rb
+- spec/features/add_contacts_spec.rb
+- spec/features/add_custom_field_metadata_spec.rb
+- spec/features/add_items_spec.rb
+- spec/features/browse_category_admin_spec.rb
 - spec/features/browse_category_spec.rb
 - spec/features/catalog_spec.rb
-- spec/features/user_admin_spec.rb
-- spec/features/dashboard_spec.rb
 - spec/features/confirm_email_spec.rb
-- spec/features/site_masthead_spec.rb
-- spec/features/exhibit_masthead_spec.rb
-- spec/features/add_custom_field_metadata_spec.rb
-- spec/features/item_admin_spec.rb
-- spec/features/tags_admin_spec.rb
-- spec/features/slideshow_spec.rb
+- spec/features/create_exhibit_spec.rb
 - spec/features/create_page_spec.rb
-- spec/features/metadata_admin_spec.rb
-- spec/features/import_exhibit_spec.rb
+- spec/features/curator_items.rb
+- spec/features/dashboard_spec.rb
 - spec/features/edit_contact_spec.rb
-- spec/features/javascript/multi_image_select_spec.rb
+- spec/features/edit_search_fields_spec.rb
+- spec/features/exhibit_masthead_spec.rb
+- spec/features/exhibits/add_tags_spec.rb
+- spec/features/exhibits/administration_spec.rb
+- spec/features/exhibits/custom_metadata_fields_spec.rb
+- spec/features/exhibits/edit_metadata_fields_spec.rb
+- spec/features/exhibits_index_spec.rb
+- spec/features/feature_page_spec.rb
+- spec/features/home_page_spec.rb
+- spec/features/import_exhibit_spec.rb
+- spec/features/item_admin_spec.rb
+- spec/features/javascript/about_page_admin_spec.rb
 - spec/features/javascript/block_controls_spec.rb
-- spec/features/javascript/search_config_admin_spec.rb
-- spec/features/javascript/home_page_edit_spec.rb
-- spec/features/javascript/preview_block_spec.rb
-- spec/features/javascript/rule_block_spec.rb
-- spec/features/javascript/feature_page_admin_spec.rb
-- spec/features/javascript/metadata_admin_spec.rb
-- spec/features/javascript/roles_admin_spec.rb
-- spec/features/javascript/reindex_monitor_spec.rb
 - spec/features/javascript/blocks/featured_browse_categories_block_spec.rb
-- spec/features/javascript/blocks/solr_documents_block_spec.rb
-- spec/features/javascript/blocks/search_result_block_spec.rb
 - spec/features/javascript/blocks/featured_pages_block_spec.rb
+- spec/features/javascript/blocks/search_result_block_spec.rb
+- spec/features/javascript/blocks/solr_documents_block_spec.rb
 - spec/features/javascript/blocks/uploaded_items_block_spec.rb
-- spec/features/javascript/search_context_spec.rb
-- spec/features/javascript/about_page_admin_spec.rb
 - spec/features/javascript/edit_in_place_spec.rb
-- spec/features/report_a_problem_spec.rb
-- spec/features/add_contacts_spec.rb
-- spec/features/create_exhibit_spec.rb
-- spec/features/add_items_spec.rb
-- spec/features/feature_page_spec.rb
+- spec/features/javascript/feature_page_admin_spec.rb
+- spec/features/javascript/home_page_edit_spec.rb
+- spec/features/javascript/metadata_admin_spec.rb
+- spec/features/javascript/multi_image_select_spec.rb
+- spec/features/javascript/preview_block_spec.rb
+- spec/features/javascript/reindex_monitor_spec.rb
+- spec/features/javascript/roles_admin_spec.rb
+- spec/features/javascript/rule_block_spec.rb
+- spec/features/javascript/search_config_admin_spec.rb
+- spec/features/javascript/search_context_spec.rb
 - spec/features/main_navigation_spec.rb
-- spec/features/exhibits_index_spec.rb
-- spec/features/home_page_spec.rb
-- spec/serializers/spotlight/exhibit_export_serializer_spec.rb
-- spec/services/spotlight/carrierwave_file_resolver_spec.rb
-- spec/factories/searches.rb
-- spec/factories/resources.rb
-- spec/factories/roles.rb
-- spec/factories/exhibits.rb
-- spec/factories/featured_images.rb
-- spec/factories/users.rb
-- spec/factories/contacts.rb
-- spec/factories/custom_fields.rb
-- spec/factories/pages.rb
-- spec/factories/tags.rb
-- spec/routing/spotlight/exhibit_catalog_spec.rb
-- spec/routing/spotlight/pages_routing_spec.rb
+- spec/features/metadata_admin_spec.rb
+- spec/features/report_a_problem_spec.rb
+- spec/features/site_admin_management_spec.rb
+- spec/features/site_masthead_spec.rb
+- spec/features/slideshow_spec.rb
+- spec/features/tags_admin_spec.rb
+- spec/features/user_admin_spec.rb
+- spec/fixtures/800x600.png
+- spec/fixtures/avatar.png
+- spec/fixtures/csv-upload-fixture.csv
+- spec/fixtures/sample_solr_documents.yml
+- spec/helpers/spotlight/application_helper_spec.rb
+- spec/helpers/spotlight/browse_helper_spec.rb
+- spec/helpers/spotlight/crud_link_helpers_spec.rb
+- spec/helpers/spotlight/jcrop_helper_spec.rb
+- spec/helpers/spotlight/main_app_helpers_spec.rb
+- spec/helpers/spotlight/navbar_helper_spec.rb
+- spec/helpers/spotlight/pages_helper_spec.rb
+- spec/helpers/spotlight/roles_helper_spec.rb
+- spec/helpers/spotlight/search_configurations_helper_spec.rb
+- spec/helpers/spotlight/title_helper_spec.rb
+- spec/jobs/spotlight/default_thumbnail_job_spec.rb
+- spec/jobs/spotlight/reindex_job_spec.rb
+- spec/jobs/spotlight/rename_sidecar_field_job_spec.rb
+- spec/lib/spotlight/catalog_spec.rb
+- spec/lib/spotlight/controller_spec.rb
 - spec/mailers/spotlight/indexing_complete_mailer_spec.rb
-- spec/models/spotlight/exhibit_spec.rb
-- spec/models/spotlight/contact_spec.rb
+- spec/models/sir_trevor_rails/blocks/browse_block_spec.rb
+- spec/models/sir_trevor_rails/blocks/solr_documents_block_spec.rb
+- spec/models/sir_trevor_rails/blocks/textable_spec.rb
+- spec/models/solr_document_spec.rb
 - spec/models/spotlight/ability_spec.rb
-- spec/models/spotlight/image_derivatives_spec.rb
 - spec/models/spotlight/about_page_spec.rb
-- spec/models/spotlight/sitemap_spec.rb
-- spec/models/spotlight/solr_document/uploaded_resource_spec.rb
-- spec/models/spotlight/solr_document/atomic_updates_spec.rb
-- spec/models/spotlight/solr_document/spotlight_images_spec.rb
-- spec/models/spotlight/masthead_spec.rb
+- spec/models/spotlight/access_controls_enforcement_search_builder_spec.rb
+- spec/models/spotlight/analytics/ga_spec.rb
 - spec/models/spotlight/blacklight_configuration_spec.rb
+- spec/models/spotlight/contact_email_spec.rb
+- spec/models/spotlight/contact_form_spec.rb
+- spec/models/spotlight/contact_spec.rb
+- spec/models/spotlight/custom_field_spec.rb
+- spec/models/spotlight/default_thumbnailable_concern_spec.rb
+- spec/models/spotlight/exhibit_spec.rb
+- spec/models/spotlight/feature_page_spec.rb
 - spec/models/spotlight/featured_image_spec.rb
 - spec/models/spotlight/field_metadata_spec.rb
-- spec/models/spotlight/user_spec.rb
-- spec/models/spotlight/analytics/ga_spec.rb
+- spec/models/spotlight/filter_spec.rb
+- spec/models/spotlight/home_page_spec.rb
+- spec/models/spotlight/image_derivatives_spec.rb
+- spec/models/spotlight/main_navigation_spec.rb
+- spec/models/spotlight/masthead_spec.rb
+- spec/models/spotlight/page_spec.rb
 - spec/models/spotlight/reindex_progress_spec.rb
 - spec/models/spotlight/resource_spec.rb
-- spec/models/spotlight/access_controls_enforcement_search_builder_spec.rb
-- spec/models/spotlight/solr_document_sidecar_spec.rb
-- spec/models/spotlight/default_thumbnailable_concern_spec.rb
-- spec/models/spotlight/role_spec.rb
-- spec/models/spotlight/site_spec.rb
-- spec/models/spotlight/resources/upload_spec.rb
 - spec/models/spotlight/resources/open_graph_spec.rb
+- spec/models/spotlight/resources/upload_spec.rb
 - spec/models/spotlight/resources/web_spec.rb
-- spec/models/spotlight/custom_field_spec.rb
+- spec/models/spotlight/role_spec.rb
 - spec/models/spotlight/search_spec.rb
-- spec/models/spotlight/contact_email_spec.rb
-- spec/models/spotlight/feature_page_spec.rb
-- spec/models/spotlight/contact_form_spec.rb
-- spec/models/spotlight/filter_spec.rb
-- spec/models/spotlight/main_navigation_spec.rb
-- spec/models/spotlight/home_page_spec.rb
-- spec/models/spotlight/page_spec.rb
-- spec/models/sir_trevor_rails/blocks/solr_documents_block_spec.rb
-- spec/models/sir_trevor_rails/blocks/browse_block_spec.rb
-- spec/models/sir_trevor_rails/blocks/textable_spec.rb
-- spec/models/solr_document_spec.rb
-- spec/lib/spotlight/controller_spec.rb
-- spec/lib/spotlight/catalog_spec.rb
+- spec/models/spotlight/site_spec.rb
+- spec/models/spotlight/sitemap_spec.rb
+- spec/models/spotlight/solr_document/atomic_updates_spec.rb
+- spec/models/spotlight/solr_document/spotlight_images_spec.rb
+- spec/models/spotlight/solr_document/uploaded_resource_spec.rb
+- spec/models/spotlight/solr_document_sidecar_spec.rb
+- spec/models/spotlight/user_spec.rb
+- spec/routing/spotlight/exhibit_catalog_spec.rb
+- spec/routing/spotlight/pages_routing_spec.rb
+- spec/serializers/spotlight/exhibit_export_serializer_spec.rb
+- spec/services/spotlight/carrierwave_file_resolver_spec.rb
+- spec/services/spotlight/solr_document_builder_spec.rb
 - spec/spec_helper.rb
+- spec/support/controllers/engine_helpers.rb
+- spec/support/features/test_features_helpers.rb
+- spec/support/helpers/controller_level_helpers.rb
+- spec/support/views/test_view_helpers.rb
+- spec/test_app_templates/carrierwave.rb
+- spec/test_app_templates/catalog_controller.rb
+- spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/test_app_templates/spotlight_test.rake
+- spec/uploaders/spotlight/item_uploader_spec.rb
+- spec/views/_user_util_links.html.erb_spec.rb
+- spec/views/shared/_analytics.html.erb_spec.rb
+- spec/views/shared/_exhibit_navbar.html.erb_spec.rb
+- spec/views/shared/_footer.html.erb_spec.rb
+- spec/views/shared/_header_navbar.html.erb_spec.rb
+- spec/views/shared/_masthead.html.erb_spec.rb
+- spec/views/spotlight/about_pages/_empty.html.erb_spec.rb
+- spec/views/spotlight/about_pages/_sidebar.html.erb_spec.rb
+- spec/views/spotlight/about_pages/index.html.erb_spec.rb
+- spec/views/spotlight/browse/_search.html.erb_spec.rb
+- spec/views/spotlight/browse/_sort_and_per_page.html.erb_spec.rb
+- spec/views/spotlight/browse/index.html.erb_spec.rb
+- spec/views/spotlight/browse/show.html.erb_spec.rb
+- spec/views/spotlight/catalog/_edit_default.html.erb_spec.rb
+- spec/views/spotlight/catalog/admin.html.erb_spec.rb
+- spec/views/spotlight/catalog/edit.html.erb_spec.rb
+- spec/views/spotlight/contacts/edit.html.erb_spec.rb
+- spec/views/spotlight/dashboards/_analytics.html.erb_spec.rb
+- spec/views/spotlight/dashboards/analytics.html.erb_spec.rb
+- spec/views/spotlight/exhibits/_exhibit_card_front.html.erb_spec.rb
+- spec/views/spotlight/exhibits/edit.html.erb_spec.rb
+- spec/views/spotlight/exhibits/index.html.erb_spec.rb
+- spec/views/spotlight/feature_pages/_empty.html.erb_spec.rb
+- spec/views/spotlight/feature_pages/_sidebar.html.erb_spec.rb
+- spec/views/spotlight/home_pages/_empty.html.erb_spec.rb
+- spec/views/spotlight/home_pages/_sidebar.html.erb_spec.rb
+- spec/views/spotlight/metadata_configurations/_metadata_field.html.erb_spec.rb
+- spec/views/spotlight/metadata_configurations/edit.html.erb_spec.rb
+- spec/views/spotlight/pages/edit.html.erb_spec.rb
+- spec/views/spotlight/pages/index.html.erb_spec.rb
+- spec/views/spotlight/pages/new.html.erb_spec.rb
+- spec/views/spotlight/pages/show.html.erb_spec.rb
+- spec/views/spotlight/resources/_external_resources_form.html.erb_spec.rb
+- spec/views/spotlight/resources/new.html.erb_spec.rb
+- spec/views/spotlight/roles/index.html.erb_spec.rb
+- spec/views/spotlight/search_configurations/_facet_metadata.html.erb_spec.rb
+- spec/views/spotlight/search_configurations/_search_fields.html.erb_spec.rb
+- spec/views/spotlight/search_configurations/_sort.html.erb_spec.rb
+- spec/views/spotlight/searches/_search.html.erb_spec.rb
+- spec/views/spotlight/searches/edit.html.erb_spec.rb
+- spec/views/spotlight/searches/index.html.erb_spec.rb
+- spec/views/spotlight/sir_trevor/blocks/_browse_block.html.erb_spec.rb
+- spec/views/spotlight/sir_trevor/blocks/_iframe_block.html.erb_spec.rb
+- spec/views/spotlight/sir_trevor/blocks/_rule_block.html.erb_spec.rb
+- spec/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb_spec.rb
+- spec/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb_spec.rb
+- spec/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb_spec.rb
+- spec/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb_spec.rb
+- spec/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb_spec.rb
+- spec/views/spotlight/sites/edit_exhibits.html.erb_spec.rb
+- spec/views/spotlight/tags/index.html.erb_spec.rb

data/app/views/catalog/_search_form.html.erb

@@ -1,24 +0,0 @@
-<%= form_tag search_action_url, method: :get, class: 'search-query-form clearfix navbar-form', role: 'search' do %>
-  <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
-
-  <div class="input-group">
-    <% if search_fields.length > 1 %>
-      <span class="input-group-addon for-search-field">
-        <label for="search_field" class="sr-only"><%= t('blacklight.search.form.search_field.label') %></label>
-        <%= select_tag(:search_field, options_for_select(search_fields, h(params[:search_field])), title: t('blacklight.search.form.search_field.title'), id: "search_field", class: "search_field") %>
-      </span>
-    <% elsif search_fields.length == 1 %>
-      <%= hidden_field_tag :search_field, search_fields.first.last %>
-    <% end %>
-
-    <label for="q" class="sr-only"><%= t('blacklight.search.form.search.label') %></label>
-    <%= text_field_tag :q, params[:q], placeholder: t('blacklight.search.form.search.placeholder'), class: "search_q q form-control", id: "q", autofocus: should_autofocus_on_search_box?  %>
-
-    <span class="input-group-btn">
-      <button type="submit" class="btn btn-primary search-btn" id="search">
-        <span class="submit-search-text"><%= t('blacklight.search.form.submit') %></span>
-        <span class="glyphicon glyphicon-search"></span>
-      </button>
-    </span>
-  </div>
-<% end %>