blacklight-spotlight 0.2.0 → 0.3.0

data/app/controllers/spotlight/catalog_controller.rb

@@ -1,4 +1,4 @@
-class Spotlight::CatalogController < ::CatalogController
+class Spotlight::CatalogController < Spotlight::Engine.catalog_controller
   include Spotlight::Concerns::ApplicationController
   load_and_authorize_resource :exhibit, class: Spotlight::Exhibit, prepend: true
   include Spotlight::Catalog
@@ -51,7 +51,10 @@ class Spotlight::CatalogController < ::CatalogController
   def admin
     self.blacklight_config.view.select! { |k,v| k == :admin_table }
     self.blacklight_config.view.admin_table.partials = [:index_compact]
-    self.blacklight_config.sort_fields.reject! { |k,v| true }
+
+    unless self.blacklight_config.sort_fields.has_key? :timestamp
+      self.blacklight_config.add_sort_field :timestamp, sort: "#{blacklight_config.index.timestamp_field} desc"
+    end
 
     add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
     add_breadcrumb t(:'spotlight.curation.sidebar.items'), admin_exhibit_catalog_index_path(@exhibit)
@@ -153,9 +156,7 @@ class Spotlight::CatalogController < ::CatalogController
 
   def uploaded_resource_params
     if @document.uploaded_resource?
-      return Spotlight::Resources::Upload.fields(current_exhibit).collect do |_, config|
-        config.solr_field
-      end
+      return Spotlight::Resources::Upload.fields(current_exhibit).collect(&:field_name)
     end
     []
   end
@@ -195,4 +196,12 @@ class Spotlight::CatalogController < ::CatalogController
       end
     end
   end
+
+  # calls setup_previous_document then setup_next_document.
+  # used in the show action for single view pagination.
+  def setup_next_and_previous_documents
+    super
+  rescue RSolr::Error::Http => e
+    Rails.logger.warn "Unable to setup next and previous documents: #{e}"
+  end
 end

data/app/controllers/spotlight/dashboards_controller.rb

@@ -26,7 +26,7 @@ module Spotlight
       solr_params = { sort: "#{blacklight_config.index.timestamp_field} desc" }
       @response = query_solr({}, solr_params)
       @response.docs.take(count).map do |doc|
-        ::SolrDocument.new(doc, @response)
+        blacklight_config.solr_document_model.new(doc, @response)
       end
     end
   end

data/app/controllers/spotlight/exhibits_controller.rb

@@ -14,7 +14,8 @@ class Spotlight::ExhibitsController < Spotlight::ApplicationController
   end
 
   def process_import
-    if @exhibit.import(JSON.parse(import_exhibit_params.read))
+    @exhibit.import(JSON.parse(import_exhibit_params.read))
+    if @exhibit.save
       redirect_to spotlight.exhibit_dashboard_path(@exhibit), notice: t(:'helpers.submit.exhibit.updated', model: @exhibit.class.model_name.human.downcase)
     else
       render action: :import
@@ -33,7 +34,10 @@ class Spotlight::ExhibitsController < Spotlight::ApplicationController
 
   def show
     respond_to do |format|
-      format.json { send_data Spotlight::ExhibitExportSerializer.new(@exhibit).to_json, type: 'application/json', disposition: 'attachment', filename: "#{@exhibit.friendly_id}-export.json" }
+      format.json do
+        authorize! :export, @exhibit
+        send_data JSON.pretty_generate(Spotlight::ExhibitExportSerializer.new(@exhibit).as_json), type: 'application/json', disposition: 'attachment', filename: "#{@exhibit.friendly_id}-export.json"
+      end
     end
   end
 
@@ -71,6 +75,7 @@ class Spotlight::ExhibitsController < Spotlight::ApplicationController
       :subtitle,
       :description,
       :published,
+      :featured_image,
       contact_emails_attributes: [:id, :email]
     )
   end

data/app/controllers/spotlight/home_pages_controller.rb

@@ -18,7 +18,9 @@ module Spotlight
     end
 
     def show
-      (@response, @document_list) = get_search_results
+      if @page.display_sidebar?
+        @response, @document_list = get_search_results
+      end
 
       if @page.nil? or !@page.published?
         render '/catalog/index'
@@ -32,7 +34,7 @@ module Spotlight
     alias_method :search_facet_url, :exhibit_search_facet_url
 
     def allowed_page_params
-      super.concat [:display_title]
+      super.concat [:display_title, :display_sidebar]
     end
   end
 end

data/app/controllers/spotlight/pages_controller.rb

@@ -54,7 +54,7 @@ module Spotlight
       @page.lock.delete if @page.lock
 
       if @page.update(page_params.merge(last_edited_by: current_user))
-        redirect_to [@page.exhibit, @page], notice: t(:'helpers.submit.page.updated', model: @page.class.model_name.human.downcase)
+        redirect_to [@page.exhibit, @page], flash: { html_safe: true }, notice: view_context.safe_join([t(:'helpers.submit.page.updated', model: @page.class.model_name.human.downcase), undo_link], " ")
       else
         render action: 'edit'
       end
@@ -64,7 +64,7 @@ module Spotlight
     def destroy
       @page.destroy
 
-      redirect_to [@page.exhibit, page_collection_name], notice: t(:'helpers.submit.page.destroyed', model: @page.class.model_name.human.downcase)
+      redirect_to [@page.exhibit, page_collection_name], flash: { html_safe: true }, notice: view_context.safe_join([t(:'helpers.submit.page.destroyed', model: @page.class.model_name.human.downcase), undo_link], " ")
     end
 
     def update_all
@@ -80,6 +80,11 @@ module Spotlight
       @_prefixes ||= super + ['catalog']
     end
 
+    def undo_link
+      return unless can? :manage, @page
+      view_context.link_to(t(:'spotlight.versions.undo'), revert_version_path(@page.versions.last), :method => :post)
+    end
+
     protected
 
     ##

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

@@ -1,3 +1,5 @@
+require 'csv'
+
 module Spotlight::Resources
   class UploadController < ApplicationController
     helper :all
@@ -5,37 +7,53 @@ module Spotlight::Resources
     before_filter :authenticate_user!
 
     load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
-    before_filter :build_resource, only: [:new, :create]
+    before_filter :build_resource, only: [:new, :create, :template]
 
     load_and_authorize_resource class: 'Spotlight::Resources::Upload', through_association: "exhibit.resources", instance_name: 'resource'
 
     def create
       @resource.attributes = resource_params
 
-      if @resource.save
+      if @resource.save_and_commit
         flash[:notice] = t('spotlight.resources.upload.success')
         if params["add-and-continue"]
           redirect_to new_exhibit_resources_upload_path(@resource.exhibit)
         else
-          redirect_to admin_exhibit_catalog_index_path(@resource.exhibit)
+          redirect_to admin_exhibit_catalog_index_path(@resource.exhibit, sort: :timestamp)
         end
       else
         flash[:error] = t('spotlight.resources.upload.error')
-        redirect_to admin_exhibit_catalog_index_path(@resorce.exhibit)
+        redirect_to admin_exhibit_catalog_index_path(@resource.exhibit, sort: :timestamp)
       end
     end
 
+    def csv_upload
+      file = csv_params[:url]
+      csv = CSV.parse(file.read, {headers:true, return_headers: false}).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
+    end
+
+    def template
+      render text: CSV.generate { |csv| csv << data_param_keys.unshift(:url) }, content_type: 'text/csv'
+    end
+
     private
     def build_resource
       @resource ||= Spotlight::Resources::Upload.new exhibit: current_exhibit
     end
 
+    def csv_params
+      params.require(:resources_csv_upload).permit(:url)
+    end
+
     def resource_params
       params.require(:resources_upload).permit(:url, data: data_param_keys)
     end
 
     def data_param_keys
-      Spotlight::Resources::Upload.fields(current_exhibit).keys + current_exhibit.custom_fields.map(&:field)
+      Spotlight::Resources::Upload.fields(current_exhibit).collect(&:field_name) + current_exhibit.custom_fields.collect(&:field)
     end
 
   end

data/app/controllers/spotlight/resources_controller.rb

@@ -25,17 +25,23 @@ module Spotlight
       @resource.attributes = resource_params
       @resource = @resource.becomes_provider
 
-      if @resource.save
+      if @resource.save_and_commit
         if from_popup?
           render layout: false, text: "<html><script>window.close();</script></html>"
         else
-          redirect_to admin_exhibit_catalog_index_path(@resource.exhibit)
+          redirect_to admin_exhibit_catalog_index_path(@resource.exhibit, sort: :timestamp)
         end
       else
         render action: 'new'
       end
     end
 
+    def reindex_all
+      @exhibit.reindex_later
+
+      redirect_to admin_exhibit_catalog_index_path(@exhibit), notice: t(:'spotlight.resources.reindexing_in_progress')
+    end
+
     protected
     def resource_params
       params.require(:resource).permit(:url)

data/app/controllers/spotlight/versions_controller.rb

@@ -0,0 +1,33 @@
+module Spotlight
+  class VersionsController < Spotlight::ApplicationController
+    before_filter :authenticate_user!
+
+    load_and_authorize_resource class: "PaperTrail::Version"
+
+    def revert
+      if obj = @version.reify
+        authorize! :manage, obj
+        if obj.save
+          redirect_to [obj.exhibit, obj], flash: { html_safe: true }, notice: undo_link
+        else
+          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')
+      end
+
+    end
+
+    def undo_link
+      return unless can? :manage, @version
+
+      link_name = if params[:redo] == "true"
+        view_context.t(:'spotlight.versions.undo')
+      else
+        view_context.t(:'spotlight.versions.redo')
+      end
+
+      view_context.link_to(link_name, revert_version_path(@version.next, :redo => !params[:redo]), method: :post)
+    end
+  end
+end

data/app/forms/spotlight/appearance.rb

@@ -26,53 +26,23 @@ module Spotlight
       end
     end
 
-    ##
-    # This enables us to have a group of checkboxes that is backed by the array
-    # stored in Spotlight::BlacklightConfiguration#default_sort_fields
-    def sort_fields 
-      fields = configuration.sort_fields
-      Blacklight::OpenStructWithHashAccess.new.tap do |s|
-        default_sort_fields.each_with_index do |(k, field), index|
-          s[k] = Blacklight::OpenStructWithHashAccess.new.tap do |c|
-            c.enabled = fields[k] && fields[k][:enabled]
-            c.label = fields[k][:label] if fields[k]
-            c.weight = index + 1
-          end
-        end
-      end
-    end
-
-    def allowed_params
-      sort_fields.keys.each_with_object({}) do |field, hsh|
-        hsh[field] = [:enabled, :label, :weight]
-      end
-    end
-
     def update(params)
       configuration.exhibit.update(exhibit_params(params))
       configuration.update(configuration_params(params))
     end
 
     def view_type_options
-      default_blacklight_config.view.keys
+      default_blacklight_config.view.select { |k,v| v.if != false }.keys
     end
 
     def per_page_options
       default_blacklight_config.per_page
     end
 
-    def default_sort_field
-      configuration.blacklight_config.default_sort_field.key
-    end
-
     protected
 
-    def default_sort_fields
-      default_blacklight_config.sort_fields
-    end
-
     def configuration_params(params)
-      p = params.except(:main_navigations, :searchable)
+      p = params.except(:main_navigations, :searchable, :masthead)
       p[:document_index_view_types] = keep_selected_values(p[:document_index_view_types])
       p
     end
@@ -82,6 +52,9 @@ module Spotlight
       if main_nav_attributes = params[:main_navigations].try(:values)
         p[:main_navigations_attributes] = main_nav_attributes
       end
+      if masthead_attributes = params.slice(:masthead).try(:values).try(:first)
+        p[:masthead_attributes] = masthead_attributes
+      end
       p
     end
 

data/app/helpers/spotlight/application_helper.rb

@@ -2,6 +2,7 @@ module Spotlight
   module ApplicationHelper
     include CrudLinkHelpers
     include TitleHelper
+    include JcropHelper
 
     def application_name
       name = super
@@ -31,7 +32,7 @@ module Spotlight
       return nil if document.nil?
 
       if current_exhibit
-        spotlight.exhibit_catalog_path(current_exhibit, document)
+        [spotlight, current_exhibit, document]
       else
         document
       end
@@ -61,12 +62,6 @@ module Spotlight
       types
     end
 
-    ##
-    # Override Blacklight (5.2+) so we use our own presenter
-    def presenter_class
-      Spotlight::DocumentPresenter
-    end
-
     # Return a copy of the blacklight configuration
     # that only includes views conifgured by our block
     def blacklight_view_config_for_search_block block
@@ -93,15 +88,6 @@ module Spotlight
       end.keys.map { |x| x.to_s }
     end
 
-    def render_save_search
-      render('save_search') if render_save_this_search?
-    end
-
-    def render_save_this_search?
-      (current_exhibit and can?( :curate, current_exhibit)) &&
-      (params[:controller] != "spotlight_catalog_controller" && params[:action] != "admin")
-    end
-
     def select_deselect_button
       button_tag(
         t(:".deselect_all"),
@@ -114,6 +100,37 @@ module Spotlight
       )
     end
 
+    def add_exhibit_twitter_card_content
+      twitter_card('summary') do |card|
+        card.url exhibit_root_url(current_exhibit)
+        card.title current_exhibit.title
+        card.description current_exhibit.subtitle
+        card.image carrierwave_url(current_exhibit.featured_image) if current_exhibit.featured_image
+      end
+    end
+
+    def carrierwave_url upload
+      # Carrierwave's #url returns either a full url (if asset path was configured)
+      # or just the path to the image. We'll try to normalize it to a url.
+      url = upload.url
+
+      if url.nil? or url.starts_with? "http"
+        url
+      else
+        (Rails.application.config.asset_host || root_url).sub(/\/$/, "") + url
+      end
+    end
+
+    def render_save_this_search?
+      (current_exhibit and can?( :curate, current_exhibit)) &&
+      !(params[:controller] == "spotlight/catalog" && params[:action] == "admin")
+    end
+
+    def uploaded_field_label config
+      solr_field = Array(config.solr_field || config.field_name).first.to_s
+      config.label || blacklight_config.index_fields[solr_field].try(:label) || t(".#{solr_field}")
+    end
+
     private
 
     def main_app_url_helper?(method)

data/app/helpers/spotlight/{appearances_helper.rb → blacklight_configurations_helper.rb}

@@ -1,12 +1,12 @@
 module Spotlight
-  module AppearancesHelper
+  module BlacklightConfigurationsHelper
     def translate_sort_fields(sort_config)
       if sort_config[:sort]
         safe_join(sort_config[:sort].split(',').map do |sort|
           sort_field, sort_order = sort.split(' ')
           safe_join([
-            t(:"spotlight.appearances.edit.sort_fields.sort_keys.#{sort_field}"),
-            t(:"spotlight.appearances.edit.sort_fields.sort_keys.#{sort_order}")
+            t(:"spotlight.blacklight_configurations.edit_sort_fields.sort_keys.#{sort_field}"),
+            t(:"spotlight.blacklight_configurations.edit_sort_fields.sort_keys.#{sort_order}")
           ], " ")
         end, ", ")
       end

data/app/helpers/spotlight/jcrop_helper.rb

@@ -0,0 +1,14 @@
+module Spotlight
+  module JcropHelper
+    def default_masthead_jcrop_options
+      {
+        croppable: true,
+        selector: 'masthead_image',
+        bg_color: 'black',
+        bg_opacity: '.4',
+        aspect_ratio: 15,
+        box_width: '600'
+      }
+    end
+  end
+end

data/app/helpers/spotlight/main_app_helpers.rb

@@ -15,7 +15,11 @@ module Spotlight::MainAppHelpers
     current_exhibit && current_exhibit.contact_emails.confirmed.any?
   end
   
-  def enabled_in_spotlight_view_type_configuration? config
+  def enabled_in_spotlight_view_type_configuration? config, *args
+    if config.respond_to? :upstream_if and !config.upstream_if.nil?
+      return false unless evaluate_configuration_conditional(config.upstream_if, config, *args)
+    end
+
     return true unless current_exhibit
 
     return true if controller.is_a? Spotlight::PagesController
@@ -24,7 +28,25 @@ module Spotlight::MainAppHelpers
   end
   
   def field_enabled? field, *args
-    field.enabled && field.send((:show if controller.is_a? Blacklight::Catalog and action_name == "show") || document_index_view_type)
+    return false unless field.enabled
+
+    if field.respond_to? :upstream_if and !field.upstream_if.nil?
+      return false unless evaluate_configuration_conditional(field.upstream_if, field, *args)
+    end
+
+    if field.is_a? Blacklight::Configuration::SortField
+      field.enabled
+    elsif field.is_a?(Blacklight::Configuration::FacetField) or (controller.is_a?(Blacklight::Catalog) and ["edit", "show"].include?(action_name))
+      field.show
+    else
+      field.send(document_index_view_type)
+    end
   end
 
+  def link_back_to_catalog(opts={:label=>nil})
+    if (current_search_session.try(:query_params) || {}).fetch(:controller, "").starts_with? "spotlight"
+      opts[:route_set] ||= spotlight
+    end
+    super
+  end
 end