blacklight-spotlight 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b22ac299ef75ed65fdbf1db182d8ffdd7c0fb955
-  data.tar.gz: 2a309cdf19b962204d101ccb949ee9dc3a9ea5f7
+  metadata.gz: 2b45039dfeb64f44d24665c3b2fbabef264eca86
+  data.tar.gz: 8d3f3015e3b61bbd5d185903b82af1c17a3c302a
 SHA512:
-  metadata.gz: 44cf9fb4a4c7550722d1b3ff8d3d9f5aaa69e515089b55739899cea0fafe93d33f0f413cafa61480dd221d2c60b3d1097fcf316b319ba05122f37a7970d04fb4
-  data.tar.gz: 9285521d65457583d865917083633faefc00dd9413120ee6e4182a655964f8fa13cada3f1d1975f404765ee20157b0eb17b39c1165b670ae97e4376d72c1d7d0
+  metadata.gz: 2d146ecf16f66315c47f81ef1e1f7a5a911cc0cb9989955a30bb64707e2a9a4b762b849578481ff0021b78d44998382265718f1c13e9af92e5a6a63482a23891
+  data.tar.gz: 14e5e9cb7329342bc6c8ed68cdd2bfae3e22f8e0efcc66d1c4297a26bb7b49a88924ba7f6a6ad0b51f4e37c05292354cc9ccfb12ffc427a2b03a769b2c59efa0

data/app/controllers/concerns/spotlight/catalog/access_controls_enforcement.rb

@@ -27,7 +27,7 @@ module Spotlight
         end
 
         def apply_exhibit_resources_filter(solr_params)
-          return unless Spotlight::Engine.config.filter_resources_by_exhibit && current_exhibit
+          return unless current_exhibit
 
           current_exhibit.solr_data.each do |facet_field, values|
             Array(values).each do |value|

data/app/controllers/spotlight/exhibits_controller.rb

@@ -85,6 +85,7 @@ module Spotlight
         :subtitle,
         :description,
         :published,
+        :tag_list,
         contact_emails_attributes: [:id, :email]
       )
     end

data/app/controllers/spotlight/filters_controller.rb

@@ -0,0 +1,28 @@
+module Spotlight
+  # Create and update filters for an exhibit
+  class FiltersController < ApplicationController
+    before_action :authenticate_user!
+    load_and_authorize_resource :exhibit, class: 'Spotlight::Exhibit'
+    load_and_authorize_resource through: :exhibit
+
+    def create
+      if @filter.save
+        flash[:notice] = t('helpers.submit.filter.updated', model: @filter.model_name.human)
+      else
+        flash[:alert] = @filter.errors.full_messages.join('<br/>'.html_safe)
+      end
+      redirect_to spotlight.edit_exhibit_path @exhibit, anchor: 'filter'
+    end
+
+    def update
+      unless @filter.update(filter_params)
+        flash[:alert] = @filter.errors.full_messages.join('<br/>'.html_safe)
+      end
+      redirect_to spotlight.edit_exhibit_path @exhibit, anchor: 'filter'
+    end
+
+    def filter_params
+      params.require(:filter).permit(:field, :value)
+    end
+  end
+end

data/app/controllers/spotlight/solr_controller.rb

@@ -7,6 +7,8 @@ module Spotlight
   # workflows with exhibit-specific content
   class SolrController < Spotlight::ApplicationController
     before_action :authenticate_user!
+    before_action :validate_writable_index!
+
     load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
 
     def update
@@ -22,5 +24,13 @@ module Spotlight
 
       render nothing: true
     end
+
+    private
+
+    def validate_writable_index!
+      return if Spotlight::Engine.config.writable_index
+
+      render text: 'Spotlight is unable to write to solr', status: 409
+    end
   end
 end

data/app/models/concerns/spotlight/exhibit_defaults.rb

@@ -0,0 +1,59 @@
+module Spotlight
+  # Mixin for adding default configuration to exhibits
+  module ExhibitDefaults
+    extend ActiveSupport::Concern
+
+    included do
+      before_create :build_home_page
+      before_create :add_site_reference
+      after_create :initialize_config
+      after_create :initialize_browse
+      after_create :initialize_main_navigation
+      after_create :initialize_filter
+    end
+
+    protected
+
+    def initialize_filter
+      return unless Spotlight::Engine.config.filter_resources_by_exhibit
+
+      filters.create field: default_filter_field, value: default_filter_value
+    end
+
+    def initialize_config
+      self.blacklight_configuration ||= Spotlight::BlacklightConfiguration.create!
+    end
+
+    def initialize_browse
+      return unless searches.blank?
+
+      searches.create title: 'All Exhibit Items',
+                      long_description: 'All items in this exhibit.'
+    end
+
+    def initialize_main_navigation
+      default_main_navigations.each_with_index do |nav_type, weight|
+        main_navigations.create nav_type: nav_type, weight: weight
+      end
+    end
+
+    def add_site_reference
+      self.site ||= Spotlight::Site.instance
+    end
+
+    def default_filter_field
+      "#{Spotlight::Engine.config.solr_fields.prefix}spotlight_exhibit_slug_#{slug}#{Spotlight::Engine.config.solr_fields.boolean_suffix}"
+    end
+
+    # Return a string to work around any ActiveRecord type-casting
+    def default_filter_value
+      'true'
+    end
+
+    private
+
+    def default_main_navigations
+      Spotlight::Engine.config.exhibit_main_navigation.dup
+    end
+  end
+end

data/app/models/concerns/spotlight/solr_document/atomic_updates.rb

@@ -4,11 +4,16 @@ module Spotlight
     # Solr indexing strategy using Solr's Atomic Updates
     module AtomicUpdates
       def reindex
+        return unless write?
         data = hash_for_solr_update(to_solr)
 
         blacklight_solr.update params: { commitWithin: 500 }, data: data.to_json, headers: { 'Content-Type' => 'application/json' } unless data.empty?
       end
 
+      def write?
+        Spotlight::Engine.config.writable_index
+      end
+
       private
 
       def hash_for_solr_update(data)

data/app/models/spotlight/exhibit.rb

@@ -4,6 +4,7 @@ module Spotlight
   # Spotlight exhibit
   class Exhibit < ActiveRecord::Base
     include Spotlight::ExhibitAnalytics
+    include Spotlight::ExhibitDefaults
     include Spotlight::ExhibitDocuments
 
     scope :published, -> { where(published: true) }
@@ -17,6 +18,7 @@ module Spotlight
     default_scope { order('weight ASC') }
 
     acts_as_tagger
+    acts_as_taggable
     delegate :blacklight_config, to: :blacklight_configuration
     serialize :facets, Array
 
@@ -35,6 +37,7 @@ module Spotlight
     has_many :solr_document_sidecars, dependent: :delete_all
     has_many :users, through: :roles, class_name: Spotlight::Engine.config.user_class
     has_many :pages, dependent: :destroy
+    has_many :filters, dependent: :delete_all
 
     has_one :blacklight_configuration, class_name: 'Spotlight::BlacklightConfiguration', dependent: :delete
     has_one :home_page
@@ -45,16 +48,11 @@ module Spotlight
 
     accepts_nested_attributes_for :about_pages, :attachments, :contacts, :custom_fields, :feature_pages,
                                   :main_navigations, :owned_taggings, :resources, :searches, :solr_document_sidecars
-    accepts_nested_attributes_for :blacklight_configuration, :home_page, :masthead, :thumbnail, update_only: true
+    accepts_nested_attributes_for :blacklight_configuration, :home_page, :masthead, :thumbnail, :filters, update_only: true
     accepts_nested_attributes_for :contact_emails, reject_if: proc { |attr| attr['email'].blank? }
     accepts_nested_attributes_for :roles, allow_destroy: true, reject_if: proc { |attr| attr['user_key'].blank? }
 
     before_save :sanitize_description, if: :description_changed?
-    before_create :build_home_page
-    before_create :add_site_reference
-    after_create :initialize_config
-    after_create :initialize_browse
-    after_create :initialize_main_navigation
     include Spotlight::DefaultThumbnailable
 
     def main_about_page
@@ -75,7 +73,9 @@ module Spotlight
     end
 
     def solr_data
-      Spotlight::Engine.config.exhibit_filter.call(self)
+      filters.each_with_object({}) do |filter, hash|
+        hash.merge! filter.to_hash
+      end
     end
 
     def reindex_later
@@ -104,33 +104,8 @@ module Spotlight
 
     protected
 
-    def add_site_reference
-      self.site ||= Spotlight::Site.instance
-    end
-
-    def initialize_config
-      self.blacklight_configuration ||= Spotlight::BlacklightConfiguration.create!
-    end
-
-    def initialize_browse
-      return unless searches.blank?
-
-      searches.create title: 'All Exhibit Items',
-                      long_description: 'All items in this exhibit.'
-    end
-
-    def initialize_main_navigation
-      default_main_navigations.each_with_index do |nav_type, weight|
-        main_navigations.create nav_type: nav_type, weight: weight
-      end
-    end
-
     def sanitize_description
       self.description = ::Rails::Html::FullSanitizer.new.sanitize(description)
     end
-
-    def default_main_navigations
-      Spotlight::Engine.config.exhibit_main_navigation.dup
-    end
   end
 end

data/app/models/spotlight/filter.rb

@@ -0,0 +1,26 @@
+module Spotlight
+  # A configurable solr filter for the exhibit
+  class Filter < ActiveRecord::Base
+    belongs_to :exhibit
+
+    validates :field, :value, presence: true
+
+    def to_hash
+      return {} unless field
+
+      { field => cast_value }
+    end
+
+    private
+
+    def cast_value
+      return value unless field
+
+      if field.ends_with? Spotlight::Engine.config.solr_fields.boolean_suffix
+        ActiveRecord::Type::Boolean.new.type_cast_from_database(value)
+      else
+        value
+      end
+    end
+  end
+end

data/app/models/spotlight/resource.rb

@@ -168,12 +168,14 @@ module Spotlight
       end
 
       def write_to_index(batch)
+        return unless write?
         blacklight_solr.update params: { commitWithin: 500 },
                                data: batch.to_json,
                                headers: { 'Content-Type' => 'application/json' }
       end
 
       def commit
+        return unless write?
         blacklight_solr.commit
       rescue => e
         Rails.logger.warn "Unable to commit to solr: #{e}"

data/app/models/spotlight/search.rb

@@ -54,8 +54,10 @@ module Spotlight
       masthead && masthead.display?
     end
 
+    # rubocop:disable Metrics/MethodLength
     def set_default_thumbnail
       self.thumbnail ||= begin
+        return unless Spotlight::Engine.config.full_image_field
         doc = documents.detect { |x| x.first(Spotlight::Engine.config.full_image_field) }
         if doc
           create_thumbnail(
@@ -66,6 +68,7 @@ module Spotlight
         end
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     def search_params
       search_builder.with(query_params.with_indifferent_access).merge(facet: false, fl: default_search_fields)
@@ -91,7 +94,7 @@ module Spotlight
         blacklight_config.index.title_field,
         blacklight_config.index.thumbnail_field,
         Spotlight::Engine.config.full_image_field
-      ]
+      ].compact
     end
 
     def should_generate_new_friendly_id?

data/app/views/spotlight/exhibits/_exhibit_card.html.erb

@@ -1,33 +1,10 @@
 <div class="col-xs-12 col-sm-4 exhibit-card">
   <div class="flipper">
     <div class="card-front card-face">
-      <%= image_tag(exhibit.thumbnail.image.square.url) if exhibit.thumbnail.present? %>
-      <% unless exhibit.published? %>
-        <div class="label label-warning unpublished"><%= t('.unpublished') %></div>
-      <% end %>
-      <h2 class="card-title"><%= exhibit.title %></h2>
+      <%= render 'exhibit_card_front', exhibit: exhibit %>
     </div>
     <div class="card-back card-face">
-      <h2 class="card-title">
-        <%= exhibit.title %>
-      </h2>
-      <p class="subtitle">
-        <%= exhibit.subtitle %>
-      </p>
-      <% if exhibit.description %>
-      <p class="description">
-        <%= exhibit.description.truncate(168, omission: "") %>
-        <% if exhibit.description.length > 168 %>
-          <%= content_tag(:span,"&hellip;".html_safe, class: "visible-sm visible-md") %>
-          <span class="hidden-sm hidden-md">
-            <%= exhibit.description.slice(168, exhibit.description.length) %>
-          </span>
-        <% end %>
-      </p>
-      <% end %>
-      <div class="visit-exhibit center-btn">
-        <%= link_to t(:'.visit_exhibit'), exhibit, class: "btn btn-primary", role: "button" %>
-      </div>
+      <%= render 'exhibit_card_back', exhibit: exhibit %>
     </div>
   </div>
 </div>

data/app/views/spotlight/exhibits/_exhibit_card_back.html.erb

@@ -0,0 +1,23 @@
+<h2 class="card-title">
+  <%= exhibit.title %>
+</h2>
+
+<p class="subtitle">
+  <%= exhibit.subtitle %>
+</p>
+
+<% if exhibit.description %>
+  <p class="description">
+    <%= exhibit.description.truncate(168, omission: "") %>
+    <% if exhibit.description.length > 168 %>
+      <%= content_tag(:span,"&hellip;".html_safe, class: "visible-sm visible-md") %>
+      <span class="hidden-sm hidden-md">
+        <%= exhibit.description.slice(168, exhibit.description.length) %>
+      </span>
+    <% end %>
+  </p>
+<% end %>
+
+<div class="visit-exhibit center-btn">
+  <%= link_to t(:'.visit_exhibit'), exhibit, class: "btn btn-primary", role: "button" %>
+</div>

data/app/views/spotlight/exhibits/_exhibit_card_front.html.erb

@@ -0,0 +1,11 @@
+<% if exhibit.thumbnail.present? %>
+  <%= image_tag(exhibit.thumbnail.image.square.url) %>
+<% else %>
+  <%= image_tag 'spotlight/default_thumbnail.jpg', class: 'default-thumbnail' %>
+<% end %>
+
+<% unless exhibit.published? %>
+  <div class="label label-warning unpublished"><%= t('.unpublished') %></div>
+<% end %>
+
+<h2 class="card-title"><%= exhibit.title %></h2>

data/app/views/spotlight/exhibits/_exhibits.html.erb

@@ -0,0 +1,5 @@
+<% exhibits.each_slice(3).each do |row| %>
+  <div class="row"><!-- start main content row -->
+    <%= render collection: row, partial: 'exhibit_card', as: 'exhibit' %>
+  </div>
+<% end %>

data/app/views/spotlight/exhibits/_form.html.erb

@@ -3,6 +3,7 @@
   <%= f.text_field :title %>
   <%= f.text_field :subtitle %>
   <%= f.text_area :description %>
+  <%= f.text_field :tag_list, value: f.object.tag_list.to_s %>
   <%= f.form_group(:contact_emails, label: { text: nil, class: nil }, help: nil) do %>
   <%= f.fields_for :contact_emails do |contact| %>
   <%= render partial: 'contact', locals: {contact: contact} %>
@@ -21,4 +22,4 @@
     </div>
   </div>
 </div>
-<% end %>
+<% end %>

data/app/views/spotlight/exhibits/_new_exhibit_form.html.erb

@@ -2,6 +2,7 @@
 <div class="row col-md-12">
   <%= f.text_field :title, label: t(:'.fields.title.label'), help: t(:'.fields.title.help_block') %>
   <%= f.text_field :slug, label: t(:'.fields.slug.label'), help: t(:'.fields.slug.help_block') %>
+  <%= f.text_field :tag_list %>
 
   <%= render 'initial_resources_form', locals: { f: f } %>
 
@@ -11,4 +12,4 @@
     </div>
   </div>
 </div>
-<% end %>
+<% end %>

data/app/views/spotlight/exhibits/edit.html.erb

@@ -6,6 +6,11 @@
       <li role="presentation" class="active">
         <a href="#basic" aria-controls="basic" role="tab" data-toggle="tab"><%= t(:'.basic_settings.heading') %></a>
       </li>
+      <% if can? :edit, current_exhibit.filters.first_or_initialize %>
+        <li role="presentation">
+          <a href="#filter" aria-controls="filter" role="tab" data-toggle="tab"><%= t(:'spotlight.exhibits.filter.heading') %></a>
+        </li>
+      <% end %>
       <% if can? :import, current_exhibit %>
         <li role="presentation">
           <a href="#import" aria-controls="import" role="tab" data-toggle="tab"><%= t(:'spotlight.exhibits.import.heading') %></a>
@@ -26,6 +31,7 @@
       <div role="tabpanel" class="tab-pane active" id="basic">
         <%= render 'form' %>
       </div>
+      <%= render 'spotlight/filters/form' if can? :edit, current_exhibit.filters.first_or_initialize %>
       <%= render 'import' if can? :import, current_exhibit %>
       <%= render 'export' if can? :export, current_exhibit %>
       <%= render 'delete' if can? :destroy, current_exhibit %>

data/app/views/spotlight/exhibits/index.html.erb

@@ -2,7 +2,7 @@
   <% if (current_user && current_user.exhibits.any?) || can?(:manage, Spotlight::Exhibit) %>
     <ul class="nav nav-tabs" role="tablist">
       <li role="presentation" class="active"><a href="#published" aria-controls="published" role="tab" data-toggle="tab"><%= t('.published') %></a></li>
-      <% if can?(:manage, Spotlight::Exhibit) %>
+      <% if can?(:manage, Spotlight::Exhibit) && @exhibits.unpublished.accessible_by(current_ability).any? %>
         <li role="presentation"><a href="#unpublished" aria-controls="unpublished" role="tab" data-toggle="tab"><%= t('.unpublished') %></a></li>
       <% end %>
       <% if current_user && current_user.exhibits.any? %>
@@ -18,31 +18,19 @@
       <% end %>
 
       <%= cache cache_key_for_spotlight_exhibits do %>
-        <% @exhibits.published.each_slice(3).each do |row| %>
-        <div class="row"><!-- start main content row -->
-          <%= render collection: row, partial: 'exhibit_card', as: 'exhibit' %>
-        </div>
-        <% end %>
+        <%= render 'exhibits', exhibits: @exhibits.published %>
       <% end %>
     </div>
 
     <% if @exhibits.unpublished.accessible_by(current_ability).any? %>
       <div role="tabpanel" class="tab-pane" id="unpublished">
-        <% @exhibits.unpublished.accessible_by(current_ability).each_slice(3).each do |row| %>
-          <div class="row"><!-- start main content row -->
-            <%= render collection: row, partial: 'exhibit_card', as: 'exhibit' %>
-          </div>
-        <% end %>
+        <%= render 'exhibits', exhibits: @exhibits.unpublished.accessible_by(current_ability) %>
       </div>
     <% end %>
 
     <% if current_user && current_user.exhibits.any? %>
       <div role="tabpanel" class="tab-pane" id="user">
-        <% current_user.exhibits.each_slice(3).each do |row| %>
-          <div class="row"><!-- start main content row -->
-            <%= render collection: row, partial: 'exhibit_card', as: 'exhibit' %>
-          </div>
-        <% end %>
+        <%= render 'exhibits', exhibits: current_user.exhibits %>
       </div>
     <% end %>
   </div>

data/app/views/spotlight/filters/_form.html.erb

@@ -0,0 +1,13 @@
+<div role="tabpanel" class="tab-pane" id="filter">
+  <%= bootstrap_form_for [@exhibit, @exhibit.filters.first_or_initialize], layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10', html: {class: "row"} do |f| %>
+    <%= f.text_field :field %>
+    <%= f.text_field :value %>
+
+    <div class="form-actions">
+      <div class="primary-actions">
+        <%= f.submit nil, class: 'btn btn-primary' %>
+      </div>
+    </div>
+  <% end %>
+</div>
+

data/config/locales/spotlight.en.yml

@@ -54,6 +54,7 @@ en:
         batch_error: "There was an error updating the requested pages."
         destroyed: "The %{model} was deleted."
       exhibit: *spotlight_default
+      filter: *spotlight_default
       search: *spotlight_default
       site: *spotlight_default
       contact_form:
@@ -77,6 +78,11 @@ en:
     label:
       solr_document:
         exhibit_tag_list: "Tags"
+      spotlight/exhibit:
+        tag_list: 'Tags'
+      spotlight/filter:
+        field: 'Field'
+        value: 'Value'
   activerecord:
     models:
       spotlight:
@@ -91,6 +97,9 @@ en:
         display_title: "Show title"
       "spotlight/masthead":
         display: "Show background image in masthead"
+    help:
+      spotlight/exhibit:
+        tag_list: "Enter tags separated by commas."
   blacklight:
     search:
       fields:
@@ -353,6 +362,8 @@ en:
         visit_exhibit: "Visit exhibit"
       new:
         header: Create a new exhibit
+      filter:
+        heading: Filter items
       import:
         heading: Import data
         instructions: You can import an exhibit JSON file exported from this application to use that data file to define this exhibit.

data/config/routes.rb

@@ -23,6 +23,8 @@ Spotlight::Engine.routes.draw do
     resource :search_configuration, only: [:show, :edit, :update]
     resource :view_configuration, only: [:show]
 
+    resources :filters, only: [:create, :update]
+
     blacklight_for :catalog, only: [:export]
 
     resources :catalog do

data/db/migrate/20151217211019_create_spotlight_exhibit_filters.rb

@@ -0,0 +1,17 @@
+class CreateSpotlightExhibitFilters < ActiveRecord::Migration
+  def change
+    create_table :spotlight_filters do |t|
+      t.string :field
+      t.string :value
+      t.references :exhibit, index: true, foreign_key: true
+
+      t.timestamps null: false
+    end
+
+    reversible do |change|
+      change.up do
+        Spotlight::Exhibit.all.each { |exhibit| exhibit.send(:initialize_filter) }
+      end
+    end
+  end
+end

data/lib/spotlight/engine.rb

@@ -47,6 +47,10 @@ module Spotlight
       FactoryGirl.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryGirl)
     end
 
+    initializer 'spotlight.assets.precompile' do |app|
+      app.config.assets.precompile += %w(spotlight/default_thumbnail.jpg)
+    end
+
     def self.user_class
       Spotlight::Engine.config.user_class.constantize
     end
@@ -75,6 +79,10 @@ module Spotlight
 
     # Filter resources by exhibit by default
     config.filter_resources_by_exhibit = true
+
+    # Should Spotlight write to solr? If set to false, Spotlight will not initiate indexing.
+    config.writable_index = true
+
     # The allowed file extensions for uploading non-repository items.
     config.allowed_upload_extensions = %w(jpg jpeg png)
 
@@ -85,14 +93,10 @@ module Spotlight
     config.solr_fields.string_suffix = '_ssim'.freeze
     config.solr_fields.text_suffix = '_tesim'.freeze
 
-    # A lambda expression that filters the solr index per exhibit
-    config.exhibit_filter = lambda do |exhibit|
-      { :"#{config.solr_fields.prefix}spotlight_exhibit_slug_#{exhibit.slug}#{config.solr_fields.boolean_suffix}" => true }
-    end
-
     config.resource_global_id_field = :"#{config.solr_fields.prefix}spotlight_resource_id#{config.solr_fields.string_suffix}"
 
     # The solr field that original (largest) images will be stored.
+    # Set to nil if you don't want to pull thumbnails from the index
     config.full_image_field = :full_image_url_ssm
     config.thumbnail_field = :thumbnail_url_ssm
     config.square_image_field = :thumbnail_square_url_ssm

data/lib/spotlight/version.rb

@@ -1,4 +1,4 @@
 #
 module Spotlight
-  VERSION = '0.14.2'
+  VERSION = '0.15.0'
 end

data/lib/tasks/spotlight_tasks.rake

@@ -4,14 +4,14 @@ namespace :spotlight do
     puts 'Creating an initial admin user.'
     u = prompt_to_create_user
 
-    Spotlight::Role.create(user: u, exhibit: nil, role: 'admin')
+    Spotlight::Role.create(user: u, resource: nil, role: 'admin')
     puts 'User created.'
   end
 
   desc 'Add application-wide admin privileges to a user'
   task admin: :environment do
     u = prompt_to_create_user
-    Spotlight::Role.create(user: u, exhibit: nil, role: 'admin')
+    Spotlight::Role.create(user: u, resource: nil, role: 'admin')
   end
 
   desc 'Create a new exhibit'
@@ -25,7 +25,7 @@ namespace :spotlight do
 
     u = prompt_to_create_user
 
-    Spotlight::Role.create(user: u, exhibit: exhibit, role: 'admin')
+    Spotlight::Role.create(user: u, resource: exhibit, role: 'admin')
     puts 'Exhibit created.'
   end
 

data/spec/controllers/spotlight/exhibits_controller_spec.rb

@@ -85,7 +85,7 @@ describe Spotlight::ExhibitsController, type: :controller do
 
       it 'is successful' do
         expect do
-          post :create, exhibit: { title: 'Some Title', slug: 'custom-slug' }
+          post :create, exhibit: { title: 'Some Title', slug: 'custom-slug', tag_list: '2014, R. Buckminster Fuller' }
         end.to change { Spotlight::Exhibit.count }.by(1)
 
         exhibit = Spotlight::Exhibit.last
@@ -93,6 +93,7 @@ describe Spotlight::ExhibitsController, type: :controller do
 
         expect(exhibit.title).to eq 'Some Title'
         expect(exhibit.slug).to eq 'custom-slug'
+        expect(exhibit.tags.map(&:name)).to eq ['2014', 'R. Buckminster Fuller']
 
         expect(user.exhibits).to include exhibit
       end

data/spec/controllers/spotlight/filters_controller_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe Spotlight::FiltersController do
+  routes { Spotlight::Engine.routes }
+
+  describe '#create' do
+    let(:exhibit) { FactoryGirl.create(:exhibit) }
+    let(:exhibit_filter) { exhibit.filters.first }
+
+    before do
+      allow(Spotlight::Engine.config).to receive(:filter_resources_by_exhibit).and_return(false)
+    end
+
+    context 'when not signed in' do
+      it 'is not successful' do
+        post :create, exhibit_id: exhibit, filter: { field: 'foo_ssi', value: 'bar_ssi' }
+        expect(:response).to redirect_to main_app.new_user_session_path
+      end
+    end
+
+    context 'when signed in as a site admin' do
+      before { sign_in user }
+      let(:user) { FactoryGirl.create(:site_admin) }
+
+      it 'is successful' do
+        post :create, exhibit_id: exhibit, filter: { field: 'foo_ssi', value: 'bar' }
+        expect(:response).to redirect_to edit_exhibit_path(exhibit, anchor: 'filter')
+        expect(assigns[:exhibit].solr_data).to eq('foo_ssi' => 'bar')
+      end
+
+      it 'valids filter values' do
+        post :create, exhibit_id: exhibit, filter: { field: 'foo_ssi', value: '' }
+        expect(:response).to redirect_to edit_exhibit_path(exhibit, anchor: 'filter')
+        expect(flash[:alert]).to include "Value can't be blank"
+      end
+    end
+  end
+
+  describe '#update' do
+    let(:exhibit) { FactoryGirl.create(:exhibit) }
+    let(:exhibit_filter) { exhibit.filters.first }
+
+    before do
+      allow(Spotlight::Engine.config).to receive(:filter_resources_by_exhibit).and_return(true)
+    end
+
+    context 'when not signed in' do
+      it 'is not successful' do
+        patch :update, exhibit_id: exhibit, id: exhibit_filter, filter: { field: 'foo_ssi', value: 'bar_ssi' }
+        expect(:response).to redirect_to main_app.new_user_session_path
+      end
+    end
+
+    context 'when signed in as a site admin' do
+      before { sign_in user }
+      let(:user) { FactoryGirl.create(:site_admin) }
+
+      it 'is successful' do
+        patch :update, exhibit_id: exhibit, id: exhibit_filter, filter: { field: 'foo_ssi', value: 'bar' }
+        expect(:response).to redirect_to edit_exhibit_path(exhibit, anchor: 'filter')
+        expect(assigns[:exhibit].solr_data).to eq('foo_ssi' => 'bar')
+      end
+
+      it 'valids filter values' do
+        patch :update, exhibit_id: exhibit, id: exhibit_filter, filter: { field: 'foo_ssi', value: '' }
+        expect(:response).to redirect_to edit_exhibit_path(exhibit, anchor: 'filter')
+        expect(flash[:alert]).to include "Value can't be blank"
+      end
+    end
+  end
+end

data/spec/controllers/spotlight/solr_controller_spec.rb

@@ -21,7 +21,7 @@ describe Spotlight::SolrController, type: :controller do
     let(:solr) { double }
     before { sign_in admin }
     before do
-      expect(controller).to receive(:blacklight_solr).and_return(solr)
+      allow(controller).to receive(:blacklight_solr).and_return(solr)
     end
 
     describe 'POST update' do
@@ -37,6 +37,18 @@ describe Spotlight::SolrController, type: :controller do
         expect(doc).to include 'a' => 1
       end
 
+      context 'when the index is not writable' do
+        before do
+          allow(Spotlight::Engine.config).to receive_messages(writable_index: false)
+        end
+
+        it 'raises an error' do
+          post :update, { a: 1 }.to_json, content_type: :json, exhibit_id: exhibit
+
+          expect(response.code).to eq '409'
+        end
+      end
+
       it 'enriches the request with exhibit solr data' do
         doc = {}
         expect(solr).to receive(:update) do |arr|

data/spec/lib/spotlight/catalog/access_controls_enforcement_spec.rb

@@ -67,9 +67,27 @@ describe Spotlight::Catalog::AccessControlsEnforcement do
         allow(scope).to receive(:can?).and_return(true)
 
         subject.apply_exhibit_resources_filter(solr_request)
+
         expect(solr_request).to include :fq
         expect(solr_request[:fq]).to include "spotlight_exhibit_slug_#{exhibit.slug}_bsi:true"
       end
     end
+
+    context 'with a custom exhibit filter' do
+      let(:filter) { exhibit.filters.first_or_initialize }
+
+      before do
+        filter.update(field: 'author_ssim', value: 'Coyne, Justin')
+      end
+
+      it 'filters resources to just those identified by the exhibit filter' do
+        allow(scope).to receive(:can?).and_return(true)
+
+        subject.apply_exhibit_resources_filter(solr_request)
+
+        expect(solr_request).to include :fq
+        expect(solr_request[:fq]).to include '{!raw f=author_ssim}Coyne, Justin'
+      end
+    end
   end
 end

data/spec/models/spotlight/exhibit_spec.rb

@@ -127,10 +127,36 @@ describe Spotlight::Exhibit, type: :model do
   end
 
   describe '#solr_data' do
-    subject { FactoryGirl.create(:exhibit) }
+    let(:exhibit) { FactoryGirl.create(:exhibit) }
+    subject { exhibit.solr_data }
+
+    context 'when not filtering by exhibit' do
+      before do
+        allow(Spotlight::Engine.config).to receive(:filter_resources_by_exhibit).and_return(false)
+      end
 
-    it 'provides a solr field with the exhibit slug' do
-      expect(subject.solr_data).to include(:"spotlight_exhibit_slug_#{subject.slug}_bsi" => true)
+      it 'is blank' do
+        expect(subject).to be_blank
+      end
+    end
+
+    context 'when no filters have been defined' do
+      before do
+        allow(Spotlight::Engine.config).to receive(:filter_resources_by_exhibit).and_return(true)
+      end
+
+      it 'provides a solr field with the exhibit slug' do
+        expect(subject).to include("spotlight_exhibit_slug_#{exhibit.slug}_bsi" => true)
+      end
+    end
+
+    context 'with a filter' do
+      before do
+        exhibit.filters.create(field: 'orcid_ssim', value: '123')
+      end
+      it 'uses the provided filter' do
+        expect(subject).to include('orcid_ssim' => '123')
+      end
     end
   end
 
@@ -175,10 +201,15 @@ describe Spotlight::Exhibit, type: :model do
   describe '#solr_documents' do
     let(:blacklight_config) { Blacklight::Configuration.new }
     let(:slug) { 'some_slug' }
+    let(:filter) do
+      Spotlight::Filter.new(field: subject.send(:default_filter_field),
+                            value: subject.send(:default_filter_value))
+    end
 
     before do
       allow(subject).to receive(:blacklight_config).and_return(blacklight_config)
       allow(subject).to receive(:slug).and_return(slug)
+      allow(subject).to receive(:filters).and_return([filter])
     end
 
     it 'enumerates the documents in the exhibit' do

data/spec/models/spotlight/filter_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Spotlight::Filter do
+  context 'with a simple string field' do
+    subject { described_class.new(field: 'x', value: 'y') }
+
+    it 'passes the value through' do
+      expect(subject.to_hash).to eq 'x' => 'y'
+    end
+  end
+
+  context 'with a boolean field' do
+    subject { described_class.new(field: 'x_bsi', value: 'true') }
+
+    it 'casts the value to a boolean' do
+      expect(subject.to_hash).to eq 'x_bsi' => true
+    end
+  end
+end

data/spec/models/spotlight/resource_spec.rb

@@ -49,6 +49,17 @@ describe Spotlight::Resource, type: :model do
         subject.reindex
       end
 
+      context 'when the index is not writable' do
+        before do
+          allow(Spotlight::Engine.config).to receive_messages(writable_index: false)
+        end
+
+        it "doesn't write" do
+          expect(subject.send(:blacklight_solr)).not_to receive(:update)
+          subject.reindex
+        end
+      end
+
       context 'with a resource that creates multiple solr documents' do
         let(:solr_response) { [{ id: 1 }, { id: 2 }] }
 

data/spec/models/spotlight/search_spec.rb

@@ -37,6 +37,17 @@ describe Spotlight::Search, type: :model do
         expect(subject.thumbnail).not_to be_nil
         expect(subject.thumbnail.image.path).to end_with 'default.jpg'
       end
+
+      context 'when full_image_field is nil' do
+        before do
+          allow(Spotlight::Engine.config).to receive_messages(full_image_field: nil)
+        end
+        it "doesn't query solr" do
+          expect(subject).not_to receive(:documents)
+          subject.set_default_thumbnail
+          expect(subject.thumbnail).to be_nil
+        end
+      end
     end
   end
 

data/spec/models/spotlight/solr_document/atomic_updates_spec.rb

@@ -15,6 +15,17 @@ describe Spotlight::SolrDocument::AtomicUpdates, type: :model do
       allow(subject).to receive_messages(to_solr: { id: 'doc_id', a: 1, b: 2 })
     end
 
+    context 'when the index is not writable' do
+      before do
+        allow(Spotlight::Engine.config).to receive_messages(writable_index: false)
+      end
+
+      it "doesn't write" do
+        expect(blacklight_solr).not_to receive(:update)
+        subject.reindex
+      end
+    end
+
     it 'sends an atomic update request' do
       expected = {
         params: { commitWithin: 500 },

data/spec/views/spotlight/exhibits/_exhibit_card_front.html.erb_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe 'spotlight/exhibits/_exhibit_card_front.html.erb', type: :view do
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:p) { 'spotlight/exhibits/exhibit_card_front' }
+
+  context 'for an exhibit without a thumbnail' do
+    before do
+      exhibit.update(thumbnail_id: nil)
+    end
+
+    it 'has a placeholder thumbnail' do
+      render p, exhibit: exhibit
+
+      expect(rendered).to have_selector 'img.default-thumbnail'
+    end
+  end
+
+  it 'has a thumbnail' do
+    render p, exhibit: exhibit
+
+    expect(rendered).to have_selector 'img'
+  end
+
+  it 'has a title' do
+    render p, exhibit: exhibit
+
+    expect(rendered).to have_selector '.card-title', text: exhibit.title
+  end
+
+  context 'for an unpublished exhibit' do
+    before do
+      exhibit.update(published: false)
+    end
+
+    it 'has an unpublished banner' do
+      render p, exhibit: exhibit
+
+      expect(rendered).to have_selector '.label.unpublished', text: 'Unpublished'
+    end
+  end
+end

data/spec/views/spotlight/exhibits/edit.html.erb_spec.rb

@@ -9,6 +9,7 @@ module Spotlight
       allow(view).to receive_messages(can?: true)
       allow(view).to receive_messages(import_exhibit_path: '/')
       allow(view).to receive_messages(get_exhibit_path: '/')
+      allow(view).to receive_messages(exhibit_filters_path: '/')
     end
 
     it 'renders the edit page form' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -713,6 +713,7 @@ files:
 - app/assets/images/spotlight/blocks/rule.png
 - app/assets/images/spotlight/blocks/text-on.png
 - app/assets/images/spotlight/blocks/text.png
+- app/assets/images/spotlight/default_thumbnail.jpg
 - app/assets/javascripts/spotlight/add_new_page_button.js
 - app/assets/javascripts/spotlight/appearance.js
 - app/assets/javascripts/spotlight/application.js
@@ -813,6 +814,7 @@ files:
 - app/controllers/spotlight/dashboards_controller.rb
 - app/controllers/spotlight/exhibits_controller.rb
 - app/controllers/spotlight/feature_pages_controller.rb
+- app/controllers/spotlight/filters_controller.rb
 - app/controllers/spotlight/home_pages_controller.rb
 - app/controllers/spotlight/lock_controller.rb
 - app/controllers/spotlight/metadata_configurations_controller.rb
@@ -848,6 +850,7 @@ files:
 - app/models/concerns/spotlight/blacklight_configuration_defaults.rb
 - app/models/concerns/spotlight/default_thumbnailable.rb
 - app/models/concerns/spotlight/exhibit_analytics.rb
+- app/models/concerns/spotlight/exhibit_defaults.rb
 - app/models/concerns/spotlight/exhibit_documents.rb
 - app/models/concerns/spotlight/image_derivatives.rb
 - app/models/concerns/spotlight/resources/open_graph.rb
@@ -884,6 +887,7 @@ files:
 - app/models/spotlight/feature_page.rb
 - app/models/spotlight/featured_image.rb
 - app/models/spotlight/field_metadata.rb
+- app/models/spotlight/filter.rb
 - app/models/spotlight/home_page.rb
 - app/models/spotlight/lock.rb
 - app/models/spotlight/main_navigation.rb
@@ -978,6 +982,9 @@ files:
 - app/views/spotlight/exhibits/_contact.html.erb
 - app/views/spotlight/exhibits/_delete.html.erb
 - app/views/spotlight/exhibits/_exhibit_card.html.erb
+- app/views/spotlight/exhibits/_exhibit_card_back.html.erb
+- app/views/spotlight/exhibits/_exhibit_card_front.html.erb
+- app/views/spotlight/exhibits/_exhibits.html.erb
 - app/views/spotlight/exhibits/_export.html.erb
 - app/views/spotlight/exhibits/_form.html.erb
 - app/views/spotlight/exhibits/_import.html.erb
@@ -993,6 +1000,7 @@ files:
 - app/views/spotlight/feature_pages/_sidebar.html.erb
 - app/views/spotlight/featured_images/_form.html.erb
 - app/views/spotlight/featured_images/_upload_form.html.erb
+- app/views/spotlight/filters/_form.html.erb
 - app/views/spotlight/home_pages/_edit_page_link.html.erb
 - app/views/spotlight/home_pages/_empty.html.erb
 - app/views/spotlight/home_pages/_page_options.html.erb
@@ -1109,6 +1117,7 @@ files:
 - db/migrate/20151211131415_add_site_to_spotlight_exhibits.rb
 - db/migrate/20151215141516_change_roles_to_support_polymorphic_associations.rb
 - db/migrate/20151215192845_add_index_status_to_resources.rb
+- db/migrate/20151217211019_create_spotlight_exhibit_filters.rb
 - lib/blacklight/spotlight.rb
 - lib/generators/spotlight/install_generator.rb
 - lib/generators/spotlight/templates/catalog_controller.rb
@@ -1138,6 +1147,7 @@ files:
 - 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/upload_controller_spec.rb
@@ -1246,6 +1256,7 @@ files:
 - spec/models/spotlight/feature_page_spec.rb
 - spec/models/spotlight/featured_image_spec.rb
 - spec/models/spotlight/field_metadata_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
@@ -1299,6 +1310,7 @@ files:
 - 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
@@ -1378,6 +1390,7 @@ test_files:
 - 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/upload_controller_spec.rb
@@ -1486,6 +1499,7 @@ test_files:
 - spec/models/spotlight/feature_page_spec.rb
 - spec/models/spotlight/featured_image_spec.rb
 - spec/models/spotlight/field_metadata_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
@@ -1539,6 +1553,7 @@ test_files:
 - 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