blacklight-spotlight 2.7.2 → 2.8.0

data/spec/features/add_custom_field_metadata_spec.rb

@@ -22,7 +22,7 @@ describe 'Adding custom metadata field data', type: :feature do
 
     click_on 'Save changes'
 
-    expect(::SolrDocument.new(id: 'dq287tq6352').sidecar(exhibit).data).to include 'field_name_tesim' => 'My new custom field value'
+    expect(::SolrDocument.new(id: 'dq287tq6352').sidecar(exhibit).data).to include 'some-field' => 'My new custom field value'
     sleep(1) # The data isn't commited to solr immediately.
 
     visit spotlight.exhibit_solr_document_path(exhibit, 'dq287tq6352')
@@ -43,6 +43,24 @@ describe 'Adding custom metadata field data', type: :feature do
     end
   end
 
+  context 'with a multivalued field', js: true do
+    let(:custom_field) { FactoryBot.create(:custom_field, exhibit: exhibit, is_multiple: true) }
+    it 'can add multiple values' do
+      visit spotlight.exhibit_solr_document_path(exhibit, 'dq287tq6352')
+
+      expect(page).to have_link 'Edit'
+
+      click_on 'Edit'
+      fill_in 'Some Field', with: 'value 1'
+      click_on 'Add another'
+      fill_in 'solr_document_sidecar_data_some-field_2', with: 'value 2'
+
+      click_on 'Save changes'
+
+      expect(::SolrDocument.new(id: 'dq287tq6352').sidecar(exhibit).data).to include 'some-field' => ['value 1', 'value 2']
+    end
+  end
+
   it 'has a public toggle' do
     visit spotlight.exhibit_solr_document_path(exhibit, 'dq287tq6352')
 

data/spec/features/add_items_spec.rb

@@ -4,7 +4,7 @@ describe 'Uploading a non-repository item', type: :feature do
   include ActiveJob::TestHelper
 
   let!(:exhibit) { FactoryBot.create(:exhibit) }
-  let!(:custom_field) { FactoryBot.create(:custom_field, exhibit: exhibit) }
+  let!(:custom_field) { FactoryBot.create(:custom_field, exhibit: exhibit, field_type: :vocab) }
   let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
   let(:user) { exhibit_curator }
   before { login_as user }
@@ -24,7 +24,7 @@ describe 'Uploading a non-repository item', type: :feature do
         expect(page).to have_css('textarea#resources_upload_data_spotlight_upload_description_tesim')
         expect(page).to have_css('#resources_upload_data_spotlight_upload_attribution_tesim[type="text"]')
         expect(page).to have_css('#resources_upload_data_spotlight_upload_date_tesim[type="text"]')
-        expect(page).to have_css("#resources_upload_data_#{custom_field.field}[type='text']")
+        expect(page).to have_css("#f0_resources_upload_data_#{custom_field.slug}[type='text']")
       end
     end
 
@@ -46,6 +46,23 @@ describe 'Uploading a non-repository item', type: :feature do
       Blacklight.default_index.connection.commit
     end
 
+    it 'creates a new item event without an attached file' do
+      visit spotlight.new_exhibit_resource_path(exhibit)
+
+      click_link 'Upload item'
+
+      fill_in 'Title', with: 'no-image'
+
+      within '#new_resources_upload' do
+        click_button 'Add item'
+      end
+      expect(page).to have_content 'Object uploaded successfully.'
+      expect(Spotlight::Resource.last.data['full_title_tesim']).to eq 'no-image'
+
+      Blacklight.default_index.connection.delete_by_id Spotlight::Resource.last.send(:compound_id)
+      Blacklight.default_index.connection.commit
+    end
+
     it 'displays the multi-item CSV upload form' do
       visit spotlight.new_exhibit_resource_path(exhibit)
       expect(page).to have_css('h1', text: /Curation/)

data/spec/features/exhibits/custom_metadata_fields_spec.rb

@@ -71,4 +71,27 @@ describe 'Adding custom metadata fields', type: :feature do
     visit spotlight.edit_exhibit_search_configuration_path exhibit
     expect(page).to have_content 'My new custom field'
   end
+
+  it 'can be multivalued' do
+    visit spotlight.edit_exhibit_metadata_configuration_path exhibit
+    click_on 'Add new field'
+    fill_in 'Label', with: 'My multivalued custom field'
+
+    choose 'Controlled vocabulary'
+    check 'custom_field_is_multiple'
+    click_on 'Save'
+
+    expect(page).to have_content 'The custom field was created.'
+    within '#exhibit-specific-fields' do
+      # Edit
+      click_link 'Edit'
+    end
+
+    expect(page).to have_checked_field 'Controlled vocabulary'
+    expect(page).to have_unchecked_field 'Free text'
+    expect(page).to have_checked_field 'custom_field_is_multiple', disabled: true
+
+    visit spotlight.edit_exhibit_search_configuration_path exhibit
+    expect(page).to have_content 'My multivalued custom field'
+  end
 end

data/spec/helpers/spotlight/pages_helper_spec.rb

@@ -100,4 +100,18 @@ describe Spotlight::PagesHelper, type: :helper do
       expect(helper.sir_trevor_markdown(nil)).to be_blank
     end
   end
+
+  describe '#content_editor_class' do
+    context 'with a sir-trevor backed page' do
+      it 'has a custom class' do
+        expect(helper.content_editor_class(Spotlight::Page.new)).to eq 'js-st-instance'
+      end
+    end
+
+    context 'with a sir-trevor backed page' do
+      it 'derives a css class name from the editor type' do
+        expect(helper.content_editor_class(Spotlight::Page.new(content_type: 'Something::Custom'))).to eq 'js-something-custom-instance'
+      end
+    end
+  end
 end

data/spec/jobs/spotlight/add_uploads_from_csv_spec.rb

@@ -7,7 +7,8 @@ describe Spotlight::AddUploadsFromCSV do
   let(:data) do
     [
       { 'url' => 'x' },
-      { 'url' => 'y' }
+      { 'url' => 'y' },
+      { 'url' => '~' }
     ]
   end
 
@@ -29,10 +30,11 @@ describe Spotlight::AddUploadsFromCSV do
 
   it 'creates uploaded resources for each row of data' do
     upload = FactoryBot.create(:uploaded_resource)
-    expect(Spotlight::Resources::Upload).to receive(:new).at_least(:once).and_return(upload)
+    expect(Spotlight::Resources::Upload).to receive(:new).exactly(3).times.and_return(upload)
 
     expect(upload).to receive(:build_upload).with(remote_image_url: 'x').and_call_original
     expect(upload).to receive(:build_upload).with(remote_image_url: 'y').and_call_original
+    expect(upload).not_to receive(:build_upload).with(remote_image_url: '~')
     expect(upload).to receive(:save_and_index).at_least(:once)
 
     job.perform_now

data/spec/models/spotlight/blacklight_configuration_spec.rb

@@ -96,7 +96,7 @@ describe Spotlight::BlacklightConfiguration, type: :model do
 
       it 'defaults to not showing a custom field in the facets' do
         field = double('field', new_record?: false, field: 'a', solr_field: 'a', configuration: {})
-        custom_fields = double('custom_fields', vocab: [field], reject: [])
+        custom_fields = double('custom_fields', facetable: [field], reject: [])
         allow(custom_fields).to receive(:map).and_yield(field)
         allow(subject.exhibit).to receive(:custom_fields).and_return(custom_fields)
         subject.facet_fields = { 'a' => { enabled: '1', label: 'Label' } }
@@ -523,7 +523,7 @@ describe Spotlight::BlacklightConfiguration, type: :model do
 
   describe '#custom_facet_fields' do
     it 'converts exhibit-specific fields to Blacklight configurations' do
-      allow(subject.exhibit).to receive_message_chain(:custom_fields, vocab: [
+      allow(subject.exhibit).to receive_message_chain(:custom_fields, facetable: [
                                                         stub_model(Spotlight::CustomField, field: 'abc', configuration: { a: 1 }, exhibit: subject.exhibit),
                                                         stub_model(Spotlight::CustomField, field: 'xyz', configuration: { x: 2 }, exhibit: subject.exhibit)
                                                       ])

data/spec/models/spotlight/custom_field_spec.rb

@@ -67,13 +67,13 @@ describe Spotlight::CustomField, type: :model do
     it 'ends in the text suffix if it is a text field' do
       subject.field_type = 'text'
       subject.save
-      expect(subject.field).to end_with Spotlight::Engine.config.solr_fields.text_suffix
+      expect(subject.field).to end_with '_tesim'
     end
 
     it 'ends in a string suffix if it is a vocab field' do
       subject.field_type = 'vocab'
       subject.save
-      expect(subject.field).to end_with Spotlight::Engine.config.solr_fields.string_suffix
+      expect(subject.field).to end_with '_ssim'
     end
 
     it 'begins with readonly if it is readonly' do
@@ -182,7 +182,12 @@ describe Spotlight::CustomField, type: :model do
     end
 
     it 'queues a job to reindex any documents with data in the old field' do
-      expect(Spotlight::RenameSidecarFieldJob).to receive(:perform_later).with(exhibit, subject.field, subject.field.sub('tesim', 'ssim'))
+      expect(Spotlight::RenameSidecarFieldJob).to receive(:perform_later).with(
+        exhibit,
+        subject.field, subject.field.sub('tesim', 'ssim'),
+        subject.slug, subject.slug
+      )
+
       subject.field_type = 'vocab'
       subject.save
     end

data/spec/models/spotlight/page_spec.rb

@@ -65,6 +65,28 @@ describe Spotlight::Page, type: :model do
       page.content = []
       expect(page.content).to be_a_kind_of SirTrevorRails::BlockArray
     end
+
+    context 'with an alternate page content type' do
+      let(:page) { FactoryBot.create(:feature_page, content_type: 'Static') }
+      let(:fake_class) do
+        Class.new do
+          def self.parse(*_args)
+            'xyz'
+          end
+        end
+      end
+
+      before do
+        # needed so we don't accidentally stub Spotlight::PageContent below
+        require 'spotlight/page_content'
+        stub_const('Spotlight::PageContent::Static', fake_class)
+      end
+
+      it 'works' do
+        page.content = [].to_json
+        expect(page.content).to eq 'xyz'
+      end
+    end
   end
 
   describe '#content?' do
@@ -81,6 +103,19 @@ describe Spotlight::Page, type: :model do
     end
   end
 
+  describe '#content_type' do
+    let(:page) { FactoryBot.create(:feature_page) }
+
+    it 'can be set as an attribute' do
+      page.content_type = 'Xyz'
+      expect(page.content_type).to eq 'Xyz'
+    end
+
+    it 'defauts to SirTrevor' do
+      expect(page.content_type).to eq 'SirTrevor'
+    end
+  end
+
   describe '#slug' do
     let(:page) { FactoryBot.create(:feature_page) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.8.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -789,57 +789,61 @@ files:
 - app/assets/images/spotlight/default_browse_thumbnail.jpg
 - app/assets/images/spotlight/default_thumbnail.jpg
 - app/assets/images/spotlight/fallback/default.png
-- app/assets/javascripts/spotlight/add_new_page_button.js
-- app/assets/javascripts/spotlight/analytics.js
-- app/assets/javascripts/spotlight/appearance.js
+- app/assets/javascripts/spotlight/admin/add_another.js
+- app/assets/javascripts/spotlight/admin/add_new_page_button.js
+- app/assets/javascripts/spotlight/admin/appearance.js
+- app/assets/javascripts/spotlight/admin/attachments.js
+- app/assets/javascripts/spotlight/admin/blacklight_configuration.js
+- app/assets/javascripts/spotlight/admin/block_mixins/autocompleteable.js
+- app/assets/javascripts/spotlight/admin/block_mixins/formable.js
+- app/assets/javascripts/spotlight/admin/block_mixins/plustextable.js
+- app/assets/javascripts/spotlight/admin/blocks/block.js
+- app/assets/javascripts/spotlight/admin/blocks/browse_block.js
+- app/assets/javascripts/spotlight/admin/blocks/iframe_block.js
+- app/assets/javascripts/spotlight/admin/blocks/link_to_search_block.js
+- app/assets/javascripts/spotlight/admin/blocks/oembed_block.js
+- app/assets/javascripts/spotlight/admin/blocks/pages_block.js
+- app/assets/javascripts/spotlight/admin/blocks/resources_block.js
+- app/assets/javascripts/spotlight/admin/blocks/rule_block.js
+- app/assets/javascripts/spotlight/admin/blocks/search_result_block.js
+- app/assets/javascripts/spotlight/admin/blocks/solr_documents_base_block.js
+- app/assets/javascripts/spotlight/admin/blocks/solr_documents_block.js
+- app/assets/javascripts/spotlight/admin/blocks/solr_documents_carousel_block.js
+- app/assets/javascripts/spotlight/admin/blocks/solr_documents_embed_block.js
+- app/assets/javascripts/spotlight/admin/blocks/solr_documents_features_block.js
+- app/assets/javascripts/spotlight/admin/blocks/solr_documents_grid_block.js
+- app/assets/javascripts/spotlight/admin/blocks/uploaded_items_block.js
+- app/assets/javascripts/spotlight/admin/catalog_edit.js
+- app/assets/javascripts/spotlight/admin/copy_email_addresses.js
+- app/assets/javascripts/spotlight/admin/crop.es6
+- app/assets/javascripts/spotlight/admin/croppable.js
+- app/assets/javascripts/spotlight/admin/edit_in_place.js
+- app/assets/javascripts/spotlight/admin/exhibits.js
+- app/assets/javascripts/spotlight/admin/form_observer.js
+- app/assets/javascripts/spotlight/admin/iiif.es6
+- app/assets/javascripts/spotlight/admin/index.js
+- app/assets/javascripts/spotlight/admin/locks.js
+- app/assets/javascripts/spotlight/admin/multi_image_selector.js
+- app/assets/javascripts/spotlight/admin/pages.js.erb
+- app/assets/javascripts/spotlight/admin/readonly_checkbox.js
+- app/assets/javascripts/spotlight/admin/reindex_monitor.js
+- app/assets/javascripts/spotlight/admin/search_typeahead.js
+- app/assets/javascripts/spotlight/admin/select_related_input.js
+- app/assets/javascripts/spotlight/admin/sir-trevor/block_controls.js
+- app/assets/javascripts/spotlight/admin/sir-trevor/block_limits.js
+- app/assets/javascripts/spotlight/admin/sir-trevor/locales.js
+- app/assets/javascripts/spotlight/admin/spotlight_nestable.js
+- app/assets/javascripts/spotlight/admin/tabs.js
+- app/assets/javascripts/spotlight/admin/translation_progress.js
+- app/assets/javascripts/spotlight/admin/users.js
 - app/assets/javascripts/spotlight/application.js
-- app/assets/javascripts/spotlight/attachments.js
-- app/assets/javascripts/spotlight/blacklight_configuration.js
-- app/assets/javascripts/spotlight/block_mixins/autocompleteable.js
-- app/assets/javascripts/spotlight/block_mixins/formable.js
-- app/assets/javascripts/spotlight/block_mixins/plustextable.js
-- app/assets/javascripts/spotlight/blocks/block.js
-- app/assets/javascripts/spotlight/blocks/browse_block.js
-- app/assets/javascripts/spotlight/blocks/iframe_block.js
-- app/assets/javascripts/spotlight/blocks/link_to_search_block.js
-- app/assets/javascripts/spotlight/blocks/oembed_block.js
-- app/assets/javascripts/spotlight/blocks/pages_block.js
-- app/assets/javascripts/spotlight/blocks/resources_block.js
-- app/assets/javascripts/spotlight/blocks/rule_block.js
-- app/assets/javascripts/spotlight/blocks/search_result_block.js
-- app/assets/javascripts/spotlight/blocks/solr_documents_base_block.js
-- app/assets/javascripts/spotlight/blocks/solr_documents_block.js
-- app/assets/javascripts/spotlight/blocks/solr_documents_carousel_block.js
-- app/assets/javascripts/spotlight/blocks/solr_documents_embed_block.js
-- app/assets/javascripts/spotlight/blocks/solr_documents_features_block.js
-- app/assets/javascripts/spotlight/blocks/solr_documents_grid_block.js
-- app/assets/javascripts/spotlight/blocks/uploaded_items_block.js
-- app/assets/javascripts/spotlight/catalog_edit.js
-- app/assets/javascripts/spotlight/clear_form_button.js
-- app/assets/javascripts/spotlight/copy_email_addresses.js
-- app/assets/javascripts/spotlight/crop.es6
-- app/assets/javascripts/spotlight/croppable.js
-- app/assets/javascripts/spotlight/edit_in_place.js
-- app/assets/javascripts/spotlight/exhibits.js
-- app/assets/javascripts/spotlight/form_observer.js
-- app/assets/javascripts/spotlight/iiif.es6
-- app/assets/javascripts/spotlight/locks.js
-- app/assets/javascripts/spotlight/multi_image_selector.js
-- app/assets/javascripts/spotlight/pages.js.erb
-- app/assets/javascripts/spotlight/readonly_checkbox.js
-- app/assets/javascripts/spotlight/reindex_monitor.js
-- app/assets/javascripts/spotlight/report_a_problem.js
-- app/assets/javascripts/spotlight/search_typeahead.js
-- app/assets/javascripts/spotlight/select_related_input.js
-- app/assets/javascripts/spotlight/sir-trevor/block_controls.js
-- app/assets/javascripts/spotlight/sir-trevor/block_limits.js
-- app/assets/javascripts/spotlight/sir-trevor/locales.js
 - app/assets/javascripts/spotlight/spotlight.js
-- app/assets/javascripts/spotlight/spotlight_nestable.js
-- app/assets/javascripts/spotlight/tabs.js
-- app/assets/javascripts/spotlight/translation_progress.js
-- app/assets/javascripts/spotlight/users.js
-- app/assets/javascripts/spotlight/zpr_links.js.erb
+- app/assets/javascripts/spotlight/user/analytics.js
+- app/assets/javascripts/spotlight/user/carousel.js
+- app/assets/javascripts/spotlight/user/clear_form_button.js
+- app/assets/javascripts/spotlight/user/index.js
+- app/assets/javascripts/spotlight/user/report_a_problem.js
+- app/assets/javascripts/spotlight/user/zpr_links.js.erb
 - app/assets/stylesheets/spotlight/_attachments.css
 - app/assets/stylesheets/spotlight/_blacklight_configuration.scss
 - app/assets/stylesheets/spotlight/_blacklight_overrides.scss
@@ -990,6 +994,8 @@ files:
 - app/models/spotlight/masthead.rb
 - app/models/spotlight/page.rb
 - app/models/spotlight/page_configurations.rb
+- app/models/spotlight/page_content.rb
+- app/models/spotlight/page_content/sir_trevor.rb
 - app/models/spotlight/reindex_progress.rb
 - app/models/spotlight/reindexing_log_entry.rb
 - app/models/spotlight/resource.rb
@@ -1079,6 +1085,8 @@ files:
 - app/views/spotlight/contacts/new.html.erb
 - app/views/spotlight/custom_fields/_form.html.erb
 - app/views/spotlight/custom_fields/edit.html.erb
+- app/views/spotlight/custom_fields/form_group/_text.html.erb
+- app/views/spotlight/custom_fields/form_group/_vocab.html.erb
 - app/views/spotlight/custom_fields/new.html.erb
 - app/views/spotlight/dashboards/_analytics.html.erb
 - app/views/spotlight/dashboards/_page.html.erb
@@ -1264,6 +1272,8 @@ files:
 - db/migrate/20180529225807_change_spotlight_pages_content_column_to_medium_text.rb
 - db/migrate/20180822233601_change_type_of_taggings_taggable.rb
 - db/migrate/20181127085432_change_weight_on_pages.rb
+- db/migrate/20190807085432_add_content_type_to_pages.rb
+- db/migrate/20190813085432_add_is_multiple_to_custom_fields.rb
 - lib/blacklight/spotlight.rb
 - lib/generators/spotlight/install_generator.rb
 - lib/generators/spotlight/scaffold_resource_generator.rb