blacklight-spotlight 0.18.0 → 0.19.0

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

@@ -8,6 +8,7 @@
       <div class="col-sm-6">
         <div class="carousel-inner">
           <% solr_documents_features_block.each_document.each_with_index do |(block_options, document), index| %>
+            <% doc_presenter = index_presenter(document) %>
             <div class="item <%= 'active' if index == 0 %>" data-id="<%= document.id %>">
               <% if block_thumb = block_options[:full_image_url] %>
                 <%= link_to_document(document, image_tag(block_thumb), counter: -1) %>
@@ -18,11 +19,11 @@
 
             <% indicators << capture do %>
               <li data-target="#<%= html_id %>" data-slide-to="<%= index %>" class="list-group-item <%= 'active' if index == 0 %>">
-                <a href="#" title="<%= (caption_text = render_index_field_value(document, (solr_documents_features_block.primary_caption_field if solr_documents_features_block.primary_caption?) || document_show_link_field)) %>">
+                <a href="#" title="<%= (caption_text = doc_presenter.field_value(solr_documents_features_block.primary_caption? ? solr_documents_features_block.primary_caption_field : document_show_link_field)) %>">
                   <%= truncate(caption_text, length: 95) %>
                 </a>
                 <% if solr_documents_features_block.secondary_caption? %>
-                  <p><%= render_index_field_value(document, solr_documents_features_block.secondary_caption_field) %></p>
+                  <p><%= doc_presenter.field_value solr_documents_features_block.secondary_caption_field %></p>
                 <% end %>
               </li>
             <% end %>

data/config/locales/spotlight.en.yml

@@ -593,6 +593,7 @@ en:
         search_description: "Description"
         search_masthead: "Masthead"
         search_thumbnail: "Thumbnail"
+        default_index_view_type: Default view
         masthead:
           help: >
             You can select and crop an image to use as a browse category-specific masthead, instead

data/db/migrate/20160711121314_add_default_view_to_spotlight_searches.rb

@@ -0,0 +1,5 @@
+class AddDefaultViewToSpotlightSearches < ActiveRecord::Migration
+  def change
+    add_column :spotlight_searches, :default_index_view_type, :string
+  end
+end

data/lib/generators/spotlight/install_generator.rb

@@ -21,6 +21,12 @@ module Spotlight
       generate 'friendly_id'
     end
 
+    def riiif
+      gem 'riiif', '~> 0.4.0'
+      route "mount Riiif::Engine => '/images', as: 'riiif'"
+      copy_file 'config/initializers/riiif.rb'
+    end
+
     def paper_trail
       generate 'paper_trail:install'
     end

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

@@ -0,0 +1,7 @@
+Riiif::Image.file_resolver = Spotlight::CarrierwaveFileResolver.new
+
+# Riiif::Image.authorization_service = IIIFAuthorizationService
+
+# Riiif.not_found_image = 'app/assets/images/us_404.svg'
+#
+Riiif::Engine.config.cache_duration_in_days = 365

data/lib/spotlight/version.rb

@@ -1,4 +1,4 @@
 #
 module Spotlight
-  VERSION = '0.18.0'.freeze
+  VERSION = '0.19.0'.freeze
 end

data/spec/controllers/application_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe ApplicationController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/controllers/spotlight/about_pages_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::AboutPagesController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:valid_attributes) { { 'title' => 'MyString' } }

data/spec/controllers/spotlight/admin_users_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::AdminUsersController, type: :controller do
   routes { Spotlight::Engine.routes }
 

data/spec/controllers/spotlight/appearances_controller_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 describe Spotlight::AppearancesController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/controllers/spotlight/application_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::ApplicationController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/controllers/spotlight/attachments_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::AttachmentsController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/controllers/spotlight/browse_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::BrowseController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/controllers/spotlight/catalog_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::CatalogController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/controllers/spotlight/confirmations_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::ConfirmationsController, type: :controller do
   routes { Spotlight::Engine.routes }
   before do

data/spec/controllers/spotlight/contact_forms_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::ContactFormsController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }
@@ -16,6 +14,11 @@ describe Spotlight::ContactFormsController, type: :controller do
     end
   end
   describe 'POST create' do
+    it 'sends an email' do
+      expect do
+        post :create, exhibit_id: exhibit.id, contact_form: { name: 'Joe Doe', email: 'jdoe@example.com' }
+      end.to change { ActionMailer::Base.deliveries.count }.by(1)
+    end
     it 'redirects back' do
       post :create, exhibit_id: exhibit.id, contact_form: { name: 'Joe Doe', email: 'jdoe@example.com' }
       expect(response).to redirect_to :back

data/spec/controllers/spotlight/contacts_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::ContactsController, type: :controller do
   routes { Spotlight::Engine.routes }
   describe 'when not logged in' do

data/spec/controllers/spotlight/custom_fields_controller_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 describe Spotlight::CustomFieldsController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/controllers/spotlight/dashboards_controller_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe Spotlight::DashboardsController, type: :controller do
   routes { Spotlight::Engine.routes }

data/spec/controllers/spotlight/exhibits_controller_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
 require 'rack/test'
+
 describe Spotlight::ExhibitsController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/controllers/spotlight/feature_pages_controller_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 describe Spotlight::FeaturePagesController, type: :controller do
   routes { Spotlight::Engine.routes }
 

data/spec/controllers/spotlight/filters_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::FiltersController do
   routes { Spotlight::Engine.routes }
 

data/spec/controllers/spotlight/home_pages_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::HomePagesController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:valid_attributes) { { 'title' => 'MyString' } }

data/spec/controllers/spotlight/metadata_configurations_controller_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 describe Spotlight::MetadataConfigurationsController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/controllers/spotlight/resources_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::ResourcesController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/controllers/spotlight/roles_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::RolesController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/controllers/spotlight/search_configurations_controller_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 describe Spotlight::SearchConfigurationsController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/controllers/spotlight/searches_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::SearchesController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/controllers/spotlight/sites_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::SitesController, type: :controller do
   routes { Spotlight::Engine.routes }
 

data/spec/controllers/spotlight/solr_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::SolrController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/controllers/spotlight/tags_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::TagsController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/controllers/spotlight/versions_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::VersionsController, type: :controller do
   routes { Spotlight::Engine.routes }
 

data/spec/controllers/spotlight/view_configurations_controller_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 describe Spotlight::ViewConfigurationsController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/features/about_page_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'About page', type: :feature do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }

data/spec/features/add_contacts_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Add a contact to an exhibit', type: :feature do
   let(:curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/features/add_custom_field_metadata_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Adding custom metadata field data', type: :feature do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }

data/spec/features/add_items_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Uploading a non-repository item', type: :feature do
   let!(:exhibit) { FactoryGirl.create(:exhibit) }
   let!(:custom_field) { FactoryGirl.create(:custom_field, exhibit: exhibit) }

data/spec/features/browse_category_admin_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Browse Category Administration', type: :feature do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
@@ -63,6 +61,19 @@ describe 'Browse Category Administration', type: :feature do
       expect(search.thumbnail.image.thumb).not_to be_nil
       expect(search.thumbnail.image.path).to end_with 'avatar.png'
     end
+
+    it 'can select a default index view type' do
+      visit spotlight.edit_exhibit_search_path exhibit, search
+      choose 'List'
+
+      click_button 'Save changes'
+
+      expect(page).to have_content('The search was successfully updated.')
+
+      search.reload
+
+      expect(search.default_index_view_type).to eq 'list'
+    end
   end
   describe 'destroy' do
     it 'destroys a tag' do

data/spec/features/browse_category_spec.rb

@@ -1,10 +1,15 @@
-require 'spec_helper'
-
 feature 'Browse pages' do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
 
   context 'a browse page' do
     let!(:search) { FactoryGirl.create(:search, title: 'Some Saved Search', exhibit: exhibit, published: true) }
+
+    let(:mock_response) { Blacklight::Solr::Response.new({ response: { numFound: 10, docs: mock_documents } }, {}) }
+    let(:mock_documents) { [] }
+    before do
+      allow_any_instance_of(Spotlight::BrowseController).to receive(:search_results).and_return([mock_response, mock_documents])
+    end
+
     context 'with the standard exhibit masthead' do
       it 'includes the search title and resource count in the body' do
         visit spotlight.exhibit_browse_path(exhibit, search)
@@ -61,5 +66,25 @@ feature 'Browse pages' do
         expect(page).not_to have_selector '.breadcrumbs-container'
       end
     end
+
+    context 'without a curator-selected view' do
+      it 'renders the gallery view' do
+        visit spotlight.exhibit_browse_path(exhibit, search)
+        expect(page).to have_selector '.view-type-gallery.active'
+        expect(page).to have_selector '#documents.gallery'
+      end
+    end
+
+    context 'with a curator-selected default view' do
+      before do
+        search.update(default_index_view_type: 'list')
+      end
+
+      it 'renders the selected view' do
+        visit spotlight.exhibit_browse_path(exhibit, search)
+        expect(page).to have_selector '.view-type-list.active'
+        expect(page).to have_selector '#documents.documents-list'
+      end
+    end
   end
 end

data/spec/features/catalog_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Catalog', type: :feature do
   describe 'admin' do
     let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/features/confirm_email_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Confirming an email', type: :feature do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:contact_email) { Spotlight::ContactEmail.create!(email: 'justin@example.com', exhibit: exhibit) }

data/spec/features/create_exhibit_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Create a new exhibit', type: :feature do
   let(:user) { FactoryGirl.create(:site_admin) }
   before do

data/spec/features/create_page_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Creating a page', type: :feature do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }

data/spec/features/curator_items.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'A curator can see the items page', type: :feature do
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator) }
   let(:exhibit) { FactoryGirl.create(:exhibit) }
@@ -7,7 +5,6 @@ describe 'A curator can see the items page', type: :feature do
   it 'works' do
     login_as exhibit_curator
     visit spotlight.exhibit_dashboard_path(exhibit)
-
     expect(page).to have_content 'Items'
   end
 end

data/spec/features/dashboard_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Dashboard', type: :feature do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }

data/spec/features/edit_contact_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Add a contact to an exhibit', type: :feature do
   let(:curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
   let(:exhibit) { FactoryGirl.create(:exhibit) }
@@ -14,7 +12,6 @@ describe 'Add a contact to an exhibit', type: :feature do
     end
 
     click_button 'Save'
-
     expect(page).to have_content 'The contact was successfully updated.'
   end
 end

data/spec/features/edit_search_fields_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Search Administration', type: :feature do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:exhibit_admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }