blacklight-spotlight 3.3.0 → 3.4.0

data/lib/generators/spotlight/templates/solr/config/solrconfig.xml

@@ -3,9 +3,9 @@
   <!-- NOTE: various comments and unused configuration possibilities have been purged
      from this file.  Please refer to http://wiki.apache.org/solr/SolrConfigXml,
      as well as the default solrconfig file included with Solr -->
-  
+
   <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
-  
+
   <luceneMatchVersion>6.1.0</luceneMatchVersion>
 
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
@@ -16,9 +16,11 @@
     </updateLog>
   </updateHandler>
 
-  <!-- solr lib dirs -->  
+  <!-- solr lib dirs -->
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
+  <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" />
+  <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lucene-libs" />
 
   <dataDir>${solr.data.dir:}</dataDir>
 
@@ -36,7 +38,7 @@
        <float name="tie">0.01</float>
        <!-- this qf and pf are used by default, if not otherwise specified by
             client. The default blacklight_config will use these for the
-            "keywords" search. See the author_qf/author_pf, title_qf, etc 
+            "keywords" search. See the author_qf/author_pf, title_qf, etc
             below, which the default blacklight_config will specify for
             those searches. You may also be interested in:
             http://wiki.apache.org/solr/LocalParams
@@ -74,9 +76,9 @@
        </str>
        <str name="subject_pf">
        </str>
-       
+
        <str name="fl">
-         *, 
+         *,
          score
        </str>
 
@@ -85,7 +87,7 @@
        <str name="facet.limit">10</str>
        <str name="facet.field">active_fedora_model_ssi</str>
        <str name="facet.field">subject_ssim</str>
-       
+
        <str name="spellcheck">true</str>
        <str name="spellcheck.dictionary">default</str>
        <str name="spellcheck.onlyMorePopular">true</str>
@@ -121,7 +123,7 @@
       </str>
     </lst>
   </requestHandler>
-  
+
   <requestHandler name="standard" class="solr.SearchHandler">
      <lst name="defaults">
        <str name="echoParams">explicit</str>
@@ -152,12 +154,12 @@
       <str name="buildOnOptimize">true</str>
     </lst>
   </searchComponent>
-  
-  <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" /> 
-  
+
+  <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
+
   <requestDispatcher handleSelect="true" >
     <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
   </requestDispatcher>
-  
+
   <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
 </config>

data/lib/spotlight/engine.rb

@@ -38,8 +38,8 @@ module Spotlight
 
     require 'carrierwave'
     require 'underscore-rails'
+    require 'redcarpet'
     require 'github/markup'
-    require 'sir_trevor_rails'
     require 'openseadragon'
     require 'handlebars_assets'
     require 'sprockets/es6'

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '3.3.0'
+  VERSION = '3.4.0'
 end

data/lib/tasks/spotlight_tasks.rake

@@ -16,6 +16,18 @@ namespace :spotlight do
     Spotlight::Role.create(user: u, resource: Spotlight::Site.instance, role: 'admin')
   end
 
+  task seed_admin_user: [:environment] do
+    email = 'admin@localhost'
+    password = 'testing'
+
+    u = Spotlight::Engine.user_class.find_or_create_by!(email: email) do |user|
+      user.password = password
+    end
+    Spotlight::Role.create(user: u, resource: Spotlight::Site.instance, role: 'admin')
+
+    puts "Admin user created with email: #{email} (password: '#{password}')"
+  end
+
   desc 'Create a new exhibit'
   task exhibit: :environment do
     title = prompt_for_title
@@ -159,4 +171,12 @@ namespace :spotlight do
       e.reindex_later
     end
   end
+
+  task db_ready: :environment do
+    if I18n::Backend::ActiveRecord::Translation.table_exists?
+      exit 0
+    else
+      exit 1
+    end
+  end
 end

data/spec/controllers/spotlight/about_pages_controller_spec.rb

@@ -169,8 +169,6 @@ describe Spotlight::AboutPagesController, type: :controller, versioning: true do
       let!(:page2) { FactoryBot.create(:about_page, exhibit: exhibit, published: true) }
       let!(:page3) { FactoryBot.create(:about_page, exhibit: exhibit, published: true) }
 
-      before { request.env['HTTP_REFERER'] = 'http://example.com' }
-
       it 'updates whether they are on the landing page' do
         post :update_all, params: {
           exhibit_id: page1.exhibit,
@@ -181,7 +179,7 @@ describe Spotlight::AboutPagesController, type: :controller, versioning: true do
             ]
           }
         }
-        expect(response).to redirect_to 'http://example.com'
+        expect(response).to redirect_to end_with('/dashboard')
         expect(flash[:notice]).to eq 'About pages were successfully updated.'
         expect(page1.reload.published).to be_truthy
         expect(page1.title).to eq 'This is a new title!'

data/spec/controllers/spotlight/catalog_controller_spec.rb

@@ -271,7 +271,7 @@ describe Spotlight::CatalogController, type: :controller do
 
     describe 'PUT make_public' do
       before do
-        request.env['HTTP_REFERER'] = 'where_i_came_from'
+        request.env['HTTP_REFERER'] = '/where_i_came_from'
         allow_any_instance_of(::SolrDocument).to receive(:reindex)
       end
 
@@ -279,13 +279,13 @@ describe Spotlight::CatalogController, type: :controller do
         expect_any_instance_of(::SolrDocument).to receive(:reindex)
         expect_any_instance_of(::SolrDocument).to receive(:make_public!).with(exhibit)
         put :make_public, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
-        expect(response).to redirect_to 'where_i_came_from'
+        expect(response).to redirect_to end_with('/where_i_came_from')
       end
     end
 
     describe 'DELETE make_private' do
       before do
-        request.env['HTTP_REFERER'] = 'where_i_came_from'
+        request.env['HTTP_REFERER'] = '/where_i_came_from'
         allow_any_instance_of(::SolrDocument).to receive(:reindex)
       end
 
@@ -293,7 +293,7 @@ describe Spotlight::CatalogController, type: :controller do
         expect_any_instance_of(::SolrDocument).to receive(:reindex)
         expect_any_instance_of(::SolrDocument).to receive(:make_private!).with(exhibit)
         delete :make_private, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
-        expect(response).to redirect_to 'where_i_came_from'
+        expect(response).to redirect_to end_with('/where_i_came_from')
       end
     end
   end

data/spec/controllers/spotlight/contact_forms_controller_spec.rb

@@ -6,7 +6,7 @@ describe Spotlight::ContactFormsController, type: :controller do
   let(:honeypot_field_name) { Spotlight::Engine.config.spambot_honeypot_email_field }
 
   before do
-    request.env['HTTP_REFERER'] = 'http://example.com'
+    request.env['HTTP_REFERER'] = '/whatever'
     exhibit.contact_emails_attributes = [{ 'email' => 'test@example.com' }, { 'email' => 'test2@example.com' }]
     exhibit.save!
     exhibit.contact_emails.first.tap do |e|
@@ -27,7 +27,7 @@ describe Spotlight::ContactFormsController, type: :controller do
 
     it 'redirects back' do
       post :create, params: { exhibit_id: exhibit.id, contact_form: { name: 'Joe Doe', email: 'jdoe@example.com', honeypot_field_name => '' } }
-      expect(response).to redirect_to 'http://example.com'
+      expect(response).to redirect_to end_with('/whatever')
     end
 
     it 'sets a flash message' do

data/spec/controllers/spotlight/contacts_controller_spec.rb

@@ -67,7 +67,7 @@ describe Spotlight::ContactsController, type: :controller do
         contact # force contact to be created
         expect do
           delete :destroy, params: { id: contact, exhibit_id: contact.exhibit }
-        end.to change { Spotlight::Contact.count }.by(-1)
+        end.to change(Spotlight::Contact, :count).by(-1)
         expect(response).to redirect_to exhibit_about_pages_path(exhibit)
       end
     end
@@ -93,7 +93,7 @@ describe Spotlight::ContactsController, type: :controller do
       it 'is successful' do
         expect do
           post :create, params: { exhibit_id: exhibit, contact: { name: 'Chester', avatar_attributes: { iiif_tilesource: 'someurl' } } }
-        end.to change { Spotlight::Contact.count }.by(1)
+        end.to change(Spotlight::Contact, :count).by(1)
         expect(response).to redirect_to exhibit_about_pages_path(exhibit)
         expect(Spotlight::Contact.last.show_in_sidebar).to be_truthy
         expect(Spotlight::Contact.last.avatar.iiif_url).to be_present

data/spec/controllers/spotlight/exhibits_controller_spec.rb

@@ -106,7 +106,7 @@ describe Spotlight::ExhibitsController, type: :controller do
       it 'is successful' do
         expect do
           post :create, params: { exhibit: { title: 'Some Title', slug: 'custom-slug', tag_list: '2014, R. Buckminster Fuller' } }
-        end.to change { Spotlight::Exhibit.count }.by(1)
+        end.to change(Spotlight::Exhibit, :count).by(1)
 
         exhibit = Spotlight::Exhibit.last
         expect(response).to redirect_to(exhibit_dashboard_path(exhibit))

data/spec/controllers/spotlight/feature_pages_controller_spec.rb

@@ -209,11 +209,11 @@ describe Spotlight::FeaturePagesController, type: :controller, versioning: true
       let!(:page2) { FactoryBot.create(:feature_page, exhibit: page1.exhibit) }
       let!(:page3) { FactoryBot.create(:feature_page, exhibit: page1.exhibit, parent_page_id: page1.id) }
 
-      before { request.env['HTTP_REFERER'] = 'http://example.com' }
+      before { request.env['HTTP_REFERER'] = '/whatever' }
 
       it 'updates the parent/child relationship' do
         post :update_all, params: { exhibit_id: page1.exhibit, exhibit: { feature_pages_attributes: [{ id: page2.id, parent_page_id: page1.id }] } }
-        expect(response).to redirect_to 'http://example.com'
+        expect(response).to redirect_to end_with('/whatever')
         expect(flash[:notice]).to eq 'Feature pages were successfully updated.'
         expect(page1.parent_page).to be_nil
         expect(page1.child_pages).to include page2

data/spec/controllers/spotlight/featured_images_controller_spec.rb

@@ -16,7 +16,7 @@ describe Spotlight::FeaturedImagesController, type: :controller do
               image: fixture_file_upload('spec/fixtures/800x600.png', 'image/png')
             }
           }
-        end.not_to change { Spotlight::FeaturedImage.count }
+        end.not_to change(Spotlight::FeaturedImage, :count)
 
         expect(response).to redirect_to main_app.root_path
         expect(flash[:alert]).to be_present
@@ -37,7 +37,7 @@ describe Spotlight::FeaturedImagesController, type: :controller do
               image: fixture_file_upload('spec/fixtures/800x600.png', 'image/png')
             }
           }
-        end.to change { Spotlight::FeaturedImage.count }.by(1)
+        end.to change(Spotlight::FeaturedImage, :count).by(1)
 
         expect(response).to be_successful
         expect(response.body).to match %r{\{"tilesource":"http://test\.host/images/\d+-.+/info\.json","id":\d+\}}
@@ -52,7 +52,7 @@ describe Spotlight::FeaturedImagesController, type: :controller do
               image: fixture_file_upload('spec/fixtures/800x600.png', 'image/png')
             }
           }
-        end.to change { Spotlight::FeaturedImage.count }.by(1)
+        end.to change(Spotlight::FeaturedImage, :count).by(1)
 
         expect(response).to be_successful
         expect(response.body).to match %r{\{"tilesource":"http://test\.host/images/\d+-.+/info\.json","id":\d+\}}
@@ -67,7 +67,7 @@ describe Spotlight::FeaturedImagesController, type: :controller do
               image: fixture_file_upload('spec/fixtures/800x600.png', 'image/png')
             }
           }
-        end.to change { Spotlight::FeaturedImage.count }.by(1)
+        end.to change(Spotlight::FeaturedImage, :count).by(1)
 
         expect(response).to be_successful
         expect(response.body).to match %r{\{"tilesource":"http://test\.host/images/\d+-.+/info\.json","id":\d+\}}

data/spec/controllers/spotlight/groups_controller_spec.rb

@@ -96,7 +96,7 @@ describe Spotlight::GroupsController, type: :controller do
         group
         expect do
           delete :destroy, params: { id: group.id, exhibit_id: group.exhibit }
-        end.to change { Spotlight::Group.count }.by(-1)
+        end.to change(Spotlight::Group, :count).by(-1)
       end
     end
   end

data/spec/controllers/spotlight/searches_controller_spec.rb

@@ -160,7 +160,7 @@ describe Spotlight::SearchesController, type: :controller do
       it 'removes it' do
         expect do
           delete :destroy, params: { id: search, exhibit_id: search.exhibit }
-        end.to change { Spotlight::Search.count }.by(-1)
+        end.to change(Spotlight::Search, :count).by(-1)
         expect(response).to redirect_to exhibit_searches_path(search.exhibit)
         expect(flash[:alert]).to eq 'The browse category was deleted.'
       end
@@ -170,7 +170,7 @@ describe Spotlight::SearchesController, type: :controller do
       let!(:search2) { FactoryBot.create(:search, exhibit: exhibit, published: true) }
       let!(:search3) { FactoryBot.create(:search, exhibit: exhibit, published: true) }
 
-      before { request.env['HTTP_REFERER'] = 'http://example.com' }
+      before { request.env['HTTP_REFERER'] = '/whatever' }
 
       it 'updates whether they are on the landing page' do
         post :update_all, params: {
@@ -187,7 +187,7 @@ describe Spotlight::SearchesController, type: :controller do
         expect(search.weight).to eq 1
         expect(search2.reload.published).to be_falsey
         expect(search3.reload.published).to be_truthy # should remain untouched since it wasn't present
-        expect(response).to redirect_to 'http://example.com'
+        expect(response).to redirect_to end_with('/whatever')
         expect(flash[:notice]).to eq 'Browse categories were successfully updated.'
       end
     end

data/spec/controllers/spotlight/solr_controller_spec.rb

@@ -87,7 +87,7 @@ describe Spotlight::SolrController, type: :controller do
 
         expect do
           post_update_with_json_body(exhibit, a: 1, custom_field: 'abc')
-        end.to change { Spotlight::SolrDocumentSidecar.count }.by(1)
+        end.to change(Spotlight::SolrDocumentSidecar, :count).by(1)
 
         expect(response).to be_successful
         expect(doc.first).to include a: 1

data/spec/controllers/spotlight/tags_controller_spec.rb

@@ -48,7 +48,7 @@ describe Spotlight::TagsController, type: :controller do
           perform_enqueued_jobs do
             delete :destroy, params: { exhibit_id: exhibit, id: tagging.tag }
           end
-        end.to change { ActsAsTaggableOn::Tagging.count }.by(-1)
+        end.to change(ActsAsTaggableOn::Tagging, :count).by(-1)
         expect(response).to redirect_to exhibit_tags_path(exhibit)
       end
     end