blacklight-spotlight 0.34.1 → 1.0.0.alpha1

data/app/models/spotlight/site.rb

@@ -5,7 +5,7 @@ module Spotlight
     has_many :exhibits, -> { ordered_by_weight }
     has_many :roles, as: :resource
 
-    belongs_to :masthead, dependent: :destroy
+    belongs_to :masthead, dependent: :destroy, optional: true
 
     accepts_nested_attributes_for :masthead, update_only: true
     accepts_nested_attributes_for :exhibits

data/app/models/spotlight/solr_document_sidecar.rb

@@ -2,8 +2,12 @@ module Spotlight
   ##
   # Exhibit-specific metadata for indexed documents
   class SolrDocumentSidecar < ActiveRecord::Base
+    extend ActsAsTaggableOn::Taggable
+
+    acts_as_taggable
+
     belongs_to :exhibit, required: true
-    belongs_to :resource
+    belongs_to :resource, optional: true
     belongs_to :document, required: true, polymorphic: true
     serialize :data, Hash
     serialize :index_status, Hash

data/app/uploaders/spotlight/featured_image_uploader.rb

@@ -4,7 +4,7 @@ module Spotlight
   class FeaturedImageUploader < CarrierWave::Uploader::Base
     storage Spotlight::Engine.config.uploader_storage
 
-    def extension_white_list
+    def extension_whitelist
       Spotlight::Engine.config.allowed_upload_extensions
     end
 

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

@@ -5,7 +5,7 @@
     <% end %>
 
     <ul class="nav navbar-nav">
-      <li class="<%= "active" if current_page?(current_exhibit) %>"><%= link_to t(:'spotlight.curation.nav.home'), current_exhibit %></li>
+      <li class="<%= "active" if current_page?([spotlight, current_exhibit]) %>"><%= link_to t(:'spotlight.curation.nav.home'), [spotlight, current_exhibit] %></li>
       <% current_exhibit.main_navigations.displayable.each do |navigation| %>
         <%= render partial: "shared/#{navigation.nav_type}_navbar", locals: { navigation: navigation } %>
       <% end %>

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

@@ -37,7 +37,7 @@
 
   <% if can? :tag, current_exhibit %>
   <div class="edit-tags">
-  <%= f.text_field :exhibit_tag_list, value: f.object.tags_from(current_exhibit).to_s, 'data-autocomplete_url' => exhibit_tags_path(current_exhibit, format: 'json') %>
+  <%= f.text_field :exhibit_tag_list, value: f.object.sidecar(current_exhibit).tags_from(current_exhibit).to_s, 'data-autocomplete_url' => exhibit_tags_path(current_exhibit, format: 'json') %>
   </div>
   <% end %>
   <div class="form-actions">

data/db/migrate/20131119213142_create_spotlight_pages.rb

@@ -1,4 +1,4 @@
-class CreateSpotlightPages < ActiveRecord::Migration
+class CreateSpotlightPages < ActiveRecord::Migration[4.2]
   def change
     create_table :spotlight_pages do |t|
       t.string     :title

data/db/migrate/20131120172811_create_spotlight_attachments.rb

@@ -1,4 +1,4 @@
-class CreateSpotlightAttachments < ActiveRecord::Migration
+class CreateSpotlightAttachments < ActiveRecord::Migration[4.2]
   def change
     create_table :spotlight_attachments do |t|
       t.string :name

data/db/migrate/20140128155151_create_exhibits.rb

@@ -1,4 +1,4 @@
-class CreateExhibits < ActiveRecord::Migration
+class CreateExhibits < ActiveRecord::Migration[4.2]
   def change
     create_table :spotlight_exhibits do |t|
       t.string :title, null: false

data/db/migrate/20140128155152_create_roles.rb

@@ -1,4 +1,4 @@
-class CreateRoles < ActiveRecord::Migration
+class CreateRoles < ActiveRecord::Migration[4.2]
   def change
     create_table :spotlight_roles do |t|
       t.references :exhibit

data/db/migrate/20140130155151_create_spotlight_searches.rb

@@ -1,4 +1,4 @@
-class CreateSpotlightSearches < ActiveRecord::Migration
+class CreateSpotlightSearches < ActiveRecord::Migration[4.2]
   def change
     create_table :spotlight_searches do |t|
       t.string :title

data/db/migrate/20140130215634_create_spotlight_blacklight_configurations.rb

@@ -1,4 +1,4 @@
-class CreateSpotlightBlacklightConfigurations < ActiveRecord::Migration
+class CreateSpotlightBlacklightConfigurations < ActiveRecord::Migration[4.2]
   def change
     create_table :spotlight_blacklight_configurations do |t|
       t.references :exhibit

data/db/migrate/20140206152809_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb

@@ -1,5 +1,5 @@
 # This migration comes from acts_as_taggable_on_engine (originally 1)
-class ActsAsTaggableOnMigration < ActiveRecord::Migration
+class ActsAsTaggableOnMigration < ActiveRecord::Migration[4.2]
   def self.up
     create_table :tags do |t|
       t.string :name

data/db/migrate/20140206152810_add_missing_unique_indices.acts_as_taggable_on_engine.rb

@@ -1,5 +1,5 @@
 # This migration comes from acts_as_taggable_on_engine (originally 2)
-class AddMissingUniqueIndices < ActiveRecord::Migration
+class AddMissingUniqueIndices < ActiveRecord::Migration[4.2]
 
   def self.up
     add_index :tags, :name, unique: true

data/db/migrate/20140211203403_create_spotlight_custom_fields.rb

@@ -1,4 +1,4 @@
-class CreateSpotlightCustomFields < ActiveRecord::Migration
+class CreateSpotlightCustomFields < ActiveRecord::Migration[4.2]
   def change
     create_table :spotlight_custom_fields do |t|
       t.references :exhibit

data/db/migrate/20140211212626_create_spotlight_solr_document_sidecars.rb

@@ -1,4 +1,4 @@
-class CreateSpotlightSolrDocumentSidecars < ActiveRecord::Migration
+class CreateSpotlightSolrDocumentSidecars < ActiveRecord::Migration[4.2]
   def change
     create_table :spotlight_solr_document_sidecars do |t|
       t.references :exhibit, index: true

data/db/migrate/20140218155151_create_contacts.rb

@@ -1,4 +1,4 @@
-class CreateContacts < ActiveRecord::Migration
+class CreateContacts < ActiveRecord::Migration[4.2]
   def change
     create_table :spotlight_contacts do |t|
       t.string     :slug

data/db/migrate/20140225180948_create_contact_emails.rb

@@ -1,4 +1,4 @@
-class CreateContactEmails < ActiveRecord::Migration
+class CreateContactEmails < ActiveRecord::Migration[4.2]
   def change
     create_table(:spotlight_contact_emails) do |t|
       t.references :exhibit

data/db/migrate/20140228131207_create_resources.rb

@@ -1,4 +1,4 @@
-class CreateResources < ActiveRecord::Migration
+class CreateResources < ActiveRecord::Migration[4.2]
   def change
     create_table(:spotlight_resources) do |t|
       t.references :exhibit

data/db/migrate/20140401232956_change_featured_image_to_featured_image_id.rb

@@ -1,4 +1,4 @@
-class ChangeFeaturedImageToFeaturedImageId < ActiveRecord::Migration
+class ChangeFeaturedImageToFeaturedImageId < ActiveRecord::Migration[4.2]
   def change
     remove_column :spotlight_searches, :featured_image, :string
     add_column :spotlight_searches, :featured_item_id, :string

data/db/migrate/20140403180324_create_spotlight_main_navigations.rb

@@ -1,4 +1,4 @@
-class CreateSpotlightMainNavigations < ActiveRecord::Migration
+class CreateSpotlightMainNavigations < ActiveRecord::Migration[4.2]
   def change
     create_table :spotlight_main_navigations do |t|
       t.string     :label

data/db/migrate/20141117111311_create_locks.rb

@@ -1,4 +1,4 @@
-class CreateLocks < ActiveRecord::Migration
+class CreateLocks < ActiveRecord::Migration[4.2]
   def change
     create_table :spotlight_locks do |t|
       t.references :on, polymorphic: true

data/db/migrate/20141118233735_change_contact_details.rb

@@ -1,4 +1,4 @@
-class ChangeContactDetails < ActiveRecord::Migration
+class ChangeContactDetails < ActiveRecord::Migration[4.2]
   def up
     add_column :spotlight_contacts, :contact_info, :text
 

data/db/migrate/20141126231820_add_avatar_to_contacts.rb

@@ -1,4 +1,4 @@
-class AddAvatarToContacts < ActiveRecord::Migration
+class AddAvatarToContacts < ActiveRecord::Migration[4.2]
   def change
     add_column :spotlight_contacts, :avatar, :string
     add_column :spotlight_contacts, :avatar_crop_x, :integer

data/db/migrate/20141205005902_add_layout_options_to_exhibit.rb

@@ -1,4 +1,4 @@
-class AddLayoutOptionsToExhibit < ActiveRecord::Migration
+class AddLayoutOptionsToExhibit < ActiveRecord::Migration[4.2]
   def change
     add_column :spotlight_exhibits, :searchable, :boolean, default: true
     add_column :spotlight_exhibits, :layout,     :string

data/db/migrate/20150116161616_add_published_to_exhibit.rb

@@ -1,4 +1,4 @@
-class AddPublishedToExhibit < ActiveRecord::Migration
+class AddPublishedToExhibit < ActiveRecord::Migration[4.2]
   def change
     add_column :spotlight_exhibits, :published, :boolean, default: false
     add_column :spotlight_exhibits, :published_at, :datetime

data/db/migrate/20150127173245_add_featured_image_to_exhibit.rb

@@ -1,4 +1,4 @@
-class AddFeaturedImageToExhibit < ActiveRecord::Migration
+class AddFeaturedImageToExhibit < ActiveRecord::Migration[4.2]
   def change
     add_column :spotlight_exhibits, :featured_image, :string
   end

data/db/migrate/20150217111511_add_polymorphic_document_to_sidecars.rb

@@ -1,4 +1,4 @@
-class AddPolymorphicDocumentToSidecars < ActiveRecord::Migration
+class AddPolymorphicDocumentToSidecars < ActiveRecord::Migration[4.2]
   def change
     add_column :spotlight_solr_document_sidecars, :document_id, :string
     add_column :spotlight_solr_document_sidecars, :document_type, :string

data/db/migrate/20150304071512_add_spotlight_featured_images.rb

@@ -1,4 +1,4 @@
-class AddSpotlightFeaturedImages < ActiveRecord::Migration
+class AddSpotlightFeaturedImages < ActiveRecord::Migration[4.2]
   def change
     create_table :spotlight_featured_images do |t|
       t.string :type

data/db/migrate/20150304111111_add_featured_image_to_spotlight_classes.rb

@@ -1,4 +1,4 @@
-class AddFeaturedImageToSpotlightClasses < ActiveRecord::Migration
+class AddFeaturedImageToSpotlightClasses < ActiveRecord::Migration[4.2]
   
   def change
     add_column :spotlight_searches, :masthead_id, :integer

data/db/migrate/20150306202300_add_display_to_spotlight_main_navigations.rb

@@ -1,4 +1,4 @@
-class AddDisplayToSpotlightMainNavigations < ActiveRecord::Migration
+class AddDisplayToSpotlightMainNavigations < ActiveRecord::Migration[4.2]
   def up
     add_column :spotlight_main_navigations, :display, :boolean, default: true
 

data/db/migrate/20150313175432_add_field_type_to_custom_fields.rb

@@ -1,4 +1,4 @@
-class AddFieldTypeToCustomFields < ActiveRecord::Migration
+class AddFieldTypeToCustomFields < ActiveRecord::Migration[4.2]
   def up
     add_column :spotlight_custom_fields, :field_type, :string
 

data/db/migrate/20150410180014_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb

@@ -1,5 +1,5 @@
 # This migration comes from acts_as_taggable_on_engine (originally 3)
-class AddTaggingsCounterCacheToTags < ActiveRecord::Migration
+class AddTaggingsCounterCacheToTags < ActiveRecord::Migration[4.2]
   def self.up
     add_column :tags, :taggings_count, :integer, default: 0
 

data/db/migrate/20150410180015_add_missing_taggable_index.acts_as_taggable_on_engine.rb

@@ -1,5 +1,5 @@
 # This migration comes from acts_as_taggable_on_engine (originally 4)
-class AddMissingTaggableIndex < ActiveRecord::Migration
+class AddMissingTaggableIndex < ActiveRecord::Migration[4.2]
   def self.up
     add_index :taggings, [:taggable_id, :taggable_type, :context]
   end

data/db/migrate/20150410180016_change_collation_for_tag_names.acts_as_taggable_on_engine.rb

@@ -1,7 +1,7 @@
 # This migration comes from acts_as_taggable_on_engine (originally 5)
 # This migration is added to circumvent issue #623 and have special characters
 # work properly
-class ChangeCollationForTagNames < ActiveRecord::Migration
+class ChangeCollationForTagNames < ActiveRecord::Migration[4.2]
   def up
     if ActsAsTaggableOn::Utils.using_mysql?
       execute("ALTER TABLE tags MODIFY name varchar(255) CHARACTER SET utf8 COLLATE utf8_bin;")

data/db/migrate/20150713160101_change_spotlight_searches_to_published.rb

@@ -1,4 +1,4 @@
-class ChangeSpotlightSearchesToPublished < ActiveRecord::Migration
+class ChangeSpotlightSearchesToPublished < ActiveRecord::Migration[4.2]
   def up
     rename_column :spotlight_searches, :on_landing_page, :published
   end

data/db/migrate/20151016092343_remove_searchable_from_exhibit.rb

@@ -1,4 +1,4 @@
-class RemoveSearchableFromExhibit < ActiveRecord::Migration
+class RemoveSearchableFromExhibit < ActiveRecord::Migration[4.2]
   def up
     Spotlight::Exhibit.where(searchable: false).find_each do |e|
       e.home_page.update(display_sidebar: false)

data/db/migrate/20151110082345_add_metadata_to_spotlight_resource.rb

@@ -1,4 +1,4 @@
-class AddMetadataToSpotlightResource < ActiveRecord::Migration
+class AddMetadataToSpotlightResource < ActiveRecord::Migration[4.2]
   def up
     add_column :spotlight_resources, :metadata, :binary
   end

data/db/migrate/20151117153210_change_spotlight_exhibit_published_default.rb

@@ -1,4 +1,4 @@
-class ChangeSpotlightExhibitPublishedDefault < ActiveRecord::Migration
+class ChangeSpotlightExhibitPublishedDefault < ActiveRecord::Migration[4.2]
   def up
     change_column :spotlight_exhibits, :published, :boolean, default: false
   end

data/db/migrate/20151124101123_remove_default_from_spotlight_exhibit.rb

@@ -1,4 +1,4 @@
-class RemoveDefaultFromSpotlightExhibit < ActiveRecord::Migration
+class RemoveDefaultFromSpotlightExhibit < ActiveRecord::Migration[4.2]
   def up
     return unless Spotlight::Exhibit.column_names.include? 'default'
 

data/db/migrate/20151124105543_update_custom_field_names.rb

@@ -1,4 +1,4 @@
-class UpdateCustomFieldNames < ActiveRecord::Migration
+class UpdateCustomFieldNames < ActiveRecord::Migration[4.2]
   def up
     fields = {}
 

data/db/migrate/20151208085432_add_weight_to_exhibits.rb

@@ -1,4 +1,4 @@
-class AddWeightToExhibits < ActiveRecord::Migration
+class AddWeightToExhibits < ActiveRecord::Migration[4.2]
   def up
     add_column :spotlight_exhibits, :weight, :integer, default: 50
   end

data/db/migrate/20151210073829_create_spotlight_site.rb

@@ -1,4 +1,4 @@
-class CreateSpotlightSite < ActiveRecord::Migration
+class CreateSpotlightSite < ActiveRecord::Migration[4.2]
   def change
     create_table :spotlight_sites do |t|
       t.string :title

data/db/migrate/20151211131415_add_site_to_spotlight_exhibits.rb

@@ -1,4 +1,4 @@
-class AddSiteToSpotlightExhibits < ActiveRecord::Migration
+class AddSiteToSpotlightExhibits < ActiveRecord::Migration[4.2]
   def up
     add_column :spotlight_exhibits, :site_id, :integer
     add_index :spotlight_exhibits, :site_id

data/db/migrate/20151215141516_change_roles_to_support_polymorphic_associations.rb

@@ -1,4 +1,4 @@
-class ChangeRolesToSupportPolymorphicAssociations < ActiveRecord::Migration
+class ChangeRolesToSupportPolymorphicAssociations < ActiveRecord::Migration[4.2]
   def up
     add_column :spotlight_roles, :resource_id, :integer
     add_column :spotlight_roles, :resource_type, :string

data/db/migrate/20151215192845_add_index_status_to_resources.rb

@@ -1,4 +1,4 @@
-class AddIndexStatusToResources < ActiveRecord::Migration
+class AddIndexStatusToResources < ActiveRecord::Migration[4.2]
   def change
     add_column :spotlight_resources, :index_status, :integer
     add_index :spotlight_resources, :index_status

data/db/migrate/20151217211019_create_spotlight_exhibit_filters.rb

@@ -1,4 +1,4 @@
-class CreateSpotlightExhibitFilters < ActiveRecord::Migration
+class CreateSpotlightExhibitFilters < ActiveRecord::Migration[4.2]
   def change
     create_table :spotlight_filters do |t|
       t.string :field

data/db/migrate/20160329215014_add_readonly_to_custom_fields.rb

@@ -1,4 +1,4 @@
-class AddReadonlyToCustomFields < ActiveRecord::Migration
+class AddReadonlyToCustomFields < ActiveRecord::Migration[4.2]
   def change
     add_column :spotlight_custom_fields, :readonly_field, :boolean, default: false
   end

data/db/migrate/20160711121314_add_default_view_to_spotlight_searches.rb

@@ -1,4 +1,4 @@
-class AddDefaultViewToSpotlightSearches < ActiveRecord::Migration
+class AddDefaultViewToSpotlightSearches < ActiveRecord::Migration[4.2]
   def change
     add_column :spotlight_searches, :default_index_view_type, :string
   end

data/db/migrate/20160714144125_add_iiif_urls_to_featured_image.rb

@@ -1,4 +1,4 @@
-class AddIiifUrlsToFeaturedImage < ActiveRecord::Migration
+class AddIiifUrlsToFeaturedImage < ActiveRecord::Migration[4.2]
   def change
     add_column :spotlight_featured_images, :iiif_region, :string
     add_column :spotlight_featured_images, :iiif_manifest_url, :string

data/db/migrate/20160718194010_add_iiif_url_to_contact.rb

@@ -1,4 +1,4 @@
-class AddIiifUrlToContact < ActiveRecord::Migration
+class AddIiifUrlToContact < ActiveRecord::Migration[4.2]
   def change
     add_column :spotlight_contacts, :avatar_id, :integer
     add_index :spotlight_contacts, :avatar_id

data/db/migrate/20160805143841_add_upload_id_to_resources.rb

@@ -1,4 +1,4 @@
-class AddUploadIdToResources < ActiveRecord::Migration
+class AddUploadIdToResources < ActiveRecord::Migration[4.2]
   def change
     add_column :spotlight_resources, :upload_id, :integer
     add_index :spotlight_resources, :upload_id

data/db/migrate/20160815165432_add_resource_to_solr_document_sidecar.rb

@@ -1,4 +1,4 @@
-class AddResourceToSolrDocumentSidecar < ActiveRecord::Migration
+class AddResourceToSolrDocumentSidecar < ActiveRecord::Migration[4.2]
   def change
     add_column :spotlight_solr_document_sidecars, :resource_id, :integer
     add_column :spotlight_solr_document_sidecars, :resource_type, :string

data/db/migrate/20160816165432_add_index_status_to_solr_document_sidecar.rb

@@ -1,4 +1,4 @@
-class AddIndexStatusToSolrDocumentSidecar < ActiveRecord::Migration
+class AddIndexStatusToSolrDocumentSidecar < ActiveRecord::Migration[4.2]
   def change
     add_column :spotlight_solr_document_sidecars, :index_status, :binary
   end

data/db/migrate/20160929180534_add_document_index_to_solr_document_sidecar.rb

@@ -1,4 +1,4 @@
-class AddDocumentIndexToSolrDocumentSidecar < ActiveRecord::Migration
+class AddDocumentIndexToSolrDocumentSidecar < ActiveRecord::Migration[4.2]
   def change
     add_index :spotlight_solr_document_sidecars, [:exhibit_id, :document_type, :document_id], name: 'spotlight_solr_document_sidecars_exhibit_document'
     add_index :spotlight_solr_document_sidecars, [:document_type, :document_id], name: 'spotlight_solr_document_sidecars_solr_document'

data/db/migrate/20170105222939_create_spotlight_reindexing_log_entries.rb

@@ -1,4 +1,4 @@
-class CreateSpotlightReindexingLogEntries < ActiveRecord::Migration
+class CreateSpotlightReindexingLogEntries < ActiveRecord::Migration[4.2]
   def change
     create_table :spotlight_reindexing_log_entries do |t|
       t.integer :items_reindexed_count

data/db/migrate/20170204091234_add_theme_to_spotlight_exhibits.rb

@@ -1,4 +1,4 @@
-class AddThemeToSpotlightExhibits < ActiveRecord::Migration
+class AddThemeToSpotlightExhibits < ActiveRecord::Migration[4.2]
   def change
     add_column :spotlight_exhibits, :theme, :string
   end

data/db/migrate/20170803152134_migrate_tags_to_sidecars.rb

@@ -0,0 +1,17 @@
+class MigrateTagsToSidecars < ActiveRecord::Migration[5.0]
+  def up
+    Spotlight::SolrDocumentSidecar.reset_column_information
+    ActsAsTaggableOn::Tagging.reset_column_information
+
+    ActsAsTaggableOn::Tagging.where(taggable_type: 'SolrDocument', tagger_type: 'Spotlight::Exhibit').find_each do |e|
+      sidecar = Spotlight::SolrDocumentSidecar.find_or_create_by(document_id: e.taggable_id, document_type: 'SolrDocument', exhibit_id: e.tagger_id)
+      e.update(taggable: sidecar)
+    end
+  end
+  
+  def down
+    ActsAsTaggableOn::Tagging.where(taggable_type: 'Spotlight::SolrDocumentSidecar').find_each do |e|
+      e.update(taggable: e.taggable.document)
+    end
+  end
+end

data/lib/spotlight/version.rb

@@ -1,3 +1,3 @@
 module Spotlight
-  VERSION = '0.34.1'.freeze
+  VERSION = '1.0.0.alpha1'.freeze
 end

data/spec/controllers/spotlight/appearances_controller_spec.rb

@@ -60,17 +60,10 @@ describe Spotlight::AppearancesController, type: :controller do
         }
       end
       let(:main_navigation_attributes) do
-        if Rails::VERSION::MAJOR >= 5
-          {
-            0 => { id: first_nav.id, label: 'Some Label', weight: 500 },
-            1 => { id: last_nav.id, display: false }
-          }
-        else
-          [
-            { id: first_nav.id, label: 'Some Label', weight: 500 },
-            { id: last_nav.id, display: false }
-          ]
-        end
+        {
+          0 => { id: first_nav.id, label: 'Some Label', weight: 500 },
+          1 => { id: last_nav.id, display: false }
+        }
       end
       it 'updates the navigation' do
         patch :update, params: submitted