blacklight-spotlight 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04eb98fbaa9f7a11fbebb777f034d1537773bd2f
-  data.tar.gz: 8ced6a8356a1cb65c3ce5bbbf941108444b0fb7f
+  metadata.gz: 1e1e38c99f14e8cbfe3482e6d4adb02adc7dd6cd
+  data.tar.gz: e7c12eb9e49ecf927dd98f9331d363d796bc4825
 SHA512:
-  metadata.gz: d9b5ea84c1d186ec0aab2fd47b59099c832caffd05ae6e151ab2088c71012ec76fec695cfaac258927ffb9cfaee9c2af388b11a3da06d704b8c251a984113294
-  data.tar.gz: 02290a5d60fc130bb1bbf96f335cd66e503a323436c48e207a631f468009d9ed5728911bfed807e5a818f8754eccaf16d4feffd2a47b796bf535036c37cbd3e6
+  metadata.gz: 3bea84a5474d94a0fe33b0d041675c2dd1647dfb4ab2968638bb70563eaad164a2e46dd1655893a99e30bbee06a59cd2eca5ceec758aca930b1dcf765906663d
+  data.tar.gz: f94dbfd2a1507db4e4938144c1c65a1f13995aea9113792eabe15589affd017433dfbbca4b5b1424c5988daf34f4bf7f7dcf9308a65071344ec0c5f261976c3c

data/app/assets/stylesheets/spotlight/_exhibits_index.scss

@@ -41,6 +41,7 @@
   @extend .text-center;
 
   font-size: $font-size-h4;
+  line-height: 1.2;
 }
 
 .card-front {
@@ -54,8 +55,23 @@
   }
 
   .card-title {
+    padding-left: $padding-small-horizontal;
+    padding-right: $padding-small-horizontal;
     padding-top: $padding-large-vertical;
   }
+
+  .unpublished {
+    @extend .center-block;
+
+    font-size: $font-size-base;
+    margin-top: -1em;
+    position: relative;
+    width: 15ch;
+
+    + .card-title {
+      padding-top: 0;
+    }
+  }
 }
 
 .card-back {

data/app/assets/stylesheets/spotlight/_nestable.scss

@@ -36,9 +36,9 @@ tr.dd-item {
 
 .dd-handle { display: block; height: 100%; margin: 5px 0; padding: 5px 10px; color: #333; text-decoration: none; font-weight: bold; border: 1px solid #ccc;
     background: #fafafa;
-    background: -webkit-linear-gradient(top, #fafafa 0%, #eee 100%);
-    background:    -moz-linear-gradient(top, #fafafa 0%, #eee 100%);
-    background:         linear-gradient(top, #fafafa 0%, #eee 100%);
+    background: -webkit-linear-gradient(to bottom, #fafafa 0%, #eee 100%);
+    background:    -moz-linear-gradient(to bottom, #fafafa 0%, #eee 100%);
+    background:         linear-gradient(to bottom, #fafafa 0%, #eee 100%);
     -webkit-border-radius: 3px;
             border-radius: 3px;
     box-sizing: border-box; -moz-box-sizing: border-box;
@@ -84,9 +84,9 @@ tr.dd-item {
 
 .dd3-content { display: block; margin: 5px 0; padding: 0 0 0 30px;
     background: #fafafa;
-    background: -webkit-linear-gradient(top, #fafafa 0%, #eee 100%);
-    background:    -moz-linear-gradient(top, #fafafa 0%, #eee 100%);
-    background:         linear-gradient(top, #fafafa 0%, #eee 100%);
+    background: -webkit-linear-gradient(to bottom, #fafafa 0%, #eee 100%);
+    background:    -moz-linear-gradient(to bottom, #fafafa 0%, #eee 100%);
+    background:         linear-gradient(to bottom, #fafafa 0%, #eee 100%);
     -webkit-border-radius: 3px;
             border-radius: 3px;
     box-sizing: border-box; -moz-box-sizing: border-box;
@@ -99,15 +99,15 @@ tr.dd-item {
 
 .dd3-item > button { margin-left: 30px; }
 
-.dd3-handle { 
+.dd3-handle {
     position: absolute; margin: 0; left: 0; top: 0; cursor: pointer; width: 30px;
     text-indent: 100px;
     white-space: nowrap; overflow: hidden;
     border: 1px solid #aaa;
     background: #ddd;
-    background: -webkit-linear-gradient(top, #ddd 0%, #bbb 100%);
-    background:    -moz-linear-gradient(top, #ddd 0%, #bbb 100%);
-    background:         linear-gradient(top, #ddd 0%, #bbb 100%);
+    background: -webkit-linear-gradient(to bottom, #ddd 0%, #bbb 100%);
+    background:    -moz-linear-gradient(to bottom, #ddd 0%, #bbb 100%);
+    background:         linear-gradient(to bottom, #ddd 0%, #bbb 100%);
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
 }

data/app/controllers/spotlight/catalog_controller.rb

@@ -136,9 +136,9 @@ module Spotlight
     # Override Blacklight's #setup_next_and_previous_documents to handle
     # browse categories too
     def setup_next_and_previous_documents
-      if current_browse_category
-        setup_next_and_previous_documents_from_browse_category
-      elsif current_page_context
+      if current_search_session_from_browse_category?
+        setup_next_and_previous_documents_from_browse_category if current_browse_category
+      elsif current_search_session_from_page? || current_search_session_from_home_page?
         # TODO: figure out how to construct previous/next documents
       else
         super
@@ -147,10 +147,13 @@ module Spotlight
 
     def setup_next_and_previous_documents_from_browse_category
       index = search_session['counter'].to_i - 1
-      response, documents = get_previous_and_next_documents_for_search index, current_browse_category.query_params.with_indifferent_access
+      response, _docs = get_previous_and_next_documents_for_search index, current_browse_category.query_params.with_indifferent_access
+
+      return unless response
+
       search_session['total'] = response.total
-      @previous_document = documents.first
-      @next_document = documents.last
+      @previous_document = response.documents.first
+      @next_document = response.documents.last
     end
 
     def _prefixes
@@ -206,7 +209,7 @@ module Spotlight
       elsif current_page_context && current_page_context.title.present? && !current_page_context.is_a?(Spotlight::HomePage)
         add_breadcrumb current_page_context.title, [current_page_context.exhibit, current_page_context]
       elsif current_search_session
-        add_breadcrumb t(:'spotlight.catalog.breadcrumb.index'), search_action_url(current_search_session[:query_params])
+        add_breadcrumb t(:'spotlight.catalog.breadcrumb.index'), search_action_url(current_search_session.query_params)
       end
 
       add_breadcrumb Array(document[blacklight_config.view_config(:show).title_field]).join(', '), exhibit_catalog_path(current_exhibit, document)

data/app/controllers/spotlight/concerns/catalog_search_context.rb

@@ -9,9 +9,11 @@ module Spotlight
         @current_page_context ||= if current_search_session_from_home_page?
                                     current_exhibit.home_page if can? :read, current_exhibit.home_page
                                   elsif current_search_session_from_page?
-                                    page_id = current_search_session.query_params['id']
-                                    current_exhibit.pages.accessible_by(current_ability).find(page_id) if page_id
+                                    current_search_session_page_context
                                   end
+      rescue ActiveRecord::RecordNotFound => e
+        Rails.logger.debug "Unable to get current page context from #{current_search_session.inspect}: #{e}"
+        nil
       end
 
       def current_browse_category
@@ -19,6 +21,9 @@ module Spotlight
                                        search_id = current_search_session.query_params['id']
                                        current_exhibit.searches.accessible_by(current_ability).find(search_id)
                                      end
+      rescue ActiveRecord::RecordNotFound => e
+        Rails.logger.debug "Unable to get current page context from #{current_search_session.inspect}: #{e}"
+        nil
       end
 
       def current_search_session_from_browse_category?
@@ -39,6 +44,14 @@ module Spotlight
           current_search_session.query_params['action'] == 'show' &&
           current_search_session.query_params['controller'] == 'spotlight/home_pages'
       end
+
+      def current_search_session_page_context
+        page_id = current_search_session.query_params['id']
+
+        return unless page_id
+
+        current_exhibit.pages.accessible_by(current_ability).find(page_id)
+      end
     end
   end
 end

data/app/controllers/spotlight/exhibits_controller.rb

@@ -32,6 +32,7 @@ module Spotlight
       @exhibit.attributes = exhibit_params
 
       if @exhibit.save
+        @exhibit.roles.create user: current_user, role: 'admin' if current_user
         redirect_to spotlight.exhibit_dashboard_path(@exhibit), notice: t(:'helpers.submit.exhibit.created', model: @exhibit.class.model_name.human.downcase)
       else
         render action: :new

data/app/helpers/spotlight/application_helper.rb

@@ -60,7 +60,7 @@ module Spotlight
     # Helper to turn tag data into facets
     def url_to_tag_facet(tag)
       if current_exhibit
-        search_action_url(add_facet_params(Spotlight::SolrDocument.solr_field_for_tagger(current_exhibit), tag, {}))
+        search_action_url(add_facet_params(blacklight_config.document_model.solr_field_for_tagger(current_exhibit), tag, {}))
       else
         search_action_url(q: tag)
       end

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

@@ -34,6 +34,22 @@ module Spotlight
       def reindex_all
         find_each(&:reindex)
       end
+
+      def solr_field_for_tagger(tagger)
+        :"#{solr_field_prefix(tagger)}tags#{Spotlight::Engine.config.solr_fields.string_suffix}"
+      end
+
+      def visibility_field(exhibit)
+        :"#{solr_field_prefix(exhibit)}public#{Spotlight::Engine.config.solr_fields.boolean_suffix}"
+      end
+
+      def resource_type_field
+        :"#{Spotlight::Engine.config.solr_fields.prefix}spotlight_resource_type#{Spotlight::Engine.config.solr_fields.string_suffix}"
+      end
+
+      def solr_field_prefix(exhibit)
+        "#{Spotlight::Engine.config.solr_fields.prefix}#{exhibit.class.model_name.param_key}_#{exhibit.to_param}_"
+      end
     end
 
     def update(current_exhibit, new_attributes)
@@ -68,22 +84,6 @@ module Spotlight
       { self.class.unique_key.to_sym => id }.reverse_merge(sidecars.inject({}) { |a, e| a.merge(e.to_solr) }).merge(tags_to_solr)
     end
 
-    def self.solr_field_for_tagger(tagger)
-      :"#{solr_field_prefix(tagger)}tags#{Spotlight::Engine.config.solr_fields.string_suffix}"
-    end
-
-    def self.visibility_field(exhibit)
-      :"#{solr_field_prefix(exhibit)}public#{Spotlight::Engine.config.solr_fields.boolean_suffix}"
-    end
-
-    def self.resource_type_field
-      :"#{Spotlight::Engine.config.solr_fields.prefix}spotlight_resource_type#{Spotlight::Engine.config.solr_fields.string_suffix}"
-    end
-
-    def self.solr_field_prefix(exhibit)
-      "#{Spotlight::Engine.config.solr_fields.prefix}#{exhibit.class.model_name.param_key}_#{exhibit.to_param}_"
-    end
-
     def make_public!(exhibit)
       sidecar(exhibit).public!
     end
@@ -101,8 +101,8 @@ module Spotlight
     end
 
     def uploaded_resource?
-      self[Spotlight::SolrDocument.resource_type_field].present? &&
-        self[Spotlight::SolrDocument.resource_type_field].include?('spotlight/resources/uploads')
+      self[self.class.resource_type_field].present? &&
+        self[self.class.resource_type_field].include?('spotlight/resources/uploads')
     end
 
     def attribute_present?(*_args)
@@ -117,11 +117,11 @@ module Spotlight
       # Adding a placeholder entry in case the last tag for an exhibit
       # is removed, so we clear out the solr field too.
       Spotlight::Exhibit.find_each do |exhibit|
-        h[Spotlight::SolrDocument.solr_field_for_tagger(exhibit)] = nil
+        h[self.class.solr_field_for_tagger(exhibit)] = nil
       end
 
       taggings.includes(:tag, :tagger).map do |tagging|
-        key = Spotlight::SolrDocument.solr_field_for_tagger(tagging.tagger)
+        key = self.class.solr_field_for_tagger(tagging.tagger)
         h[key] ||= []
         h[key] << tagging.tag.name
       end

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

@@ -5,6 +5,7 @@ module Spotlight
     extend ActiveSupport::Concern
     included do
       has_many :roles, class_name: 'Spotlight::Role', dependent: :destroy
+      has_many :exhibits, class_name: 'Spotlight::Exhibit', through: :roles
 
       before_create :add_default_roles
     end

data/app/models/spotlight/blacklight_configuration.rb

@@ -19,6 +19,8 @@ module Spotlight
     include Spotlight::BlacklightConfigurationDefaults
     include Spotlight::ImageDerivatives
 
+    delegate :document_model, to: :default_blacklight_config
+
     # get rid of empty values
     before_validation do |model|
       model.index_fields.each do |_k, v|
@@ -190,14 +192,18 @@ module Spotlight
 
     def custom_index_fields
       Hash[exhibit.custom_fields.map do |x|
-        field = Blacklight::Configuration::IndexField.new x.configuration.merge(key: x.field, field: x.solr_field)
+        field = Blacklight::Configuration::IndexField.new x.configuration.merge(
+          key: x.field, field: x.solr_field
+        )
         [x.field, field]
       end]
     end
 
     def custom_facet_fields
       Hash[exhibit.custom_fields.vocab.map do |x|
-        field = Blacklight::Configuration::FacetField.new x.configuration.merge(key: x.field, field: x.solr_field, show: false)
+        field = Blacklight::Configuration::FacetField.new x.configuration.merge(
+          key: x.field, field: x.solr_field, show: false
+        )
         [x.field, field]
       end]
     end
@@ -252,11 +258,11 @@ module Spotlight
     def add_exhibit_tags_fields(config)
       # rubocop:disable Style/GuardClause
       unless config.show_fields.include? :exhibit_tags
-        config.add_show_field :exhibit_tags, field: Spotlight::SolrDocument.solr_field_for_tagger(exhibit), link_to_search: true
+        config.add_show_field :exhibit_tags, field: config.document_model.solr_field_for_tagger(exhibit), link_to_search: true
       end
 
       unless config.facet_fields.include? :exhibit_tags
-        config.add_facet_field :exhibit_tags, field: Spotlight::SolrDocument.solr_field_for_tagger(exhibit)
+        config.add_facet_field :exhibit_tags, field: config.document_model.solr_field_for_tagger(exhibit)
       end
       # rubocop:enable Style/GuardClause
     end

data/app/models/spotlight/custom_field.rb

@@ -81,7 +81,7 @@ module Spotlight
     end
 
     def solr_field_prefix
-      Spotlight::SolrDocument.solr_field_prefix(exhibit)
+      document_model.solr_field_prefix(exhibit)
     end
 
     def field_suffix
@@ -130,5 +130,9 @@ module Spotlight
 
       Spotlight::RenameSidecarFieldJob.perform_later(exhibit, old_field, self.field)
     end
+
+    def document_model
+      blacklight_configuration.document_model
+    end
   end
 end

data/app/models/spotlight/exhibit.rb

@@ -74,7 +74,7 @@ module Spotlight
     end
 
     def solr_data
-      { :"#{Spotlight::Engine.config.solr_fields.prefix}spotlight_exhibit_slug_#{slug}#{Spotlight::Engine.config.solr_fields.boolean_suffix}" => true }
+      Spotlight::Engine.config.exhibit_filter.call(self)
     end
 
     def reindex_later

data/app/models/spotlight/resource.rb

@@ -102,7 +102,7 @@ module Spotlight
       def spotlight_resource_metadata_for_solr
         {
           Spotlight::Engine.config.resource_global_id_field => (to_global_id.to_s if persisted?),
-          Spotlight::SolrDocument.resource_type_field => self.class.to_s.tableize
+          document_model.resource_type_field => self.class.to_s.tableize
         }
       end
 

data/app/models/spotlight/search.rb

@@ -82,7 +82,7 @@ module Spotlight
     end
 
     def repository
-      Blacklight.default_index
+      @repository ||= Blacklight::Solr::Repository.new(blacklight_config)
     end
 
     def default_search_fields

data/app/models/spotlight/solr_document_sidecar.rb

@@ -36,7 +36,7 @@ module Spotlight
     protected
 
     def visibility_field
-      Spotlight::SolrDocument.visibility_field(exhibit)
+      blacklight_config.document_model.visibility_field(exhibit)
     end
 
     def blacklight_config

data/app/views/layouts/spotlight/spotlight.html.erb

@@ -37,7 +37,7 @@
   <%= render partial: 'shared/ajax_modal' %>
 
   <div id="main-container" class="container">
-    <%= render partial: 'shared/flash_messages' %>
+    <%= render partial: '/flash_msg', layout: 'shared/flash_messages' %>
 
     <div class="row">
       <%= content_for?(:content) ? yield(:content) : yield %>

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

@@ -2,6 +2,9 @@
   <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>
     </div>
     <div class="card-back card-face">

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

@@ -1,24 +1,49 @@
 <div class="col-md-9">
-  <% if @exhibits.published.none? %>
-    <%= render 'missing_exhibits' %>
+  <% 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) %>
+        <li role="presentation"><a href="#unpublished" aria-controls="unpublished" role="tab" data-toggle="tab"><%= t('.unpublished') %></a></li>
+      <% end %>
+      <li role="presentation"><a href="#user" aria-controls="user" role="tab" data-toggle="tab"><%= t('.user') %></a></li>
+    </ul>
   <% 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 class="tab-content">
+    <div role="tabpanel" class="tab-pane active" id="published">
+      <% if @exhibits.published.none? %>
+        <%= render 'missing_exhibits' %>
+      <% 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 %>
+      <% end %>
     </div>
-    <% end %>
-  <% end %>
 
-  <% private_exhibits = @exhibits.unpublished.accessible_by(current_ability) %>
+    <% 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 %>
+      </div>
+    <% end %>
 
-  <% if private_exhibits.any? %>
-    <h2><%= t(:'.private') %></h2>
-    <ul>
-      <%= render collection: private_exhibits, partial: 'exhibit_list', as: 'exhibit' %>
-    </ul>
-  <% 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 %>
+      </div>
+    <% end %>
+  </div>
 </div>
 
 <aside class="col-md-3">