blacklight-spotlight 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d51b05fb4abe823ca225314173cd629c12a963ec
-  data.tar.gz: 8ee0d3c095e06d42de53f10f2041c929948192be
+  metadata.gz: a7de23e07b1ce71e1f7d3d18807940b6f9e46c14
+  data.tar.gz: d3dc8288bdff435529fb727f6d0353adae56f178
 SHA512:
-  metadata.gz: 9dba2d6f177687cba357fdee4948c3af932983c4c8c2c16b8371ea8ccc6ec42778ac952083255a1d5cc891e465597736a7fa09fb58ead53f620540267892408d
-  data.tar.gz: 28a1090a7a5aaa46f12eed7a9e11f994b7f48ca1ec2fa4bb102d7ba0c18dbc9f056f6da8b3ac0bc585c4d56b257591d8525ac313e50e171775dd72f861abb459
+  metadata.gz: 794b994391e7ea143e90cb42230bbf1e4cb759831ac5e397c198cdde892585c2abdc2ca09b3f8cfcc319cdadebbaf73434aecf3a7e92039f6374a4ea6f8198aa
+  data.tar.gz: aeef5f4b1f8622303a270752e8ce3e92c9c836c1eb9856ce99b2406d860b4e90644fc974d524dcf1493e3e392cb60654128c1d1c87d88bef51dda44d902e7de6

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

@@ -36,12 +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(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;
+    background: linear-gradient(to bottom, #fafafa 0%, #eee 100%);
+    border-radius: 3px;
+    box-sizing: border-box;
 }
 .dd-handle:hover { color: #2ea8e5; background: #fff; }
 
@@ -50,14 +47,10 @@ tr.dd-item {
 .dd-item > button[data-action="collapse"]:before { content: '-'; }
 
 .dd-placeholder,
-.dd-empty { margin: 5px 0; padding: 0; min-height: 30px; border: 1px dashed #b6bcbf; box-sizing: border-box; -moz-box-sizing: border-box; }
-.dd-empty { border: 1px dashed #bbb; min-height: 100px; 
-    background-image: -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), 
-                      -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
-    background-image:    -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), 
-                         -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
-    background-image:         linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), 
-                              linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
+.dd-empty { margin: 5px 0; padding: 0; min-height: 30px; border: 1px dashed #b6bcbf; box-sizing: border-box; }
+.dd-empty { border: 1px dashed #bbb; min-height: 100px;
+    background-image: linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), 
+                      linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
     background-size: 60px 60px;
     background-position: 0 0, 30px 30px;
 }
@@ -65,7 +58,6 @@ tr.dd-item {
 .dd-dragel { position: absolute; pointer-events: none; z-index: 9999; }
 .dd-dragel > .dd-item .dd-handle { margin-top: 0; }
 .dd-dragel .dd-handle {
-    -webkit-box-shadow: 2px 4px 6px 0 rgba(0,0,0,.1);
             box-shadow: 2px 4px 6px 0 rgba(0,0,0,.1);
 }
 
@@ -84,12 +76,9 @@ tr.dd-item {
 
 .dd3-content { display: block; margin: 5px 0; padding: 0 0 0 30px;
     background: #fafafa;
-    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;
+    border-radius: 3px;
+    box-sizing: border-box;
 }
 .dd3-content.page-admin {
   position: relative;
@@ -105,9 +94,7 @@ tr.dd-item {
     white-space: nowrap; overflow: hidden;
     border: 1px solid #aaa;
     background: #ddd;
-    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%);
+    background: linear-gradient(to bottom, #ddd 0%, #bbb 100%);
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
 }

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

@@ -8,6 +8,7 @@ module Spotlight
 
     included do
       helper_method :current_site, :current_exhibit, :current_masthead, :exhibit_masthead?, :resource_masthead?
+      helper_method :redirect_back # helper method backported from Rails 5
     end
 
     def current_site
@@ -85,5 +86,16 @@ module Spotlight
       options = Blacklight::Parameters.sanitize(params.to_unsafe_h.with_indifferent_access).merge(options).except(:exhibit_id, :only_path)
       spotlight.facet_exhibit_catalog_url(current_exhibit, *args, options)
     end
+
+    # Backport from Rails 5
+    def redirect_back(fallback_location:, **args)
+      if defined?(super)
+        super
+      elsif request.headers['Referer']
+        redirect_to request.headers['Referer'], **args
+      else
+        redirect_to fallback_location, **args
+      end
+    end
   end
 end

data/app/controllers/spotlight/browse_controller.rb

@@ -20,11 +20,17 @@ module Spotlight
       blacklight_config.index.document_actions = blacklight_config.browse.document_actions
 
       add_breadcrumb @search.title, exhibit_browse_path(@exhibit, @search)
-      (@response, @document_list) = search_results(@search.query_params.with_indifferent_access.merge(params))
+      (@response, @document_list) = search_results(search_query)
     end
 
     protected
 
+    def search_query
+      base_query = Blacklight::SearchState.new(@search.query_params, blacklight_config)
+      user_query = Blacklight::SearchState.new(params, blacklight_config).to_h
+      base_query.params_for_search(user_query)
+    end
+
     ##
     # Browsing an exhibit should start a new search session
     def start_new_search_session?

data/app/controllers/spotlight/catalog_controller.rb

@@ -92,7 +92,7 @@ module Spotlight
       @document.save
 
       respond_to do |format|
-        format.html { redirect_to :back }
+        format.html { redirect_back(fallback_location: [spotlight, current_exhibit, @document]) }
         format.json { render json: true }
       end
     end
@@ -103,7 +103,7 @@ module Spotlight
       @document.save
 
       respond_to do |format|
-        format.html { redirect_to :back }
+        format.html { redirect_back(fallback_location: [spotlight, current_exhibit, @document]) }
         format.json { render json: true }
       end
     end

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

@@ -10,9 +10,9 @@ module Spotlight
         role = Spotlight::Role.create(resource: exhibit_or_site, user: user, role: invite_params[:role])
         if role.save
           user.deliver_invitation # now deliver it when we have saved the role
-          redirect_to :back, notice: t(:'helpers.submit.invite.invited')
+          redirect_back fallback_location: fallback_location, notice: t(:'helpers.submit.invite.invited')
         else
-          redirect_to :back, alert: t(:'helpers.submit.role.batch_error', count: 1)
+          redirect_back fallback_location: fallback_location, alert: t(:'helpers.submit.role.batch_error', count: 1)
         end
       end
 
@@ -25,6 +25,14 @@ module Spotlight
       def exhibit_or_site
         current_exhibit || @site
       end
+
+      def fallback_location
+        if current_exhibit
+          spotlight.exhibit_roles_path(current_exhibit)
+        else
+          spotlight.admin_users_path
+        end
+      end
     end
   end
 end

data/app/controllers/spotlight/contact_forms_controller.rb

@@ -13,7 +13,7 @@ module Spotlight
       if @contact_form.valid?
         ContactMailer.report_problem(@contact_form).deliver_now
 
-        redirect_to :back, notice: t(:'helpers.submit.contact_form.created')
+        redirect_back fallback_location: spotlight.new_exhibit_contact_form_path(current_exhibit), notice: t(:'helpers.submit.contact_form.created')
       else
         render 'new'
       end

data/app/controllers/spotlight/lock_controller.rb

@@ -8,7 +8,7 @@ module Spotlight
     def destroy
       @lock.destroy
 
-      render text: '', status: 204
+      render plain: '', status: 204
     end
   end
 end

data/app/controllers/spotlight/pages_controller.rb

@@ -82,7 +82,7 @@ module Spotlight
                else
                  t(:'helpers.submit.page.batch_error', model: human_name)
                end
-      redirect_to :back, notice: notice
+      redirect_back fallback_location: spotlight.exhibit_dashboard_path(@exhibit), notice: notice
     end
 
     protected

data/app/controllers/spotlight/resources/csv_upload_controller.rb

@@ -17,11 +17,11 @@ module Spotlight
         csv = CSV.parse(file.read, headers: true, return_headers: false, encoding: 'utf-8').map(&:to_hash)
         Spotlight::AddUploadsFromCSV.perform_later(csv, current_exhibit, current_user)
         flash[:notice] = t('spotlight.resources.upload.csv.success', file_name: file.original_filename)
-        redirect_to :back
+        redirect_back(fallback_location: spotlight.exhibit_resources_path(current_exhibit))
       end
 
       def template
-        render text: CSV.generate { |csv| csv << data_param_keys.unshift(:url) }, content_type: 'text/csv'
+        render plain: CSV.generate { |csv| csv << data_param_keys.unshift(:url) }, content_type: 'text/csv'
       end
 
       private

data/app/controllers/spotlight/roles_controller.rb

@@ -25,7 +25,7 @@ module Spotlight
         notice = any_deleted ? t(:'helpers.submit.role.destroyed') : t(:'helpers.submit.role.updated')
         redirect_to exhibit_roles_path(@exhibit), notice: notice
       else
-        flash[:alert] = t(:'helpers.submit.role.batch_error', count: exhibit_params[:roles_attributes].size)
+        flash[:alert] = t(:'helpers.submit.role.batch_error', count: exhibit_params[:roles_attributes].to_unsafe_h.size)
         render action: 'index'
       end
     end

data/app/controllers/spotlight/searches_controller.rb

@@ -16,9 +16,10 @@ module Spotlight
       @search.query_params = query_params
 
       if @search.save
-        redirect_to :back, notice: t(:'helpers.submit.search.created', model: @search.class.model_name.human.downcase)
+        redirect_back fallback_location: fallback_url,
+                      notice: t(:'helpers.submit.search.created', model: @search.class.model_name.human.downcase)
       else
-        redirect_to :back, alert: @search.errors.full_messages.join('<br>'.html_safe)
+        redirect_back fallback_location: fallback_url, alert: @search.errors.full_messages.join('<br>'.html_safe)
       end
     end
 
@@ -64,7 +65,7 @@ module Spotlight
                else
                  t(:'helpers.submit.search.batch_error', model: Spotlight::Search.model_name.human.pluralize.downcase)
                end
-      redirect_to :back, notice: notice
+      redirect_back fallback_location: fallback_url, notice: notice
     end
 
     def show
@@ -118,5 +119,9 @@ module Spotlight
     def blacklisted_search_session_params
       [:commit, :counter, :total, :search_id, :page, :per_page, :authenticity_token, :utf8, :action, :controller]
     end
+
+    def fallback_url
+      spotlight.exhibit_searches_path(current_exhibit)
+    end
   end
 end

data/app/controllers/spotlight/solr_controller.rb

@@ -6,31 +6,50 @@ module Spotlight
   # This is an example of how you could integrate external indexing
   # workflows with exhibit-specific content
   class SolrController < Spotlight::ApplicationController
+    include Blacklight::SearchHelper
+
     before_action :authenticate_user!
     before_action :validate_writable_index!
 
     load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
+    delegate :blacklight_config, to: :current_exhibit
 
     def update
       authorize! :update_solr, @exhibit
 
-      req = ActiveSupport::JSON.decode(request.body.read)
+      data = solr_documents
 
-      docs = Array.wrap(req).map do |r|
-        blacklight_config.document_model.new(r).to_solr.merge(@exhibit.solr_data).merge(r)
+      repository.connection.update params: { commitWithin: 500 }, data: data.to_json, headers: { 'Content-Type' => 'application/json' } unless data.empty?
+
+      if respond_to? :head
+        head :ok
+      else
+        render nothing: true
       end
+    end
+
+    private
 
-      blacklight_solr.update docs
+    def solr_documents
+      req = ActiveSupport::JSON.decode(json_content)
 
-      render nothing: true
+      Array.wrap(req).map do |r|
+        blacklight_config.document_model.new(r).to_solr.merge(@exhibit.solr_data).merge(r)
+      end
     end
 
-    private
+    def json_content
+      if params[:resources_json_upload]
+        params[:resources_json_upload][:json].read
+      else
+        request.body.read
+      end
+    end
 
     def validate_writable_index!
       return if Spotlight::Engine.config.writable_index
 
-      render text: 'Spotlight is unable to write to solr', status: 409
+      render plain: 'Spotlight is unable to write to solr', status: 409
     end
   end
 end

data/app/controllers/spotlight/versions_controller.rb

@@ -15,7 +15,7 @@ module Spotlight
           redirect_to [obj.exhibit, obj], flash: { html_safe: true }, notice: view_context.t(:'spotlight.versions.undo_error')
         end
       else
-        redirect_to :back, flash: { html_safe: true }, notice: view_context.t(:'spotlight.versions.undo_error')
+        redirect_back fallback_location: main_app.root_url, flash: { html_safe: true }, notice: view_context.t(:'spotlight.versions.undo_error')
       end
     end
 

data/app/helpers/spotlight/application_helper.rb

@@ -140,10 +140,6 @@ module Spotlight
       config.label || blacklight_config.index_fields[solr_field].try(:label) || t(".#{solr_field}")
     end
 
-    def view_label(view)
-      t(:"blacklight.search.view.#{view}", default: blacklight_config.view[view].title || view.to_s)
-    end
-
     def available_view_fields
       current_exhibit.blacklight_configuration.default_blacklight_config.view.to_h.reject { |_k, v| v.if == false }
     end

data/app/helpers/spotlight/pages_helper.rb

@@ -22,7 +22,7 @@ module Spotlight
 
     def get_search_widget_search_results(block)
       if block.searches?
-        search_results(block.query_params.with_indifferent_access.merge(params))
+        search_results(search_widget_search_query(block))
       else
         []
       end
@@ -50,5 +50,13 @@ module Spotlight
     def render_contact_email_address(address)
       mail_to address, address
     end
+
+    private
+
+    def search_widget_search_query(block)
+      base_query = Blacklight::SearchState.new(block.query_params, blacklight_config)
+      user_query = Blacklight::SearchState.new(params, blacklight_config).to_h
+      base_query.params_for_search(user_query)
+    end
   end
 end

data/app/models/concerns/spotlight/resources/open_graph.rb

@@ -20,9 +20,19 @@ module Spotlight
 
       def opengraph_properties
         Hash[opengraph.map do |k, v|
-          ["#{k.parameterize('_')}_tesim", v]
+          ["#{opengraph_solr_field_name(k)}_tesim", v]
         end]
       end
+
+      private
+
+      def opengraph_solr_field_name(field)
+        if Rails::VERSION::MAJOR >= 5
+          field.parameterize(separator: '_')
+        else
+          field.parameterize('_')
+        end
+      end
     end
   end
 end

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

@@ -7,7 +7,7 @@ module Spotlight
       has_many :roles, class_name: 'Spotlight::Role', dependent: :destroy
       has_many :exhibits, class_name: 'Spotlight::Exhibit', through: :roles, source: 'resource', source_type: 'Spotlight::Exhibit'
 
-      scope :with_roles, -> { where(id: Spotlight::Role.uniq.pluck(:user_id)) }
+      scope :with_roles, -> { where(id: Spotlight::Role.distinct.pluck(:user_id)) }
 
       before_create :add_default_roles
     end

data/app/models/spotlight/resources/json_upload.rb

@@ -0,0 +1,8 @@
+module Spotlight
+  module Resources
+    # Raw solr document uploads
+    class JsonUpload < Spotlight::Resource
+      store :data, accessors: :json
+    end
+  end
+end

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

@@ -1,4 +1,8 @@
-<% form_prefix = f.object_name.parameterize("_") %>
+<% if Rails::VERSION::MAJOR >= 5 %>
+  <% form_prefix = f.object_name.parameterize(separator: '_') %>
+<% else %>
+  <% form_prefix = f.object_name.parameterize('_') %>
+<% end %>  
 <%= field_set_tag do %>
   <%= f.check_box(:display) %>
 <% end if f.object.is_a? Spotlight::Masthead %>

data/app/views/spotlight/featured_images/_upload_form.html.erb

@@ -1,4 +1,8 @@
-<% form_prefix = f.object_name.parameterize("_") %>
+<% if Rails::VERSION::MAJOR >= 5 %>
+  <% form_prefix = f.object_name.parameterize(separator: '_') %>
+<% else %>
+  <% form_prefix = f.object_name.parameterize('_') %>
+<% end %>
 <%= field_set_tag do %>
   <%= f.check_box(:display) %>
 <% end if f.object.is_a? Spotlight::Masthead %>

data/app/views/spotlight/resources/json_upload/_form.html.erb

@@ -0,0 +1,15 @@
+<% if can? :update_solr, current_exhibit %>
+  <%= bootstrap_form_for([current_exhibit, @resource.becomes(Spotlight::Resources::JsonUpload)], url: spotlight.exhibit_solr_update_path(current_exhibit), layout: :horizontal, label_col: 'col-md-2', control_col: 'col-sm-6 col-md-6', html: { class: 'item-upload-form', multipart: true } ) do |f| %>
+    <%= f.url_field :json, type: "file", label: t('.file_label') %>
+    <div class="form-actions">
+      <div class="primary-actions">
+        <%= cancel_link @resource, :back, class: 'btn btn-default' %>
+        <%= f.submit t('.add_item'), class: 'btn btn-primary' %>
+      </div>
+    </div>
+  <% end %>
+<% else %>
+  <div class="alert alert-info">
+    Uploading raw documents is restricted to site administrators.
+  </div>
+<% end %>